ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-14 00:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

A few fixes for the new changes

Browse source
This commit is contained in:
Thilo Schulz 2009-11-08 17:36:05 +00:00
parent cd38bf6bf5
commit 3cb58d7cc5
1 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Makefile
View file

@ -921,17 +921,17 @@ endif
define DO_CC define DO_CC
$(echo_cmd) "CC $<" $(echo_cmd) "CC $<"
$(Q)$(CC) $(NOTSHLIBCFLAGS) $(BASE_CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $< $(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
endef endef
define DO_SMP_CC define DO_SMP_CC
$(echo_cmd) "SMP_CC $<" $(echo_cmd) "SMP_CC $<"
$(Q)$(CC) $(NOTSHLIBCFLAGS) $(BASE_CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -DSMP -o $@ -c $< $(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -DSMP -o $@ -c $<
endef endef
define DO_BOT_CC define DO_BOT_CC
$(echo_cmd) "BOT_CC $<" $(echo_cmd) "BOT_CC $<"
$(Q)$(CC) $(NOTSHLIBCFLAGS) $(BASE_CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $< $(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $<
endef endef
ifeq ($(GENERATE_DEPENDENCIES),1) ifeq ($(GENERATE_DEPENDENCIES),1)
@ -940,60 +940,60 @@ endif
define DO_SHLIB_CC define DO_SHLIB_CC
$(echo_cmd) "SHLIB_CC $<" $(echo_cmd) "SHLIB_CC $<"
$(Q)$(CC) $(SHLIBCFLAGS) $(BASE_CFLAGS) $(OPTIMIZEVM) -o $@ -c $< $(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
$(Q)$(DO_QVM_DEP) $(Q)$(DO_QVM_DEP)
endef endef
define DO_GAME_CC define DO_GAME_CC
$(echo_cmd) "GAME_CC $<" $(echo_cmd) "GAME_CC $<"
$(Q)$(CC) -DQAGAME $(SHLIBCFLAGS) $(BASE_CFLAGS) $(OPTIMIZEVM) -o $@ -c $< $(Q)$(CC) -DQAGAME $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
$(Q)$(DO_QVM_DEP) $(Q)$(DO_QVM_DEP)
endef endef
define DO_CGAME_CC define DO_CGAME_CC
$(echo_cmd) "CGAME_CC $<" $(echo_cmd) "CGAME_CC $<"
$(Q)$(CC) -DCGAME $(SHLIBCFLAGS) $(BASE_CFLAGS) $(OPTIMIZEVM) -o $@ -c $< $(Q)$(CC) -DCGAME $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
$(Q)$(DO_QVM_DEP) $(Q)$(DO_QVM_DEP)
endef endef
define DO_UI_CC define DO_UI_CC
$(echo_cmd) "UI_CC $<" $(echo_cmd) "UI_CC $<"
$(Q)$(CC) -DUI $(SHLIBCFLAGS) $(BASE_CFLAGS) $(OPTIMIZEVM) -o $@ -c $< $(Q)$(CC) -DUI $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
$(Q)$(DO_QVM_DEP) $(Q)$(DO_QVM_DEP)
endef endef
define DO_SHLIB_CC_MISSIONPACK define DO_SHLIB_CC_MISSIONPACK
$(echo_cmd) "SHLIB_CC_MISSIONPACK $<" $(echo_cmd) "SHLIB_CC_MISSIONPACK $<"
$(Q)$(CC) -DMISSIONPACK $(SHLIBCFLAGS) $(BASE_CFLAGS) $(OPTIMIZEVM) -o $@ -c $< $(Q)$(CC) -DMISSIONPACK $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
$(Q)$(DO_QVM_DEP) $(Q)$(DO_QVM_DEP)
endef endef
define DO_GAME_CC_MISSIONPACK define DO_GAME_CC_MISSIONPACK
$(echo_cmd) "GAME_CC_MISSIONPACK $<" $(echo_cmd) "GAME_CC_MISSIONPACK $<"
$(Q)$(CC) -DMISSIONPACK -DQAGAME $(SHLIBCFLAGS) $(BASE_CFLAGS) $(OPTIMIZEVM) -o $@ -c $< $(Q)$(CC) -DMISSIONPACK -DQAGAME $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
$(Q)$(DO_QVM_DEP) $(Q)$(DO_QVM_DEP)
endef endef
define DO_CGAME_CC_MISSIONPACK define DO_CGAME_CC_MISSIONPACK
$(echo_cmd) "CGAME_CC_MISSIONPACK $<" $(echo_cmd) "CGAME_CC_MISSIONPACK $<"
$(Q)$(CC) -DMISSIONPACK -DCGAME $(SHLIBCFLAGS) $(BASE_CFLAGS) $(OPTIMIZEVM) -o $@ -c $< $(Q)$(CC) -DMISSIONPACK -DCGAME $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
$(Q)$(DO_QVM_DEP) $(Q)$(DO_QVM_DEP)
endef endef
define DO_UI_CC_MISSIONPACK define DO_UI_CC_MISSIONPACK
$(echo_cmd) "UI_CC_MISSIONPACK $<" $(echo_cmd) "UI_CC_MISSIONPACK $<"
$(Q)$(CC) -DMISSIONPACK -DUI $(SHLIBCFLAGS) $(BASE_CFLAGS) $(OPTIMIZEVM) -o $@ -c $< $(Q)$(CC) -DMISSIONPACK -DUI $(SHLIBCFLAGS) $(CFLAGS) $(OPTIMIZEVM) -o $@ -c $<
$(Q)$(DO_QVM_DEP) $(Q)$(DO_QVM_DEP)
endef endef
define DO_AS define DO_AS
$(echo_cmd) "AS $<" $(echo_cmd) "AS $<"
$(Q)$(CC) $(BASE_CFLAGS) $(OPTIMIZE) -x assembler-with-cpp -o $@ -c $< $(Q)$(CC) $(CFLAGS) $(OPTIMIZE) -x assembler-with-cpp -o $@ -c $<
endef endef
define DO_DED_CC define DO_DED_CC
$(echo_cmd) "DED_CC $<" $(echo_cmd) "DED_CC $<"
$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(BASE_CFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $< $(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
endef endef
define DO_WINDRES define DO_WINDRES
@ -1010,12 +1010,12 @@ default: release
all: debug release all: debug release
debug: debug:
@$(MAKE) targets B=$(BD) BASE_CFLAGS="$(BASE_CFLAGS) $(DEPEND_CFLAGS)" \ @$(MAKE) targets B=$(BD) CFLAGS="$(CFLAGS) $(BASE_CFLAGS) $(DEPEND_CFLAGS)" \
OPTIMIZE="$(DEBUG_CFLAGS)" OPTIMIZEVM="$(DEBUG_CFLAGS)" \ OPTIMIZE="$(DEBUG_CFLAGS)" OPTIMIZEVM="$(DEBUG_CFLAGS)" \
CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V) CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V)
release: release:
@$(MAKE) targets B=$(BR) BASE_CFLAGS="$(BASE_CFLAGS) $(DEPEND_CFLAGS)" \ @$(MAKE) targets B=$(BR) CFLAGS="$(CFLAGS) $(BASE_CFLAGS) $(DEPEND_CFLAGS)" \
OPTIMIZE="$(OPTIMIZE)" OPTIMIZEVM="$(OPTIMIZEVM)" \ OPTIMIZE="$(OPTIMIZE)" OPTIMIZEVM="$(OPTIMIZEVM)" \
CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V) CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V)
@ -1036,6 +1036,22 @@ targets: makedirs
do \ do \
echo " $$i"; \ echo " $$i"; \
done done
-@for i in $(OPTIMIZE); \
do \
echo " $$i"; \
done
@echo ""
@echo " CLIENT_CFLAGS:"
-@for i in $(CLIENT_CFLAGS); \
do \
echo " $$i"; \
done
@echo ""
@echo " SERVER_CFLAGS:"
-@for i in $(SERVER_CFLAGS); \
do \
echo " $$i"; \
done
@echo "" @echo ""
@echo " LDFLAGS:" @echo " LDFLAGS:"
-@for i in $(LDFLAGS); \ -@for i in $(LDFLAGS); \