From d899c25c571ed061bba9725cf7b35d492cc6e518 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Wed, 21 Mar 2007 23:55:51 +0000
Subject: * ioq3-r1052 merge

---
 Makefile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 44a0d810..1ef730c9 100644
--- a/Makefile
+++ b/Makefile
@@ -663,15 +663,22 @@ ifeq ($(PLATFORM),sunos)
       -falign-jumps=2 -falign-functions=2 -fstrength-reduce \
       -mtune=ultrasparc -mv8plus -mno-faster-structs \
       -funroll-loops
-    BASE_CFLAGS += -DNO_VM_COMPILED
   else
   ifeq ($(ARCH),x86)
-    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)
@@ -691,12 +698,6 @@ ifeq ($(PLATFORM),sunos)
     CLIENT_LDFLAGS=-L/usr/openwin/$(LIB) -L/usr/X11/lib -lGLU -lX11 -lXext
   endif
 
-  ifeq ($(ARCH),x86)
-    # Solarix x86 make ...
-    BASE_CFLAGS += -m32
-    LDFLAGS+=-m32
-  endif
-
 else # ifeq sunos
 
 #############################################################################
@@ -1510,7 +1511,7 @@ installer: build_release
 dist:
 	rm -rf tremulous-$(SVN_VERSION)
 	svn export . tremulous-$(SVN_VERSION)
-	tar --force-local -cjf tremulous-$(SVN_VERSION).tar.bz2 tremulous-$(SVN_VERSION)
+	tar --owner=root --group=root --force-local -cjf tremulous-$(SVN_VERSION).tar.bz2 tremulous-$(SVN_VERSION)
 	rm -rf tremulous-$(SVN_VERSION)
 
 #############################################################################
-- 
cgit