qf
/
quakeforge-old
mirror of https://git.code.sf.net/p/quake/quakeforge-old
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile.in cleanups. Software targets are once again built before GL 

targets. A few .o's changed to .@OBJEXT@, although most Unix-based systems
won't care about that. :)
This commit is contained in:
Jeff Teunissen 2000-01-29 10:08:02 +00:00
parent 1c6834bf91
commit e489bb2b00
1 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
qw_client/Makefile.in
View File

@ -62,18 +62,6 @@ ifeq ($(SOUND_STYLE),ALSA)
LIBS += -lasound
endif
ifeq ($(HAS_OGL),yes)
GLQUAKE =$(BIN_PREFIX)-gl
endif
ifeq ($(HAS_TDFXGL),yes)
TDFXQUAKE= $(BIN_PREFIX)-3dfx
endif
ifeq ($(HAS_X11),yes)
X11QUAKE = $(BIN_PREFIX)-x11
endif
ifeq ($(HAS_SVGA),yes)
SVGAQUAKE = $(BIN_PREFIX)-svga
endif
@ -82,12 +70,24 @@ ifeq ($(HAS_GGI),yes)
GGIQUAKE = $(BIN_PREFIX)-ggi
endif
ifeq ($(HAS_SDL),yes)
SDLQUAKE = $(BIN_PREFIX)-sdl
endif
ifeq ($(HAS_X11),yes)
X11QUAKE = $(BIN_PREFIX)-x11
endif
ifeq ($(HAS_MGL),yes)
MGLQUAKE = $(BIN_PREFIX)-mgl
endif
ifeq ($(HAS_SDL),yes)
SDLQUAKE = $(BIN_PREFIX)-sdl
ifeq ($(HAS_OGL),yes)
GLQUAKE =$(BIN_PREFIX)-gl
endif
ifeq ($(HAS_TDFXGL),yes)
TDFXQUAKE= $(BIN_PREFIX)-3dfx
endif
RELEASE = @RELEASE@
@ -97,10 +97,10 @@ else
OPTFLAGS = -g
endif
soft_targets = $(X11QUAKE) $(SVGAQUAKE) $(GGIQUAKE) $(SDLQUAKE) $(MGLQUAKE)
soft_targets = $(SVGAQUAKE) $(GGIQUAKE) $(SDLQUAKE) $(X11QUAKE) $(MGLQUAKE)
gl_targets = $(GLQUAKE) $(TDFXQUAKE)
lib_targets = $(COMMON_LIB)
targets = $(lib_targets) $(gl_targets) $(soft_targets)
targets = $(lib_targets) $(soft_targets) $(gl_targets)
CLEAN_TARGETS = $(patsubst %,clean-%, $(targets))
.PHONY: $(targets) $(CLEAN_TARGETS) clean-soft clean-gl clean-common_lib clean-client
@ -211,17 +211,17 @@ $(OBJ_PATTERN): $(COMMON_DIR)/%.c
$(OBJ_PATTERN): $(COMMON_DIR)/%.s
$(CC) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/client/gl/%.o: $(COMMON_DIR)/%.c
$(CC) $(GL_CFLAGS) $(CFLAGS) -o $@ -c $<
$(BUILD_DIR)/client/gl/%.@OBJEXT@: $(COMMON_DIR)/%.c
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/client/gl/%.o: $(COMMON_DIR)/%.s
$(CC) $(GL_CFLAGS) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/client/gl/%.@OBJEXT@: $(COMMON_DIR)/%.s
$(CC) $(CFLAGS) $(GL_CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/client/gl/%.o: $(SRC_DIR)/%.c
$(CC) $(GL_CFLAGS) $(CFLAGS) -o $@ -c $<
$(BUILD_DIR)/client/gl/%.@OBJEXT@: $(SRC_DIR)/%.c
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/client/gl/%.o: $(SRC_DIR)/%.s
$(CC) $(GL_CFLAGS) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(BUILD_DIR)/client/gl/%.@OBJEXT@: $(SRC_DIR)/%.s
$(CC) $(CFLAGS) $(CFLAGS) -x assembler-with-cpp -o $@ -c $<
$(OBJ_PATTERN): $(QW_COMMON_DIR)/%.c
$(CC) $(CFLAGS) -o $@ -c $<
@ -390,16 +390,23 @@ endif
# X11 GL target
ifneq ($(GLQUAKE),)
ALL_GL_SRC = $(GL_REND_SRC) \
gl_vidglx.c dga_check.c
ALL_GL_OBJS = $(patsubst %,$(BUILD_DIR)/client/gl/%,$(addsuffix .@OBJEXT@,\
$(basename $(ALL_GL_SRC) .c .s))) \
GLX_GL_SRC = gl_vidglx.c dga_check.c
ALL_GL_SRC = $(GL_REND_SRC) $(GLX_GL_SRC)
GL_REND_OBJS = $(patsubst %,$(BUILD_DIR)/client/gl/%,$(addsuffix .o,\
$(basename $(GL_REND_SRC) .c .s)))
GLX_GL_OBJS = $(patsubst %,$(BUILD_DIR)/client/%,$(addsuffix .o,\
$(basename $(GLX_GL_SRC) .c .s)))
ALL_GL_OBJS = $(GLX_GL_OBJS) $(GL_REND_OBJS) \
$(BUILD_DIR)/common_lib.a $(TARGET_DIR)/sound_lib.a
GL_CFLAGS = @OGL_CFLAGS@
GL_LDFLAGS = $(X11_LDFLAGS) @OGL_LIBS@ @DGA_LIBS@ @DYN_LIBS@
$(BUILD_DIR)/client/gl_vidglx.o: $(COMMON_DIR)/gl_vidglx.c
$(BUILD_DIR)/client/gl_vidglx.@OBJEXT@: $(COMMON_DIR)/gl_vidglx.c
$(CC) $(CFLAGS) $(GL_CFLAGS) -o $@ -c $<
$(BUILD_DIR)/client/dga_check.@OBJEXT@: $(COMMON_DIR)/dga_check.c
@ -417,6 +424,7 @@ endif
# 3Dfx GL MCD target
ifneq ($(TDFXQUAKE),)
ALL_TDFX_SRC = $(GL_REND_SRC) \
gl_vidlinux_3dfx.c in_svgalib.c
ALL_TDFX_OBJS = $(patsubst %,$(BUILD_DIR)/client/%,$(addsuffix .@OBJEXT@,\