ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Revert to 1172

Browse source
This commit is contained in:
Tim Angus 2007-09-10 20:10:39 +00:00
parent 8ca91d6731
commit d6f32df425
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -9,14 +9,9 @@ COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
ifeq ($(COMPILE_PLATFORM),darwin) ifeq ($(COMPILE_PLATFORM),darwin)
# Apple does some things a little differently... # Apple does some things a little differently...
COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/) COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
else
ifeq ($(COMPILE_PLATFORM),sunos)
# So does SunOS
COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
else else
COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/) COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/)
endif endif
endif
ifeq ($(COMPILE_PLATFORM),mingw32) ifeq ($(COMPILE_PLATFORM),mingw32)
ifeq ($(COMPILE_ARCH),i386) ifeq ($(COMPILE_ARCH),i386)
@ -167,7 +162,6 @@ LIB=lib
INSTALL=install INSTALL=install
MKDIR=mkdir MKDIR=mkdir
GREP=grep
ifeq ($(PLATFORM),linux) ifeq ($(PLATFORM),linux)
@ -593,11 +587,9 @@ else # ifeq IRIX
ifeq ($(PLATFORM),sunos) ifeq ($(PLATFORM),sunos)
CROSS_COMPILING=0
CC=gcc CC=gcc
INSTALL=ginstall INSTALL=ginstall
MKDIR=gmkdir MKDIR=gmkdir
GREP=/usr/xpg4/bin/grep
COPYDIR="/usr/local/share/games/quake3" COPYDIR="/usr/local/share/games/quake3"
ifneq (,$(findstring i86pc,$(shell uname -m))) ifneq (,$(findstring i86pc,$(shell uname -m)))
@ -639,7 +631,6 @@ ifeq ($(PLATFORM),sunos)
BASE_CFLAGS += -DNO_VM_COMPILED BASE_CFLAGS += -DNO_VM_COMPILED
endif endif
BASE_CFLAGS += -I$(SDL_DIR)/include
DEBUG_CFLAGS = $(BASE_CFLAGS) -ggdb -O0 DEBUG_CFLAGS = $(BASE_CFLAGS) -ggdb -O0
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
@ -883,16 +874,15 @@ BASE_CFLAGS += -DMINSDL_MAJOR=$(MINSDL_MAJOR) \
-DMINSDL_PATCH=$(MINSDL_PATCH) -DMINSDL_PATCH=$(MINSDL_PATCH)
libversioncheck: libversioncheck:
ifneq ($(COMPILE_PLATFORM),sunos)
@/bin/echo -e "#include \"SDL_version.h\"\n" \ @/bin/echo -e "#include \"SDL_version.h\"\n" \
"#if SDL_VERSION_ATLEAST(" \ "#if SDL_VERSION_ATLEAST(" \
"$(MINSDL_MAJOR),$(MINSDL_MINOR),$(MINSDL_PATCH)" \ "$(MINSDL_MAJOR),$(MINSDL_MINOR),$(MINSDL_PATCH)" \
")\nMINSDL_PASSED\n#endif" | \ ")\nMINSDL_PASSED\n#endif" | \
$(CC) $(BASE_CFLAGS) -E - | $(GREP) -q MINSDL_PASSED || \ $(CC) $(BASE_CFLAGS) -E - | grep -q MINSDL_PASSED || \
( /bin/echo "SDL version" \ ( /bin/echo "SDL version" \
"$(MINSDL_MAJOR).$(MINSDL_MINOR).$(MINSDL_PATCH)" \ "$(MINSDL_MAJOR).$(MINSDL_MINOR).$(MINSDL_PATCH)" \
"or greater required" && exit 1 ) "or greater required" && exit 1 )
endif
############################################################################# #############################################################################
# CLIENT/SERVER # CLIENT/SERVER