Fixed PRODUCT_NAME in qvms, STANDALONE wasn't getting defined.

This commit is contained in:
zturtleman 2011-08-03 21:47:52 +00:00
parent 6c68e512c7
commit 64cc000c90

View file

@ -49,6 +49,10 @@ ifneq ($(PLATFORM),darwin)
BUILD_CLIENT_SMP = 0
endif
ifndef BUILD_DEFINES
BUILD_DEFINES =
endif
# ioquake3 svn version that this is based on
IOQ3_REVISION = 2105
@ -937,7 +941,7 @@ ifeq ($(USE_LOCAL_HEADERS),1)
endif
ifeq ($(BUILD_STANDALONE),1)
BASE_CFLAGS += -DSTANDALONE
BUILD_DEFINES += -DSTANDALONE
endif
ifeq ($(GENERATE_DEPENDENCIES),1)
@ -958,6 +962,8 @@ BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute
BASE_CFLAGS += -Wdisabled-optimization
BASE_CFLAGS += -Werror-implicit-function-declaration
BASE_CFLAGS += $(BUILD_DEFINES)
ifeq ($(V),1)
echo_cmd=@:
Q=
@ -1277,42 +1283,42 @@ $(Q3LCC): $(Q3LCCOBJ) $(Q3RCC) $(Q3CPP)
define DO_Q3LCC
$(echo_cmd) "Q3LCC $<"
$(Q)$(Q3LCC) -o $@ $<
$(Q)$(Q3LCC) $(BUILD_DEFINES) -o $@ $<
endef
define DO_CGAME_Q3LCC
$(echo_cmd) "CGAME_Q3LCC $<"
$(Q)$(Q3LCC) -DCGAME -o $@ $<
$(Q)$(Q3LCC) -DCGAME $(BUILD_DEFINES) -o $@ $<
endef
define DO_GAME_Q3LCC
$(echo_cmd) "GAME_Q3LCC $<"
$(Q)$(Q3LCC) -DQAGAME -o $@ $<
$(Q)$(Q3LCC) -DQAGAME $(BUILD_DEFINES) -o $@ $<
endef
define DO_UI_Q3LCC
$(echo_cmd) "UI_Q3LCC $<"
$(Q)$(Q3LCC) -DUI -o $@ $<
$(Q)$(Q3LCC) -DUI $(BUILD_DEFINES) -o $@ $<
endef
define DO_Q3LCC_MISSIONPACK
$(echo_cmd) "Q3LCC_MISSIONPACK $<"
$(Q)$(Q3LCC) -DMISSIONPACK -o $@ $<
$(Q)$(Q3LCC) -DMISSIONPACK $(BUILD_DEFINES) -o $@ $<
endef
define DO_CGAME_Q3LCC_MISSIONPACK
$(echo_cmd) "CGAME_Q3LCC_MISSIONPACK $<"
$(Q)$(Q3LCC) -DMISSIONPACK -DCGAME -o $@ $<
$(Q)$(Q3LCC) -DMISSIONPACK -DCGAME $(BUILD_DEFINES) -o $@ $<
endef
define DO_GAME_Q3LCC_MISSIONPACK
$(echo_cmd) "GAME_Q3LCC_MISSIONPACK $<"
$(Q)$(Q3LCC) -DMISSIONPACK -DQAGAME -o $@ $<
$(Q)$(Q3LCC) -DMISSIONPACK -DQAGAME $(BUILD_DEFINES) -o $@ $<
endef
define DO_UI_Q3LCC_MISSIONPACK
$(echo_cmd) "UI_Q3LCC_MISSIONPACK $<"
$(Q)$(Q3LCC) -DMISSIONPACK -DUI -o $@ $<
$(Q)$(Q3LCC) -DMISSIONPACK -DUI $(BUILD_DEFINES) -o $@ $<
endef