r1175 - trunk

[DONOTREPLY at icculus.org]

Author: tma
Date: 2007-09-10 16:10:39 -0400 (Mon, 10 Sep 2007)
New Revision: 1175

Modified:
   trunk/Makefile
Log:
* Revert to 1172


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-09-10 19:29:41 UTC (rev 1174)
+++ trunk/Makefile	2007-09-10 20:10:39 UTC (rev 1175)
@@ -10,12 +10,7 @@
   # 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 @@
 
 INSTALL=install
 MKDIR=mkdir
-GREP=grep
 
 ifeq ($(PLATFORM),linux)
 
@@ -593,11 +587,9 @@
 
 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 @@
     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,17 +874,16 @@
                -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
 #############################################################################