q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-24 12:51:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove BUILD_DEFINES from Makefile

Browse source 
It doesn't need to be configured.
This commit is contained in:
Zack Middleton 2023-12-18 20:47:11 -06:00
parent 227e401356
commit a19b0be747
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
engine/Makefile
View file

@ -47,10 +47,6 @@ ifndef BUILD_AUTOUPDATER # DON'T build unless you mean to!
BUILD_AUTOUPDATER=0 BUILD_AUTOUPDATER=0
endif endif
ifndef BUILD_DEFINES
BUILD_DEFINES =
endif
# ioquake3 git commit that this is based on # ioquake3 git commit that this is based on
IOQ3_REVISION = b1e6ef14 IOQ3_REVISION = b1e6ef14
@ -1307,7 +1303,8 @@ ifeq ($(USE_LOCAL_HEADERS),1)
endif endif
ifeq ($(BUILD_STANDALONE),1) ifeq ($(BUILD_STANDALONE),1)
BUILD_DEFINES += -DSTANDALONE BASE_CFLAGS += -DSTANDALONE
QVM_CFLAGS += -DSTANDALONE
endif endif
ifeq ($(GENERATE_DEPENDENCIES),1) ifeq ($(GENERATE_DEPENDENCIES),1)
@ -1333,8 +1330,6 @@ BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute
BASE_CFLAGS += -Wdisabled-optimization BASE_CFLAGS += -Wdisabled-optimization
BASE_CFLAGS += -Werror-implicit-function-declaration BASE_CFLAGS += -Werror-implicit-function-declaration
BASE_CFLAGS += $(BUILD_DEFINES)
ifeq ($(V),1) ifeq ($(V),1)
echo_cmd=@: echo_cmd=@:
Q= Q=
@ -1744,42 +1739,42 @@ $(STRINGIFY): $(TOOLSDIR)/stringify.c
define DO_Q3LCC define DO_Q3LCC
$(echo_cmd) "Q3LCC $<" $(echo_cmd) "Q3LCC $<"
$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) $(BUILD_DEFINES) -o $@ $< $(Q)$(Q3LCC) $(BASEGAME_CFLAGS) $(QVM_CFLAGS) -o $@ $<
endef endef
define DO_CGAME_Q3LCC define DO_CGAME_Q3LCC
$(echo_cmd) "CGAME_Q3LCC $<" $(echo_cmd) "CGAME_Q3LCC $<"
$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DCGAME $(BUILD_DEFINES) -o $@ $< $(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DCGAME $(QVM_CFLAGS) -o $@ $<
endef endef
define DO_GAME_Q3LCC define DO_GAME_Q3LCC
$(echo_cmd) "GAME_Q3LCC $<" $(echo_cmd) "GAME_Q3LCC $<"
$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DQAGAME $(BUILD_DEFINES) -o $@ $< $(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DQAGAME $(QVM_CFLAGS) -o $@ $<
endef endef
define DO_UI_Q3LCC define DO_UI_Q3LCC
$(echo_cmd) "UI_Q3LCC $<" $(echo_cmd) "UI_Q3LCC $<"
$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DUI $(BUILD_DEFINES) -o $@ $< $(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -DUI $(QVM_CFLAGS) -o $@ $<
endef endef
define DO_Q3LCC_MISSIONPACK define DO_Q3LCC_MISSIONPACK
$(echo_cmd) "Q3LCC_MISSIONPACK $<" $(echo_cmd) "Q3LCC_MISSIONPACK $<"
$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) $(BUILD_DEFINES) -o $@ $< $(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) $(QVM_CFLAGS) -o $@ $<
endef endef
define DO_CGAME_Q3LCC_MISSIONPACK define DO_CGAME_Q3LCC_MISSIONPACK
$(echo_cmd) "CGAME_Q3LCC_MISSIONPACK $<" $(echo_cmd) "CGAME_Q3LCC_MISSIONPACK $<"
$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DCGAME $(BUILD_DEFINES) -o $@ $< $(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DCGAME $(QVM_CFLAGS) -o $@ $<
endef endef
define DO_GAME_Q3LCC_MISSIONPACK define DO_GAME_Q3LCC_MISSIONPACK
$(echo_cmd) "GAME_Q3LCC_MISSIONPACK $<" $(echo_cmd) "GAME_Q3LCC_MISSIONPACK $<"
$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DQAGAME $(BUILD_DEFINES) -o $@ $< $(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DQAGAME $(QVM_CFLAGS) -o $@ $<
endef endef
define DO_UI_Q3LCC_MISSIONPACK define DO_UI_Q3LCC_MISSIONPACK
$(echo_cmd) "UI_Q3LCC_MISSIONPACK $<" $(echo_cmd) "UI_Q3LCC_MISSIONPACK $<"
$(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DUI $(BUILD_DEFINES) -o $@ $< $(Q)$(Q3LCC) $(MISSIONPACK_CFLAGS) -DUI $(QVM_CFLAGS) -o $@ $<
endef endef