mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-25 05:11:23 +00:00
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.
This commit is contained in:
parent
6b385b7af8
commit
4d551f0f51
7 changed files with 13 additions and 13 deletions
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
gl_vidlinux_3dfx.c
|
vid_3dfxsvga.c
|
||||||
|
|
||||||
OpenGL device driver for 3Dfx chipsets running Linux
|
OpenGL device driver for 3Dfx chipsets running Linux
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
gl_vidglx.c
|
vid_glx.c
|
||||||
|
|
||||||
OpenGL GLX video driver
|
OpenGL GLX video driver
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
gl_vidnt.c
|
vid_nt_gl.c
|
||||||
|
|
||||||
OpenGL low-level video driver for Windows NT/9x
|
OpenGL low-level video driver for Windows NT/9x
|
||||||
|
|
|
@ -314,7 +314,7 @@ endif
|
||||||
|
|
||||||
ifneq ($(GLQUAKE),)
|
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)
|
ALL_GL_SRC = $(GL_REND_SRC) $(GLX_GL_SRC)
|
||||||
|
|
||||||
GL_REND_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\
|
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_CFLAGS = @OGL_CFLAGS@
|
||||||
GL_LDFLAGS = $(X11_LDFLAGS) @OGL_LIBS@ @DGA_LIBS@
|
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 $<
|
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
|
||||||
|
|
||||||
$(BUILD_DIR)/dga_check.@OBJEXT@: $(COMMON_DIR)/dga_check.c
|
$(BUILD_DIR)/dga_check.@OBJEXT@: $(COMMON_DIR)/dga_check.c
|
||||||
|
@ -349,7 +349,7 @@ endif
|
||||||
ifneq ($(TDFXQUAKE),)
|
ifneq ($(TDFXQUAKE),)
|
||||||
|
|
||||||
ALL_TDFX_SRC = $(GL_REND_SRC) \
|
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@,\
|
ALL_TDFX_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\
|
||||||
$(basename $(ALL_TDFX_SRC) .c .s))) \
|
$(basename $(ALL_TDFX_SRC) .c .s))) \
|
||||||
$(BUILD_DIR)/common_lib.a $(TARGET_DIR)/sound_lib.a
|
$(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_CFLAGS = @OGL_CFLAGS@ @GLIDE_CFLAGS@
|
||||||
TDFX_LDFLAGS = @SVGA_LIBS@ @TDFXGL_LIBS@
|
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 $<
|
$(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $<
|
||||||
|
|
||||||
$(TDFXQUAKE): $(BUILD_DIR)/../$(TDFXQUAKE)
|
$(TDFXQUAKE): $(BUILD_DIR)/../$(TDFXQUAKE)
|
||||||
|
|
|
@ -746,7 +746,7 @@ SOURCE=..\common\gl_test.c
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\common\gl_vidnt.c
|
SOURCE=..\common\vid_nt_gl.c
|
||||||
|
|
||||||
!IF "$(CFG)" == "qw_client - Win32 Release"
|
!IF "$(CFG)" == "qw_client - Win32 Release"
|
||||||
|
|
||||||
|
|
|
@ -351,7 +351,7 @@ endif
|
||||||
|
|
||||||
ifneq ($(GLQUAKE),)
|
ifneq ($(GLQUAKE),)
|
||||||
ALL_GL_SRC = $(CD_AUDIO_SRC) $(GL_REND_SRC) \
|
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@,\
|
ALL_GL_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\
|
||||||
$(basename $(ALL_GL_SRC) .c .s))) \
|
$(basename $(ALL_GL_SRC) .c .s))) \
|
||||||
$(BUILD_DIR)/common_lib.a \
|
$(BUILD_DIR)/common_lib.a \
|
||||||
|
@ -360,7 +360,7 @@ ALL_GL_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\
|
||||||
GL_CFLAGS = @OGL_CFLAGS@
|
GL_CFLAGS = @OGL_CFLAGS@
|
||||||
GL_LDFLAGS = $(X11_LDFLAGS) @OGL_LIBS@ @DGA_LIBS@
|
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 $<
|
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
|
||||||
|
|
||||||
$(BUILD_DIR)/dga_check.@OBJEXT@: $(COMMON_DIR)/dga_check.c
|
$(BUILD_DIR)/dga_check.@OBJEXT@: $(COMMON_DIR)/dga_check.c
|
||||||
|
@ -379,7 +379,7 @@ endif
|
||||||
|
|
||||||
ifneq ($(TDFXQUAKE),)
|
ifneq ($(TDFXQUAKE),)
|
||||||
ALL_TDFX_SRC = $(CD_AUDIO_SRC) $(GL_REND_SRC) \
|
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@,\
|
ALL_TDFX_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\
|
||||||
$(basename $(ALL_TDFX_SRC) .c .s))) \
|
$(basename $(ALL_TDFX_SRC) .c .s))) \
|
||||||
$(BUILD_DIR)/common_lib.a \
|
$(BUILD_DIR)/common_lib.a \
|
||||||
|
@ -388,7 +388,7 @@ ALL_TDFX_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\
|
||||||
TDFX_CFLAGS = @OGL_CFLAGS@ @GLIDE_CFLAGS@
|
TDFX_CFLAGS = @OGL_CFLAGS@ @GLIDE_CFLAGS@
|
||||||
TDFX_LDFLAGS = @SVGA_LIBS@ @TDFXGL_LIBS@
|
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 $<
|
$(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $<
|
||||||
|
|
||||||
$(TDFXQUAKE): $(BUILD_DIR)/../$(TDFXQUAKE)
|
$(TDFXQUAKE): $(BUILD_DIR)/../$(TDFXQUAKE)
|
||||||
|
|
|
@ -693,7 +693,7 @@ SOURCE=..\common\gl_screen.c
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\common\gl_vidnt.c
|
SOURCE=..\common\vid_nt_gl.c
|
||||||
|
|
||||||
!IF "$(CFG)" == "uquake - Win32 Release"
|
!IF "$(CFG)" == "uquake - Win32 Release"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue