zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 04:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile: Remove "dxtools" and "sdltools" as separate categories, and instead build them along with the normal tools when conditions of their target environment are met.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6092 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-03-23 03:03:29 +00:00
parent 30ef04893b
commit 6fbf4e6f1c
1 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
GNUmakefile
View file

@ -274,12 +274,12 @@ TOOLS_TARGETS= \
ivfrate \ ivfrate \
map2stl \ map2stl \
DXTOOLS_TARGETS= \ ifeq ($(PLATFORM),WINDOWS)
enumdisplay \ TOOLS_TARGETS+= enumdisplay getdxdidf
getdxdidf \ endif
ifeq ($(RENDERTYPE),SDL)
SDLTOOLS_TARGETS= \ TOOLS_TARGETS+= makesdlkeytrans
makesdlkeytrans \ endif
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
TOOLS_OBJS += osxbits TOOLS_OBJS += osxbits
@ -672,7 +672,7 @@ SW_EDITOR_OBJS_EXP:=$(addprefix $(SW_OBJ)/,$(addsuffix .$o,$(SW_EDITOR_OBJS)))
ifeq ($(PRETTY_OUTPUT),1) ifeq ($(PRETTY_OUTPUT),1)
.SILENT: .SILENT:
endif endif
.PHONY: all duke3d test kenbuild sw veryclean clean cleanduke3d cleantest cleansw cleanutils utils dxutils sdlutils printutils printsdlutils printdxutils cleantools tools dxtools sdltools printtools printsdltools printdxtools rev $(ENGINE_OBJ)/rev.$o .PHONY: all duke3d test kenbuild sw veryclean clean cleanduke3d cleantest cleansw cleanutils utils printutils cleantools tools printtools rev $(ENGINE_OBJ)/rev.$o
.SUFFIXES: .SUFFIXES:
# TARGETS # TARGETS
@ -700,12 +700,6 @@ start:
tools: $(addsuffix $(EXESUFFIX),$(TOOLS_TARGETS)) tools: $(addsuffix $(EXESUFFIX),$(TOOLS_TARGETS))
@ls -l $^ @ls -l $^
dxtools: $(addsuffix $(EXESUFFIX),$(DXTOOLS_TARGETS))
@ls -l $^
sdltools: $(addsuffix $(EXESUFFIX),$(SDLTOOLS_TARGETS))
@ls -l $^
ifeq ($(PLATFORM),WII) ifeq ($(PLATFORM),WII)
ifneq ($(ELF2DOL),) ifneq ($(ELF2DOL),)
$(KENBUILD_GAME)$(DOLSUFFIX): $(KENBUILD_GAME)$(EXESUFFIX) $(KENBUILD_GAME)$(DOLSUFFIX): $(KENBUILD_GAME)$(EXESUFFIX)
@ -988,7 +982,7 @@ cleansw:
-rm -f $(SW_GAME)$(EXESUFFIX) $(SW_EDITOR)$(EXESUFFIX) -rm -f $(SW_GAME)$(EXESUFFIX) $(SW_EDITOR)$(EXESUFFIX)
cleantools: cleantools:
-rm -f $(addsuffix $(EXESUFFIX),$(TOOLS_TARGETS) $(DXTOOLS_TARGETS) $(SDLTOOLS_TARGETS)) -rm -f $(addsuffix $(EXESUFFIX),$(TOOLS_TARGETS))
clean: cleanduke3d cleantools clean: cleanduke3d cleantools
-rm -rf $(obj)/ -rm -rf $(obj)/
@ -997,12 +991,6 @@ clean: cleanduke3d cleantools
printtools: printtools:
echo "$(addsuffix $(EXESUFFIX),$(TOOLS_TARGETS))" echo "$(addsuffix $(EXESUFFIX),$(TOOLS_TARGETS))"
printdxtools:
echo "$(addsuffix $(EXESUFFIX),$(DXTOOLS_TARGETS))"
printsdltools:
echo "$(addsuffix $(EXESUFFIX),$(SDLTOOLS_TARGETS))"
rev: $(ENGINE_OBJ)/rev.$o rev: $(ENGINE_OBJ)/rev.$o
@ -1010,10 +998,6 @@ rev: $(ENGINE_OBJ)/rev.$o
test: kenbuild test: kenbuild
utils: tools utils: tools
dxutils: dxtools
sdlutils: sdltools
printutils: printtools printutils: printtools
printdxutils: printdxtools
printsdlutils: printsdltools
veryclean: clean veryclean: clean
cleanutils: cleantools cleanutils: cleantools