zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix building with `make -B`. (`make veryclean` is now obsolete.) DONT_BUILD. 

git-svn-id: https://svn.eduke32.com/eduke32@4807 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2014-12-09 23:56:31 +00:00
parent a8455d5caf
commit c956f350b7
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
polymer/eduke32/Makefile
View File

@ -599,7 +599,7 @@ $(TESTGAME_RSRC)/%_banner.c: $(TESTGAME_RSRC)/%.bmp
gdk-pixbuf-csource --extern --struct --raw --name=startbanner_pixdata $^ | sed 's/load_inc//' >> $@ gdk-pixbuf-csource --extern --struct --raw --name=startbanner_pixdata $^ | sed 's/load_inc//' >> $@
$(ENGINE_OBJ) $(AUDIOLIB_OBJ) $(ENET_OBJ) $(DUKE3D_OBJ) $(TESTGAME_OBJ): $(ENGINE_OBJ) $(AUDIOLIB_OBJ) $(ENET_OBJ) $(DUKE3D_OBJ) $(TESTGAME_OBJ):
mkdir $@ -mkdir $@ $(DONT_PRINT) $(DONT_FAIL)
## PHONIES ## PHONIES

32
polymer/eduke32/Makefile.common
View File

@ -25,6 +25,9 @@ STRIP=$(CROSS)strip
AS=nasm AS=nasm
PKG_CONFIG=pkg-config PKG_CONFIG=pkg-config
DONT_PRINT = > /dev/null 2>&1
DONT_FAIL = ; exit 0
# Override defaults that absolutely will not work. # Override defaults that absolutely will not work.
ifeq ($(CC),cc) ifeq ($(CC),cc)
override CC=gcc override CC=gcc
@ -97,37 +100,40 @@ SYSBITS=32
# the outside world. This allows cross-compilation by overriding # the outside world. This allows cross-compilation by overriding
# CC and giving us PLATFORM specifically. # CC and giving us PLATFORM specifically.
# #
ifndef PLATFORM ifndef HOST
uname:=$(strip $(shell uname -s)) uname:=$(strip $(shell uname -s))
PLATFORM=UNKNOWN HOST=UNKNOWN
ifeq ($(findstring Linux,$(uname)),Linux) ifeq ($(findstring Linux,$(uname)),Linux)
PLATFORM=LINUX HOST=LINUX
endif endif
ifeq ($(findstring BSD,$(uname)),BSD) ifeq ($(findstring BSD,$(uname)),BSD)
PLATFORM=BSD HOST=BSD
endif endif
ifeq ($(findstring MINGW,$(uname)),MINGW) ifeq ($(findstring MINGW,$(uname)),MINGW)
PLATFORM=WINDOWS HOST=WINDOWS
endif endif
ifeq ($(findstring Darwin,$(uname)),Darwin) ifeq ($(findstring Darwin,$(uname)),Darwin)
PLATFORM=DARWIN HOST=DARWIN
endif endif
ifeq ($(findstring BeOS,$(uname)),BeOS) ifeq ($(findstring BeOS,$(uname)),BeOS)
PLATFORM=BEOS HOST=BEOS
endif endif
ifeq ($(findstring skyos,$(uname)),skyos) ifeq ($(findstring skyos,$(uname)),skyos)
PLATFORM=SKYOS HOST=SKYOS
endif endif
ifeq ($(findstring QNX,$(uname)),QNX) ifeq ($(findstring QNX,$(uname)),QNX)
PLATFORM=QNX HOST=QNX
endif endif
ifeq ($(findstring SunOS,$(uname)),SunOS) ifeq ($(findstring SunOS,$(uname)),SunOS)
PLATFORM=SUNOS HOST=SUNOS
endif endif
ifeq ($(findstring syllable,$(uname)),syllable) ifeq ($(findstring syllable,$(uname)),syllable)
PLATFORM=SYLLABLE HOST=SYLLABLE
endif endif
endif endif
ifndef PLATFORM
PLATFORM=$(HOST)
endif
ifndef SUBPLATFORM ifndef SUBPLATFORM
SUBPLATFORM= SUBPLATFORM=
@ -286,6 +292,10 @@ ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4)))
W_STRICT_OVERFLOW := -Wno-strict-overflow W_STRICT_OVERFLOW := -Wno-strict-overflow
endif endif
ifeq ($(HOST),WINDOWS)
DONT_PRINT = > NUL 2>&1
endif
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
ifndef COMPILERTARGET ifndef COMPILERTARGET
COMPILERTARGET:=$(strip $(shell $(CC) -dumpmachine)) COMPILERTARGET:=$(strip $(shell $(CC) -dumpmachine))