diff options
| author | coyote <coyote@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-11-30 08:01:43 +0000 |
|---|---|---|
| committer | coyote <coyote@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2006-11-30 08:01:43 +0000 |
| commit | 1c365d804a4a71ff34b47540a61f20bbc390ea64 (patch) | |
| tree | bf363c4a6b8d4afdcd8a939dbbc9c3cb71b3a9de | |
| parent | 18019a0dadaaabf63e8b4a44c9373c9e65b1097b (diff) | |
| download | ioquake3-aero-1c365d804a4a71ff34b47540a61f20bbc390ea64.tar.gz ioquake3-aero-1c365d804a4a71ff34b47540a61f20bbc390ea64.zip | |
Changes to build defines for Solaris on i86pc. Minor fix to q_platform.h for Solaris.
git-svn-id: svn://svn.icculus.org/quake3/trunk@995 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | code/qcommon/q_platform.h | 2 | ||||
| -rw-r--r-- | code/unix/setup/Solaris_pkg.sh | 2 |
3 files changed, 13 insertions, 12 deletions
@@ -665,15 +665,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),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 @@ ifeq ($(PLATFORM),sunos) 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 ############################################################################# diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h index 16817c8..2d4306a 100644 --- a/code/qcommon/q_platform.h +++ b/code/qcommon/q_platform.h @@ -222,7 +222,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifdef __sun -#include <sys/isa_defs.h> +#include <stdint.h> #include <sys/byteorder.h> #define OS_STRING "solaris" diff --git a/code/unix/setup/Solaris_pkg.sh b/code/unix/setup/Solaris_pkg.sh index d4e600c..de00459 100644 --- a/code/unix/setup/Solaris_pkg.sh +++ b/code/unix/setup/Solaris_pkg.sh @@ -5,7 +5,7 @@ MOUNT_DIR="../../.." # 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 |