r995 - in trunk: . code/qcommon code/unix/setup

[DONOTREPLY at icculus.org]

Author: coyote
Date: 2006-11-30 03:01:43 -0500 (Thu, 30 Nov 2006)
New Revision: 995

Modified:
   trunk/Makefile
   trunk/code/qcommon/q_platform.h
   trunk/code/unix/setup/Solaris_pkg.sh
Log:
Changes to build defines for Solaris on i86pc. Minor fix to q_platform.h for Solaris.


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-11-29 23:31:20 UTC (rev 994)
+++ trunk/Makefile	2006-11-30 08:01:43 UTC (rev 995)
@@ -665,15 +665,22 @@
       -falign-jumps=2 -falign-functions=2 -fstrength-reduce \
       -mtune=ultrasparc -mv8plus -mno-faster-structs \
       -funroll-loops
-    BASE_CFLAGS += -DNO_VM_COMPILED
   else
   ifeq ($(ARCH),i386)
-    OPTIMIZE = -O3 -march=i586  -ffast-math \
-      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
-      -funroll-loops -fstrength-reduce
+    OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
+      -funroll-loops -falign-loops=2 -falign-jumps=2 \
+      -falign-functions=2 -fstrength-reduce
+    HAVE_VM_COMPILED=true
+    BASE_CFLAGS += -m32
+    LDFLAGS+=-m32
+    GL_CFLAGS+= -I/usr/X11/include/NVIDIA
   endif
   endif
 
+  ifneq ($(HAVE_VM_COMPILED),true)
+    BASE_CFLAGS += -DNO_VM_COMPILED
+  endif
+
   DEBUG_CFLAGS = $(BASE_CFLAGS) -ggdb -O0
 
   RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
@@ -693,12 +700,6 @@
     CLIENT_LDFLAGS=-L/usr/openwin/$(LIB) -L/usr/X11/lib -lGLU -lX11 -lXext
   endif
 
-  ifeq ($(ARCH),i386)
-    # Solarix x86 make ...
-    BASE_CFLAGS += -m32
-    LDFLAGS+=-m32
-  endif
-
 else # ifeq sunos
 
 #############################################################################

Modified: trunk/code/qcommon/q_platform.h
===================================================================
--- trunk/code/qcommon/q_platform.h	2006-11-29 23:31:20 UTC (rev 994)
+++ trunk/code/qcommon/q_platform.h	2006-11-30 08:01:43 UTC (rev 995)
@@ -222,7 +222,7 @@
 
 #ifdef __sun
 
-#include <sys/isa_defs.h>
+#include <stdint.h>
 #include <sys/byteorder.h>
 
 #define OS_STRING "solaris"

Modified: trunk/code/unix/setup/Solaris_pkg.sh
===================================================================
--- trunk/code/unix/setup/Solaris_pkg.sh	2006-11-29 23:31:20 UTC (rev 994)
+++ trunk/code/unix/setup/Solaris_pkg.sh	2006-11-30 08:01:43 UTC (rev 995)
@@ -5,7 +5,7 @@
 
 # Solaris stuff
 PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'`
-if [ "X`uname -m`" = "Xi386" ]; then
+if [ "X`uname -m`" = "Xi86pc" ]; then
 	ARCH=i386
 else
 	ARCH=sparc