aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--code/unix/Makefile22
-rw-r--r--code/unix/sdl_glimp.c (renamed from code/unix/linux_glimp_sdl.c)0
-rw-r--r--code/unix/sdl_snd.c (renamed from code/unix/linux_snd_sdl.c)0
3 files changed, 11 insertions, 11 deletions
diff --git a/code/unix/Makefile b/code/unix/Makefile
index 0cdfea3..5d13521 100644
--- a/code/unix/Makefile
+++ b/code/unix/Makefile
@@ -563,10 +563,10 @@ ifeq ($(PLATFORM),freebsd)
$(B)/client/linux_signals.o \
$(B)/client/linux_common.o \
$(B)/client/linux_qgl.o \
- $(B)/client/linux_glimp_sdl.o \
+ $(B)/client/sdl_glimp.o \
$(B)/client/linux_glimp.o \
$(B)/client/linux_snd.o \
- $(B)/client/linux_snd_sdl.o \
+ $(B)/client/sdl_snd.o \
$(B)/client/snd_mixa.o \
$(B)/client/matha.o \
$(B)/client/ftol.o \
@@ -587,10 +587,10 @@ else
$(B)/client/linux_common.o \
$(B)/client/linux_qgl.o \
$(B)/client/linux_glimp.o \
- $(B)/client/linux_glimp_sdl.o \
+ $(B)/client/sdl_glimp.o \
$(B)/client/linux_joystick.o \
$(B)/client/linux_snd.o \
- $(B)/client/linux_snd_sdl.o \
+ $(B)/client/sdl_snd.o \
$(B)/client/snd_mixa.o \
$(B)/client/matha.o \
@@ -601,7 +601,7 @@ else
$(B)/client/linux_glimp_smp.o \
$(B)/client/linux_joystick.o \
$(B)/client/linux_snd.o \
- $(B)/client/linux_snd_sdl.o \
+ $(B)/client/sdl_snd.o \
$(B)/client/snd_mixa.o \
$(B)/client/matha.o
@@ -767,13 +767,13 @@ $(B)/client/irix_input.o : $(UDIR)/irix_input.c; $(DO_CC)
$(B)/client/linux_signals.o : $(UDIR)/linux_signals.c; $(DO_CC)
$(B)/client/linux_common.o : $(UDIR)/linux_common.c; $(DO_CC)
$(B)/client/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) $(GL_CFLAGS)
-$(B)/client/linux_glimp_sdl.o : $(UDIR)/linux_glimp_sdl.c; $(DO_CC) $(GL_CFLAGS)
+$(B)/client/sdl_glimp.o : $(UDIR)/sdl_glimp.c; $(DO_CC) $(GL_CFLAGS)
$(B)/client/linux_glimp_smp.o : $(UDIR)/linux_glimp.c; $(DO_SMP_CC) $(GL_CFLAGS)
$(B)/client/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC)
$(B)/client/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) $(GL_CFLAGS)
$(B)/client/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC)
$(B)/client/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC)
-$(B)/client/linux_snd_sdl.o : $(UDIR)/linux_snd_sdl.c; $(DO_CC)
+$(B)/client/sdl_snd.o : $(UDIR)/sdl_snd.c; $(DO_CC)
$(B)/client/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS)
$(B)/client/matha.o : $(UDIR)/matha.s; $(DO_AS)
@@ -1578,11 +1578,11 @@ Q3SOBJ = \
$(B)/q3static/unix_shared.o \
\
$(B)/q3static/linux_qgl.o \
- $(B)/q3static/linux_glimp_sdl.o \
+ $(B)/q3static/sdl_glimp.o \
$(B)/q3static/linux_glimp.o \
$(B)/q3static/linux_joystick.o \
$(B)/q3static/linux_snd.o \
- $(B)/q3static/linux_snd_sdl.o \
+ $(B)/q3static/sdl_snd.o \
$(B)/q3static/snd_mixa.o \
$(B)/q3static/matha.o
@@ -1734,13 +1734,13 @@ $(B)/q3static/unix_qgl.o : $(UDIR)/unix_qgl.c; $(DO_CC) -DQ3_STATIC
$(B)/q3static/unix_main.o : $(UDIR)/unix_main.c; $(DO_CC) -DQ3_STATIC
$(B)/q3static/unix_net.o : $(UDIR)/unix_net.c; $(DO_CC) -DQ3_STATIC
$(B)/q3static/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_CC) -DQ3_STATIC
-$(B)/q3static/linux_glimp_sdl.o : $(UDIR)/linux_glimp_sdl.c; $(DO_CC) -DQ3_STATIC
+$(B)/q3static/sdl_glimp.o : $(UDIR)/sdl_glimp.c; $(DO_CC) -DQ3_STATIC
$(B)/q3static/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) -DQ3_STATIC
$(B)/q3static/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC) -DQ3_STATIC
$(B)/q3static/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) -DQ3_STATIC
$(B)/q3static/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) -DQ3_STATIC
$(B)/q3static/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) -DQ3_STATIC
-$(B)/q3static/linux_snd_sdl.o : $(UDIR)/linux_snd_sdl.c; $(DO_CC) -DQ3_STATIC
+$(B)/q3static/sdl_snd.o : $(UDIR)/sdl_snd.c; $(DO_CC) -DQ3_STATIC
$(B)/q3static/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS)
$(B)/q3static/matha.o : $(UDIR)/matha.s; $(DO_AS)
$(B)/q3static/unzip.o : $(CMDIR)/unzip.c; $(DO_CC) -DQ3_STATIC
diff --git a/code/unix/linux_glimp_sdl.c b/code/unix/sdl_glimp.c
index 5c1c9a3..5c1c9a3 100644
--- a/code/unix/linux_glimp_sdl.c
+++ b/code/unix/sdl_glimp.c
diff --git a/code/unix/linux_snd_sdl.c b/code/unix/sdl_snd.c
index 66e32bc..66e32bc 100644
--- a/code/unix/linux_snd_sdl.c
+++ b/code/unix/sdl_snd.c