mirror of
https://github.com/ZDoom/Raze.git
synced 2024-11-15 17:01:28 +00:00
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:
parent
a8455d5caf
commit
c956f350b7
2 changed files with 22 additions and 12 deletions
|
@ -599,7 +599,7 @@ $(TESTGAME_RSRC)/%_banner.c: $(TESTGAME_RSRC)/%.bmp
|
|||
gdk-pixbuf-csource --extern --struct --raw --name=startbanner_pixdata $^ | sed 's/load_inc//' >> $@
|
||||
|
||||
$(ENGINE_OBJ) $(AUDIOLIB_OBJ) $(ENET_OBJ) $(DUKE3D_OBJ) $(TESTGAME_OBJ):
|
||||
mkdir $@
|
||||
-mkdir $@ $(DONT_PRINT) $(DONT_FAIL)
|
||||
|
||||
## PHONIES
|
||||
|
||||
|
|
|
@ -25,6 +25,9 @@ STRIP=$(CROSS)strip
|
|||
AS=nasm
|
||||
PKG_CONFIG=pkg-config
|
||||
|
||||
DONT_PRINT = > /dev/null 2>&1
|
||||
DONT_FAIL = ; exit 0
|
||||
|
||||
# Override defaults that absolutely will not work.
|
||||
ifeq ($(CC),cc)
|
||||
override CC=gcc
|
||||
|
@ -97,37 +100,40 @@ SYSBITS=32
|
|||
# the outside world. This allows cross-compilation by overriding
|
||||
# CC and giving us PLATFORM specifically.
|
||||
#
|
||||
ifndef PLATFORM
|
||||
ifndef HOST
|
||||
uname:=$(strip $(shell uname -s))
|
||||
PLATFORM=UNKNOWN
|
||||
HOST=UNKNOWN
|
||||
ifeq ($(findstring Linux,$(uname)),Linux)
|
||||
PLATFORM=LINUX
|
||||
HOST=LINUX
|
||||
endif
|
||||
ifeq ($(findstring BSD,$(uname)),BSD)
|
||||
PLATFORM=BSD
|
||||
HOST=BSD
|
||||
endif
|
||||
ifeq ($(findstring MINGW,$(uname)),MINGW)
|
||||
PLATFORM=WINDOWS
|
||||
HOST=WINDOWS
|
||||
endif
|
||||
ifeq ($(findstring Darwin,$(uname)),Darwin)
|
||||
PLATFORM=DARWIN
|
||||
HOST=DARWIN
|
||||
endif
|
||||
ifeq ($(findstring BeOS,$(uname)),BeOS)
|
||||
PLATFORM=BEOS
|
||||
HOST=BEOS
|
||||
endif
|
||||
ifeq ($(findstring skyos,$(uname)),skyos)
|
||||
PLATFORM=SKYOS
|
||||
HOST=SKYOS
|
||||
endif
|
||||
ifeq ($(findstring QNX,$(uname)),QNX)
|
||||
PLATFORM=QNX
|
||||
HOST=QNX
|
||||
endif
|
||||
ifeq ($(findstring SunOS,$(uname)),SunOS)
|
||||
PLATFORM=SUNOS
|
||||
HOST=SUNOS
|
||||
endif
|
||||
ifeq ($(findstring syllable,$(uname)),syllable)
|
||||
PLATFORM=SYLLABLE
|
||||
HOST=SYLLABLE
|
||||
endif
|
||||
endif
|
||||
ifndef PLATFORM
|
||||
PLATFORM=$(HOST)
|
||||
endif
|
||||
|
||||
ifndef SUBPLATFORM
|
||||
SUBPLATFORM=
|
||||
|
@ -286,6 +292,10 @@ ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4)))
|
|||
W_STRICT_OVERFLOW := -Wno-strict-overflow
|
||||
endif
|
||||
|
||||
ifeq ($(HOST),WINDOWS)
|
||||
DONT_PRINT = > NUL 2>&1
|
||||
endif
|
||||
|
||||
ifeq ($(PLATFORM),WINDOWS)
|
||||
ifndef COMPILERTARGET
|
||||
COMPILERTARGET:=$(strip $(shell $(CC) -dumpmachine))
|
||||
|
|
Loading…
Reference in a new issue