diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-09-10 20:10:39 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-09-10 20:10:39 +0000 |
| commit | a5692b8d3f5757e9feb502c448183275de16f3bc (patch) | |
| tree | dc0ed8f41912cb310da0556f726d394808b8abd5 | |
| parent | cce17c47ea2fcaea762c0d28a8445c2ce0e88c9b (diff) | |
| download | ioquake3-aero-a5692b8d3f5757e9feb502c448183275de16f3bc.tar.gz ioquake3-aero-a5692b8d3f5757e9feb502c448183275de16f3bc.zip | |
* Revert to 1172
git-svn-id: svn://svn.icculus.org/quake3/trunk@1175 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | Makefile | 16 |
1 files changed, 3 insertions, 13 deletions
@@ -10,12 +10,7 @@ ifeq ($(COMPILE_PLATFORM),darwin) # Apple does some things a little differently... 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 - COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/) - endif + COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/) endif ifeq ($(COMPILE_PLATFORM),mingw32) @@ -167,7 +162,6 @@ LIB=lib INSTALL=install MKDIR=mkdir -GREP=grep ifeq ($(PLATFORM),linux) @@ -593,11 +587,9 @@ else # ifeq IRIX ifeq ($(PLATFORM),sunos) - CROSS_COMPILING=0 CC=gcc INSTALL=ginstall MKDIR=gmkdir - GREP=/usr/xpg4/bin/grep COPYDIR="/usr/local/share/games/quake3" ifneq (,$(findstring i86pc,$(shell uname -m))) @@ -639,7 +631,6 @@ ifeq ($(PLATFORM),sunos) BASE_CFLAGS += -DNO_VM_COMPILED endif - BASE_CFLAGS += -I$(SDL_DIR)/include DEBUG_CFLAGS = $(BASE_CFLAGS) -ggdb -O0 RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) @@ -883,16 +874,15 @@ BASE_CFLAGS += -DMINSDL_MAJOR=$(MINSDL_MAJOR) \ -DMINSDL_PATCH=$(MINSDL_PATCH) libversioncheck: -ifneq ($(COMPILE_PLATFORM),sunos) @/bin/echo -e "#include \"SDL_version.h\"\n" \ "#if SDL_VERSION_ATLEAST(" \ "$(MINSDL_MAJOR),$(MINSDL_MINOR),$(MINSDL_PATCH)" \ ")\nMINSDL_PASSED\n#endif" | \ - $(CC) $(BASE_CFLAGS) -E - | $(GREP) -q MINSDL_PASSED || \ + $(CC) $(BASE_CFLAGS) -E - | grep -q MINSDL_PASSED || \ ( /bin/echo "SDL version" \ "$(MINSDL_MAJOR).$(MINSDL_MINOR).$(MINSDL_PATCH)" \ "or greater required" && exit 1 ) -endif + ############################################################################# # CLIENT/SERVER |