From 4d551f0f51a4d9d24a04cf6040feda545bc412ac Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 30 Apr 2000 22:27:58 +0000 Subject: [PATCH] rename common/gl_vidnt.c -> common/vid_nt_gl.c, common/gl_vidglx.c -> common/vid_glx.c and common/gl_vidlinux_3dfx.c -> common/vid_3dfxsvga.c and touch up the relevant files to reflect the name change. I got sick of the inconsistency in the vid files. --- common/{gl_vidlinux_3dfx.c => vid_3dfxsvga.c} | 2 +- common/{gl_vidglx.c => vid_glx.c} | 2 +- common/{gl_vidnt.c => vid_nt_gl.c} | 2 +- qw_client/Makefile.in | 8 ++++---- qw_client/qw_client.dsp | 2 +- uquake/Makefile.in | 8 ++++---- uquake/uquake.dsp | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename common/{gl_vidlinux_3dfx.c => vid_3dfxsvga.c} (99%) rename common/{gl_vidglx.c => vid_glx.c} (99%) rename common/{gl_vidnt.c => vid_nt_gl.c} (99%) diff --git a/common/gl_vidlinux_3dfx.c b/common/vid_3dfxsvga.c similarity index 99% rename from common/gl_vidlinux_3dfx.c rename to common/vid_3dfxsvga.c index a907f0e..d5027df 100644 --- a/common/gl_vidlinux_3dfx.c +++ b/common/vid_3dfxsvga.c @@ -1,5 +1,5 @@ /* - gl_vidlinux_3dfx.c + vid_3dfxsvga.c OpenGL device driver for 3Dfx chipsets running Linux diff --git a/common/gl_vidglx.c b/common/vid_glx.c similarity index 99% rename from common/gl_vidglx.c rename to common/vid_glx.c index 94bbf48..664da8f 100644 --- a/common/gl_vidglx.c +++ b/common/vid_glx.c @@ -1,5 +1,5 @@ /* - gl_vidglx.c + vid_glx.c OpenGL GLX video driver diff --git a/common/gl_vidnt.c b/common/vid_nt_gl.c similarity index 99% rename from common/gl_vidnt.c rename to common/vid_nt_gl.c index 91a179d..833ced2 100644 --- a/common/gl_vidnt.c +++ b/common/vid_nt_gl.c @@ -1,5 +1,5 @@ /* - gl_vidnt.c + vid_nt_gl.c OpenGL low-level video driver for Windows NT/9x diff --git a/qw_client/Makefile.in b/qw_client/Makefile.in index 0cfa679..1a02aef 100644 --- a/qw_client/Makefile.in +++ b/qw_client/Makefile.in @@ -314,7 +314,7 @@ endif ifneq ($(GLQUAKE),) -GLX_GL_SRC = gl_vidglx.c dga_check.c in_x11.c context_x11.c +GLX_GL_SRC = vid_glx.c dga_check.c in_x11.c context_x11.c ALL_GL_SRC = $(GL_REND_SRC) $(GLX_GL_SRC) GL_REND_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\ @@ -329,7 +329,7 @@ ALL_GL_OBJS = $(GLX_GL_OBJS) $(GL_REND_OBJS) \ GL_CFLAGS = @OGL_CFLAGS@ GL_LDFLAGS = $(X11_LDFLAGS) @OGL_LIBS@ @DGA_LIBS@ -$(BUILD_DIR)/gl_vidglx.@OBJEXT@: $(COMMON_DIR)/gl_vidglx.c +$(BUILD_DIR)/vid_glx.@OBJEXT@: $(COMMON_DIR)/vid_glx.c $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(BUILD_DIR)/dga_check.@OBJEXT@: $(COMMON_DIR)/dga_check.c @@ -349,7 +349,7 @@ endif ifneq ($(TDFXQUAKE),) ALL_TDFX_SRC = $(GL_REND_SRC) \ - gl_vidlinux_3dfx.c in_svgalib.c + vid_3dfxsvga.c in_svgalib.c ALL_TDFX_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\ $(basename $(ALL_TDFX_SRC) .c .s))) \ $(BUILD_DIR)/common_lib.a $(TARGET_DIR)/sound_lib.a @@ -357,7 +357,7 @@ ALL_TDFX_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\ TDFX_CFLAGS = @OGL_CFLAGS@ @GLIDE_CFLAGS@ TDFX_LDFLAGS = @SVGA_LIBS@ @TDFXGL_LIBS@ -$(BUILD_DIR)/gl_vidlinux_3dfx.@OBJEXT@: $(COMMON_DIR)/gl_vidlinux_3dfx.c +$(BUILD_DIR)/vid_3dfxsvga.@OBJEXT@: $(COMMON_DIR)/vid_3dfxsvga.c $(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $< $(TDFXQUAKE): $(BUILD_DIR)/../$(TDFXQUAKE) diff --git a/qw_client/qw_client.dsp b/qw_client/qw_client.dsp index 2408d4b..1c19636 100644 --- a/qw_client/qw_client.dsp +++ b/qw_client/qw_client.dsp @@ -746,7 +746,7 @@ SOURCE=..\common\gl_test.c # End Source File # Begin Source File -SOURCE=..\common\gl_vidnt.c +SOURCE=..\common\vid_nt_gl.c !IF "$(CFG)" == "qw_client - Win32 Release" diff --git a/uquake/Makefile.in b/uquake/Makefile.in index 50f50ba..0a77e36 100644 --- a/uquake/Makefile.in +++ b/uquake/Makefile.in @@ -351,7 +351,7 @@ endif ifneq ($(GLQUAKE),) ALL_GL_SRC = $(CD_AUDIO_SRC) $(GL_REND_SRC) \ - gl_vidglx.c dga_check.c in_x11.c context_x11.c + vid_glx.c dga_check.c in_x11.c context_x11.c ALL_GL_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\ $(basename $(ALL_GL_SRC) .c .s))) \ $(BUILD_DIR)/common_lib.a \ @@ -360,7 +360,7 @@ ALL_GL_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\ GL_CFLAGS = @OGL_CFLAGS@ GL_LDFLAGS = $(X11_LDFLAGS) @OGL_LIBS@ @DGA_LIBS@ -$(BUILD_DIR)/gl_vidglx.o: $(COMMON_DIR)/gl_vidglx.c +$(BUILD_DIR)/vid_glx.o: $(COMMON_DIR)/vid_glx.c $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(BUILD_DIR)/dga_check.@OBJEXT@: $(COMMON_DIR)/dga_check.c @@ -379,7 +379,7 @@ endif ifneq ($(TDFXQUAKE),) ALL_TDFX_SRC = $(CD_AUDIO_SRC) $(GL_REND_SRC) \ - gl_vidlinux_3dfx.c in_svgalib.c + vid_3dfxsvga.c in_svgalib.c ALL_TDFX_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\ $(basename $(ALL_TDFX_SRC) .c .s))) \ $(BUILD_DIR)/common_lib.a \ @@ -388,7 +388,7 @@ ALL_TDFX_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\ TDFX_CFLAGS = @OGL_CFLAGS@ @GLIDE_CFLAGS@ TDFX_LDFLAGS = @SVGA_LIBS@ @TDFXGL_LIBS@ -$(BUILD_DIR)/gl_vidlinux_3dfx.@OBJEXT@: $(COMMON_DIR)/gl_vidlinux_3dfx.c +$(BUILD_DIR)/vid_3dfxsvga.@OBJEXT@: $(COMMON_DIR)/vid_3dfxsvga.c $(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $< $(TDFXQUAKE): $(BUILD_DIR)/../$(TDFXQUAKE) diff --git a/uquake/uquake.dsp b/uquake/uquake.dsp index 9eea0a9..20a5351 100644 --- a/uquake/uquake.dsp +++ b/uquake/uquake.dsp @@ -693,7 +693,7 @@ SOURCE=..\common\gl_screen.c # End Source File # Begin Source File -SOURCE=..\common\gl_vidnt.c +SOURCE=..\common\vid_nt_gl.c !IF "$(CFG)" == "uquake - Win32 Release"