aboutsummaryrefslogtreecommitdiffstats
path: root/code
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-12-06 19:03:39 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-12-06 19:03:39 +0000
commite9c18bd3ae7f4a976f7cb6d9673419cfb0cdc469 (patch)
tree24091077852df88f3f342b8132e6b577acf2696a /code
parentdd4b80f1158f8adae8a7f59aca8c2986d5bc7a3d (diff)
downloadioquake3-aero-e9c18bd3ae7f4a976f7cb6d9673419cfb0cdc469.tar.gz
ioquake3-aero-e9c18bd3ae7f4a976f7cb6d9673419cfb0cdc469.zip
* Solaris patch from Vincent S. Cojot
git-svn-id: svn://svn.icculus.org/quake3/trunk@432 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code')
-rw-r--r--code/client/qal.c2
-rw-r--r--code/unix/Makefile19
2 files changed, 11 insertions, 10 deletions
diff --git a/code/client/qal.c b/code/client/qal.c
index e8869b3..0701c5d 100644
--- a/code/client/qal.c
+++ b/code/client/qal.c
@@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define SYMLOAD(x,y) GetProcAddress(x,y)
#define OBJFREE(x) FreeLibrary(x)
-#elif defined __linux__ || defined __FreeBSD__ || defined MACOS_X
+#elif defined __linux__ || defined __FreeBSD__ || defined MACOS_X || defined __sun
#include <dlfcn.h>
#define OBJTYPE void *
#define OBJLOAD(x) dlopen(x, RTLD_LAZY | RTLD_GLOBAL)
diff --git a/code/unix/Makefile b/code/unix/Makefile
index 5093432..eeab30e 100644
--- a/code/unix/Makefile
+++ b/code/unix/Makefile
@@ -524,7 +524,7 @@ ifeq ($(PLATFORM),SunOS)
endif
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
+ BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
ifeq ($(USE_SDL),1)
BASE_CFLAGS += -DUSE_SDL_SOUND=1 $(shell sdl-config --cflags)
@@ -533,22 +533,23 @@ ifeq ($(PLATFORM),SunOS)
GL_CFLAGS = -I/usr/openwin/include
endif
- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
+ OPTIMIZE = -O3 -ffast-math -funroll-loops
ifeq ($(ARCH),sparc)
- OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -falign-loops=2 \
+ OPTIMIZE = -O0 -ffast-math -falign-loops=2 \
-falign-jumps=2 -falign-functions=2 -fstrength-reduce \
+ -mtune=ultrasparc -mv8plus -munaligned-doubles \
-funroll-loops
BASE_CFLAGS += -DNO_VM_COMPILED
else
ifeq ($(ARCH),i386)
- OPTIMIZE = -O3 -march=i686 -fomit-frame-pointer -ffast-math \
+ OPTIMIZE = -O3 -march=i686 -ffast-math \
-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
-funroll-loops -fstrength-reduce
endif
endif
- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
+ DEBUG_CFLAGS = $(BASE_CFLAGS) -ggdb -O0
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
@@ -586,8 +587,8 @@ ifeq ($(PLATFORM),SunOS)
$(B)/baseq3/vm/ui.qvm \
$(B)/missionpack/vm/qagame.qvm \
$(B)/missionpack/vm/cgame.qvm \
- $(B)/missionpack/vm/ui.qvm
-# $(B)/$(PLATFORM)quake3-smp
+ $(B)/missionpack/vm/ui.qvm \
+ $(B)/$(PLATFORM)quake3-smp
else
TARGETS=\
$(B)/$(PLATFORM)quake3 \
@@ -603,8 +604,8 @@ ifeq ($(PLATFORM),SunOS)
$(B)/baseq3/vm/ui.qvm \
$(B)/missionpack/vm/qagame.qvm \
$(B)/missionpack/vm/cgame.qvm \
- $(B)/missionpack/vm/ui.qvm
-# $(B)/$(PLATFORM)quake3-smp
+ $(B)/missionpack/vm/ui.qvm \
+ $(B)/$(PLATFORM)quake3-smp
endif