aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorcoyote <coyote@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-11-30 08:01:43 +0000
committercoyote <coyote@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-11-30 08:01:43 +0000
commit1c365d804a4a71ff34b47540a61f20bbc390ea64 (patch)
treebf363c4a6b8d4afdcd8a939dbbc9c3cb71b3a9de /Makefile
parent18019a0dadaaabf63e8b4a44c9373c9e65b1097b (diff)
downloadioquake3-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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile21
1 files changed, 11 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index bf4f65a..e723195 100644
--- a/Makefile
+++ b/Makefile
@@ -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
#############################################################################