aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-01-04 03:14:01 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2006-01-04 03:14:01 +0000
commit548503b6d29ed223e0246bf3bd5e71d4735b6ba2 (patch)
tree8cb353deaeb86a85397191360e7e6d87cfa3ff31
parent98c8cf0f19d89b729825d6d37b924a84025ec07b (diff)
downloadioquake3-aero-548503b6d29ed223e0246bf3bd5e71d4735b6ba2.tar.gz
ioquake3-aero-548503b6d29ed223e0246bf3bd5e71d4735b6ba2.zip
* Solaris fixes
git-svn-id: svn://svn.icculus.org/quake3/trunk@455 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/unix/Makefile8
-rw-r--r--code/unix/ftola.s2
2 files changed, 6 insertions, 4 deletions
diff --git a/code/unix/Makefile b/code/unix/Makefile
index cd0039d..3aaff03 100644
--- a/code/unix/Makefile
+++ b/code/unix/Makefile
@@ -489,9 +489,9 @@ ifeq ($(PLATFORM),SunOS)
OPTIMIZE = -O3 -ffast-math -funroll-loops
ifeq ($(ARCH),sparc)
- OPTIMIZE = -O0 -ffast-math -falign-loops=2 \
+ OPTIMIZE = -O3 -ffast-math -falign-loops=2 \
-falign-jumps=2 -falign-functions=2 -fstrength-reduce \
- -mtune=ultrasparc -mv8plus -munaligned-doubles \
+ -mtune=ultrasparc -mv8plus -mno-faster-structs \
-funroll-loops
BASE_CFLAGS += -DNO_VM_COMPILED
else
@@ -513,6 +513,8 @@ ifeq ($(PLATFORM),SunOS)
THREAD_LDFLAGS=-lpthread
LDFLAGS=-lsocket -lnsl -ldl -lm
+ BOTCFLAGS=-O0
+
ifeq ($(USE_SDL),1)
CLIENT_LDFLAGS=$(shell sdl-config --libs) -L/usr/X11/lib -lGLU -lX11 -lXext
else
@@ -602,7 +604,7 @@ endif
DO_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -o $@ -c $<
DO_SMP_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -DSMP -o $@ -c $<
-DO_BOT_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) -DBOTLIB -o $@ -c $< # $(SHLIBCFLAGS) # bk001212
+DO_BOT_CC=$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) -DBOTLIB -o $@ -c $< # $(SHLIBCFLAGS) # bk001212
DO_DEBUG_CC=$(CC) $(NOTSHLIBCFLAGS) $(DEBUG_CFLAGS) -o $@ -c $<
DO_SHLIB_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
DO_SHLIB_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
diff --git a/code/unix/ftola.s b/code/unix/ftola.s
index e4b4839..7fb24c0 100644
--- a/code/unix/ftola.s
+++ b/code/unix/ftola.s
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "qasm.h"
-#ifdef id386
+#if id386
.data