r995 - branches/1.34 branches/1.34/code/unix/setup tags/1.34-rc2 tags/1.34-rc2/code/unix/setup tags/1.34-rc3 tags/1.34-rc3/code/unix/setup trunk trunk/code/unix/setup
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Nov 29 08:48:30 EST 2006
Author: coyote
Date: 2006-11-29 08:48:30 -0500 (Wed, 29 Nov 2006)
New Revision: 995
Modified:
branches/1.34/Makefile
branches/1.34/code/unix/setup/Solaris_pkg.sh
tags/1.34-rc2/Makefile
tags/1.34-rc2/code/unix/setup/Solaris_pkg.sh
tags/1.34-rc3/Makefile
tags/1.34-rc3/code/unix/setup/Solaris_pkg.sh
trunk/Makefile
trunk/code/unix/setup/Solaris_pkg.sh
Log:
Cleaning up the Solaris+x86 Builds...
Modified: branches/1.34/Makefile
===================================================================
--- branches/1.34/Makefile 2006-11-29 13:19:53 UTC (rev 994)
+++ branches/1.34/Makefile 2006-11-29 13:48:30 UTC (rev 995)
@@ -611,15 +611,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)
@@ -639,12 +646,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: branches/1.34/code/unix/setup/Solaris_pkg.sh
===================================================================
--- branches/1.34/code/unix/setup/Solaris_pkg.sh 2006-11-29 13:19:53 UTC (rev 994)
+++ branches/1.34/code/unix/setup/Solaris_pkg.sh 2006-11-29 13:48:30 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
Modified: tags/1.34-rc2/Makefile
===================================================================
--- tags/1.34-rc2/Makefile 2006-11-29 13:19:53 UTC (rev 994)
+++ tags/1.34-rc2/Makefile 2006-11-29 13:48:30 UTC (rev 995)
@@ -611,15 +611,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)
@@ -639,12 +646,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: tags/1.34-rc2/code/unix/setup/Solaris_pkg.sh
===================================================================
--- tags/1.34-rc2/code/unix/setup/Solaris_pkg.sh 2006-11-29 13:19:53 UTC (rev 994)
+++ tags/1.34-rc2/code/unix/setup/Solaris_pkg.sh 2006-11-29 13:48:30 UTC (rev 995)
@@ -1,7 +1,7 @@
#!/bin/bash
# Solaris tuff
OSTYPE=SunOS
-if [ "X`uname -m`" = "Xi386" ]; then
+if [ "X`uname -m`" = "Xi86pc" ]; then
ARCH=i386
else
ARCH=sparc
Modified: tags/1.34-rc3/Makefile
===================================================================
--- tags/1.34-rc3/Makefile 2006-11-29 13:19:53 UTC (rev 994)
+++ tags/1.34-rc3/Makefile 2006-11-29 13:48:30 UTC (rev 995)
@@ -611,15 +611,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)
@@ -639,12 +646,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: tags/1.34-rc3/code/unix/setup/Solaris_pkg.sh
===================================================================
--- tags/1.34-rc3/code/unix/setup/Solaris_pkg.sh 2006-11-29 13:19:53 UTC (rev 994)
+++ tags/1.34-rc3/code/unix/setup/Solaris_pkg.sh 2006-11-29 13:48:30 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
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-11-29 13:19:53 UTC (rev 994)
+++ trunk/Makefile 2006-11-29 13:48:30 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/unix/setup/Solaris_pkg.sh
===================================================================
--- trunk/code/unix/setup/Solaris_pkg.sh 2006-11-29 13:19:53 UTC (rev 994)
+++ trunk/code/unix/setup/Solaris_pkg.sh 2006-11-29 13:48:30 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
More information about the quake3-commits
mailing list