r1173 - trunk

[DONOTREPLY at icculus.org]

Author: coyote
Date: 2007-09-10 12:41:09 -0400 (Mon, 10 Sep 2007)
New Revision: 1173

Modified:
   trunk/Makefile
Log:
Minor changes for SunOS...


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-09-09 07:20:12 UTC (rev 1172)
+++ trunk/Makefile	2007-09-10 16:41:09 UTC (rev 1173)
@@ -10,7 +10,12 @@
   # Apple does some things a little differently...
   COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
 else
-  COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/)
+  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
 endif
 
 ifeq ($(COMPILE_PLATFORM),mingw32)
@@ -162,6 +167,7 @@
 
 INSTALL=install
 MKDIR=mkdir
+GREP=grep
 
 ifeq ($(PLATFORM),linux)
 
@@ -587,10 +593,13 @@
 
 ifeq ($(PLATFORM),sunos)
 
+  CROSS_COMPILING=0
   CC=gcc
   INSTALL=ginstall
   MKDIR=gmkdir
+  GREP=/usr/xpg4/bin/grep
   COPYDIR="/usr/local/share/games/quake3"
+  SDL_DIR=/usr/local
 
   ifneq (,$(findstring i86pc,$(shell uname -m)))
     ARCH=i386
@@ -631,6 +640,7 @@
     BASE_CFLAGS += -DNO_VM_COMPILED
   endif
 
+  BASE_CFLAGS += -I$(SDL_DIR)/include
   DEBUG_CFLAGS = $(BASE_CFLAGS) -ggdb -O0
 
   RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
@@ -878,7 +888,7 @@
 		"#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 )