qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-25 21:31:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

revert knghtbrd's `fix'. It was fine for systems with GL/*.h in either

Browse source 
/usr/include or /usr/local/include, but not when they are in /usr/X11R6/include.

I'll look into fixing this in a way that doesn't break any builds and hopefully
stops  redundant builds.
This commit is contained in:
Bill Currie 2000-03-06 03:22:48 +00:00
parent eb0cb8c8c8
commit c917237c77
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
qw_client/Makefile.in
View file

@ -24,8 +24,8 @@ BUILD_DIR := $(TARGET_DIR)/qw_client
OBJ_PATTERN := $(BUILD_DIR)/common_lib/%.@OBJEXT@ \ OBJ_PATTERN := $(BUILD_DIR)/common_lib/%.@OBJEXT@ \
$(BUILD_DIR)/%.@OBJEXT@ $(BUILD_DIR)/%.@OBJEXT@
DEP_PATTERN := $(BUILD_DIR)/%.d $(BUILD_DIR)/common_lib/%.d DEP_PATTERN := $(BUILD_DIR)/%.d $(BUILD_DIR)/common_lib/%.d
#GL_OBJ_PATTERN := $(BUILD_DIR)/gl/%.@OBJEXT@ GL_OBJ_PATTERN := $(BUILD_DIR)/gl/%.@OBJEXT@
#GL_DEP_PATTERN := $(BUILD_DIR)/gl/%.d GL_DEP_PATTERN := $(BUILD_DIR)/gl/%.d
LDFLAGS = @LDFLAGS@ @SOUND_LIBS@ @NET_LIBS@ -lm LDFLAGS = @LDFLAGS@ @SOUND_LIBS@ @NET_LIBS@ -lm
LIBS = @LIBS@ LIBS = @LIBS@
@ -265,29 +265,29 @@ $(OBJ_PATTERN): $(QW_COMMON_DIR)/%.c
$(OBJ_PATTERN): $(QW_COMMON_DIR)/%.s $(OBJ_PATTERN): $(QW_COMMON_DIR)/%.s
$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
#$(GL_OBJ_PATTERN): $(SRC_DIR)/%.c $(GL_OBJ_PATTERN): $(SRC_DIR)/%.c
# $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
#$(GL_OBJ_PATTERN): $(SRC_DIR)/%.s $(GL_OBJ_PATTERN): $(SRC_DIR)/%.s
# $(CC) $(CFLAGS) $(GL_CFLAGS) -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -x assembler-with-cpp -o $@ -c $<
#$(GL_OBJ_PATTERN): $(COMMON_DIR)/%.c $(GL_OBJ_PATTERN): $(COMMON_DIR)/%.c
# $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
#$(GL_OBJ_PATTERN): $(COMMON_DIR)/%.s $(GL_OBJ_PATTERN): $(COMMON_DIR)/%.s
# $(CC) $(CFLAGS) $(GL_CFLAGS) -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -x assembler-with-cpp -o $@ -c $<
#$(GL_OBJ_PATTERN): $(QW_COMMON_DIR)/%.c $(GL_OBJ_PATTERN): $(QW_COMMON_DIR)/%.c
# $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
#$(GL_OBJ_PATTERN): $(QW_COMMON_DIR)/%.s $(GL_OBJ_PATTERN): $(QW_COMMON_DIR)/%.s
# $(CC) $(CFLAGS) $(GL_CFLAGS) -x assembler-with-cpp -o $@ -c $< $(CC) $(CFLAGS) $(GL_CFLAGS) -x assembler-with-cpp -o $@ -c $<
client_DIR: client_DIR:
@DIR=client; $(MAKE_SURE_DIR) @DIR=client; $(MAKE_SURE_DIR)
#gl_DIR: gl_DIR:
# @DIR=gl; $(MAKE_SURE_DIR) @DIR=gl; $(MAKE_SURE_DIR)
########################################################################### ###########################################################################
# #
@ -456,10 +456,8 @@ ifneq ($(GLQUAKE),)
GLX_GL_SRC = gl_vidglx.c dga_check.c in_x11.c context_x11.c GLX_GL_SRC = gl_vidglx.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)/gl/%,$(addsuffix .@OBJEXT@,\
$(basename $(GL_REND_SRC) .c .s))) $(basename $(GL_REND_SRC) .c .s)))
#GL_REND_OBJS = $(patsubst %,$(BUILD_DIR)/gl/%,$(addsuffix .@OBJEXT@,\
# $(basename $(GL_REND_SRC) .c .s)))
GLX_GL_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\ GLX_GL_OBJS = $(patsubst %,$(BUILD_DIR)/%,$(addsuffix .@OBJEXT@,\
$(basename $(GLX_GL_SRC) .c .s))) $(basename $(GLX_GL_SRC) .c .s)))
@ -476,7 +474,7 @@ $(BUILD_DIR)/gl_vidglx.@OBJEXT@: $(COMMON_DIR)/gl_vidglx.c
$(BUILD_DIR)/dga_check.@OBJEXT@: $(COMMON_DIR)/dga_check.c $(BUILD_DIR)/dga_check.@OBJEXT@: $(COMMON_DIR)/dga_check.c
$(CC) $(CFLAGS) $(X11_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(X11_CFLAGS) -o $@ -c $<
$(GLQUAKE): client_DIR $(BUILD_DIR)/../$(GLQUAKE) $(GLQUAKE): gl_DIR $(BUILD_DIR)/../$(GLQUAKE)
$(BUILD_DIR)/../$(GLQUAKE): $(ALL_GL_OBJS) $(BUILD_DIR)/../$(GLQUAKE): $(ALL_GL_OBJS)
$(CC) $(CFLAGS) $(ALL_GL_OBJS) $(GL_LDFLAGS) $(LDFLAGS) $(LIBS) \ $(CC) $(CFLAGS) $(ALL_GL_OBJS) $(GL_LDFLAGS) $(LDFLAGS) $(LIBS) \
@ -501,7 +499,7 @@ TDFX_LDFLAGS = @SVGA_LIBS@ @TDFXGL_LIBS@
$(BUILD_DIR)/gl_vidlinux_3dfx.@OBJEXT@: $(COMMON_DIR)/gl_vidlinux_3dfx.c $(BUILD_DIR)/gl_vidlinux_3dfx.@OBJEXT@: $(COMMON_DIR)/gl_vidlinux_3dfx.c
$(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $<
$(TDFXQUAKE): client_DIR $(BUILD_DIR)/../$(TDFXQUAKE) $(TDFXQUAKE): gl_DIR $(BUILD_DIR)/../$(TDFXQUAKE)
$(BUILD_DIR)/../$(TDFXQUAKE): $(ALL_TDFX_OBJS) $(BUILD_DIR)/../$(TDFXQUAKE): $(ALL_TDFX_OBJS)
$(CC) $(CFLAGS) $(ALL_TDFX_OBJS) $(TDFX_LDFLAGS) $(LDFLAGS) $(LIBS) \ $(CC) $(CFLAGS) $(ALL_TDFX_OBJS) $(TDFX_LDFLAGS) $(LDFLAGS) $(LIBS) \