zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile tweaks: remove BUILD_FINISHED because it frequently appeared in the wrong place when using make -j, and remove "executable" wording from linking phase. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5279 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-07-08 03:34:34 +00:00
parent d47187a92d
commit 4fe25690e7
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
polymer/eduke32/Makefile
View file

@ -403,7 +403,7 @@ endif
all: duke3d all: duke3d
duke3d: start $(EDUKE32_TARGET) $(MAPSTER32_TARGET) finish duke3d: start $(EDUKE32_TARGET) $(MAPSTER32_TARGET)
ifneq (,$(EDUKE32_TARGET)) ifneq (,$(EDUKE32_TARGET))
@ls -l $(EDUKE32)$(EXESUFFIX) @ls -l $(EDUKE32)$(EXESUFFIX)
endif endif
@ -411,7 +411,7 @@ ifneq (,$(MAPSTER32_TARGET))
@ls -l $(MAPSTER32)$(EXESUFFIX) @ls -l $(MAPSTER32)$(EXESUFFIX)
endif endif
test: start $(TESTGAME_TARGET) $(TESTEDITOR_TARGET) finish test: start $(TESTGAME_TARGET) $(TESTEDITOR_TARGET)
ifneq (,$(TESTGAME_TARGET)) ifneq (,$(TESTGAME_TARGET))
@ls -l $(TESTGAME)$(EXESUFFIX) @ls -l $(TESTGAME)$(EXESUFFIX)
endif endif
@ -419,7 +419,7 @@ ifneq (,$(TESTEDITOR_TARGET))
@ls -l $(TESTEDITOR)$(EXESUFFIX) @ls -l $(TESTEDITOR)$(EXESUFFIX)
endif endif
sw: start $(SW_TARGET) $(SW_EDITOR_TARGET) finish sw: start $(SW_TARGET) $(SW_EDITOR_TARGET)
ifneq (,$(SW_TARGET)) ifneq (,$(SW_TARGET))
@ls -l $(SW)$(EXESUFFIX) @ls -l $(SW)$(EXESUFFIX)
endif endif
@ -427,7 +427,7 @@ ifneq (,$(SW_EDITOR_TARGET))
@ls -l $(SW_EDITOR)$(EXESUFFIX) @ls -l $(SW_EDITOR)$(EXESUFFIX)
endif endif
ebacktrace: start $(EBACKTRACEDLL_TARGET) finish ebacktrace: start $(EBACKTRACEDLL_TARGET)
ifneq (,$(EBACKTRACEDLL_TARGET)) ifneq (,$(EBACKTRACEDLL_TARGET))
@ls -l $(EBACKTRACEDLL) @ls -l $(EBACKTRACEDLL)
endif endif
@ -435,9 +435,6 @@ endif
start: start:
$(BUILD_STARTED) $(BUILD_STARTED)
finish:
$(BUILD_FINISHED)
utils: $(addsuffix $(EXESUFFIX),$(UTILS) $(GAMEUTILS)) utils: $(addsuffix $(EXESUFFIX),$(UTILS) $(GAMEUTILS))
@ls -l $^ @ls -l $^

14
polymer/eduke32/Makefile.common
View file

@ -1092,28 +1092,26 @@ else
endif endif
BUILD_STARTED = printf "\033[K\033[1;36mBuild started using:\033[0m\n"; $(BUILD_SETTINGS) BUILD_STARTED = printf "\033[K\033[1;36mBuild started using:\033[0m\n"; $(BUILD_SETTINGS)
BUILD_ECHOFLAGS = printf "\033[K\033[1;36mEnded compilation in this directory using:\n$(BUILD_SETTINGS_COMPILER)\033[0m\n" BUILD_ECHOFLAGS = printf "\033[K\033[1;36mEnded compilation in this directory using:\n$(BUILD_SETTINGS_COMPILER)\033[0m\n"
BUILD_FINISHED = printf "\033[K\033[1;36mBuild successful:\033[0m\n"
COMPILE_STATUS = printf "\033[K\033[0mBuilding object \033[1m$@\033[0m...\033[0m\r" COMPILE_STATUS = printf "\033[K\033[0mBuilding object \033[1m$@\033[0m...\033[0m\r"
COMPILE_OK = printf "\033[K\033[0;32mBuilt object \033[1;32m$@\033[0;32m \033[0m\n" COMPILE_OK = printf "\033[K\033[0;32mBuilt object \033[1;32m$@\033[0;32m \033[0m\n"
COMPILE_FAILED = printf "\033[K\033[0;31mFailed building \033[1;31m$@\033[0;31m from\033[0m \033[1;31m$<\033[0;31m!\033[0m\n"; exit 1 COMPILE_FAILED = printf "\033[K\033[0;31mFailed building \033[1;31m$@\033[0;31m from\033[0m \033[1;31m$<\033[0;31m!\033[0m\n"; exit 1
RECIPE_RESULT_COMPILE = ; then $(COMPILE_OK); else $(COMPILE_FAILED); fi RECIPE_RESULT_COMPILE = ; then $(COMPILE_OK); else $(COMPILE_FAILED); fi
ONESTEP_STATUS = printf "\033[K\033[0mBuilding executable \033[1m$@\033[0m...\033[0m\r" ONESTEP_STATUS = printf "\033[K\033[0mBuilding \033[1m$@\033[0m...\033[0m\r"
ONESTEP_OK = printf "\033[K\033[0;32mBuilt executable \033[1;32m$@\033[0;32m \033[0m\n" ONESTEP_OK = printf "\033[K\033[0;32mBuilt \033[1;32m$@\033[0;32m \033[0m\n"
ONESTEP_FAILED = printf "\033[K\033[0;31mFailed building executable \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1 ONESTEP_FAILED = printf "\033[K\033[0;31mFailed building \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1
RECIPE_RESULT_ONESTEP = ; then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi RECIPE_RESULT_ONESTEP = ; then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi
ARCHIVE_STATUS = printf "\033[K\033[0mCreating library archive \033[1m$@\033[0m...\033[0m\r" ARCHIVE_STATUS = printf "\033[K\033[0mCreating library archive \033[1m$@\033[0m...\033[0m\r"
ARCHIVE_OK = printf "\033[K\033[0;32mCreated library archive \033[1;32m$@\033[0;32m \033[0m\n" ARCHIVE_OK = printf "\033[K\033[0;32mCreated library archive \033[1;32m$@\033[0;32m \033[0m\n"
ARCHIVE_FAILED = printf "\033[K\033[0;31mFailed creating library archive \033[1;31m$@\033[0;31m from\033[0m \033[1;31m$<\033[0;31m!\033[0m\n"; exit 1 ARCHIVE_FAILED = printf "\033[K\033[0;31mFailed creating library archive \033[1;31m$@\033[0;31m from\033[0m \033[1;31m$<\033[0;31m!\033[0m\n"; exit 1
RECIPE_RESULT_ARCHIVE = ; then $(ARCHIVE_OK); else $(ARCHIVE_FAILED); fi RECIPE_RESULT_ARCHIVE = ; then $(ARCHIVE_OK); else $(ARCHIVE_FAILED); fi
LINK_STATUS = printf "\033[K\033[0;0mLinking executable \033[1m$@\033[0;0m...\033[0m\r" LINK_STATUS = printf "\033[K\033[0;0mLinking \033[1m$@\033[0;0m...\033[0m\r"
LINK_OK = printf "\033[K\033[0;32mLinked executable \033[1;32m$@\033[0;32m \033[0m\n" LINK_OK = printf "\033[K\033[0;32mLinked \033[1;32m$@\033[0;32m \033[0m\n"
LINK_FAILED = printf "\033[K\033[0;31mFailed linking executable \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1 LINK_FAILED = printf "\033[K\033[0;31mFailed linking \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1
RECIPE_RESULT_LINK = ; then $(LINK_OK); else $(LINK_FAILED); fi RECIPE_RESULT_LINK = ; then $(LINK_OK); else $(LINK_FAILED); fi
else else
RECIPE_IF = RECIPE_IF =
BUILD_STARTED = BUILD_STARTED =
BUILD_ECHOFLAGS = BUILD_ECHOFLAGS =
BUILD_FINISHED =
COMPILE_STATUS = COMPILE_STATUS =
COMPILE_OK = true COMPILE_OK = true
COMPILE_FAILED = false; exit 1 COMPILE_FAILED = false; exit 1