diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-11-26 20:18:53 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-11-26 20:18:53 +0000 |
| commit | 325890dc089210b3eabb6bb22154e7a3d7d74a25 (patch) | |
| tree | 703f9319362f5e55743a0e1e8188eb94684ed0a5 /Makefile | |
| parent | daa6b52744a1530591e0717d99976c30e5e8e0a6 (diff) | |
| download | ioquake3-aero-325890dc089210b3eabb6bb22154e7a3d7d74a25.tar.gz ioquake3-aero-325890dc089210b3eabb6bb22154e7a3d7d74a25.zip | |
* Move MINSDL_ values to sys_local.h from Makefile/VC project
* Merge *BSD platform definitions in q_platform.h
* IRIX support (Patrick Baggett <baggett.patrick@figglesoftware.com>)
git-svn-id: svn://svn.icculus.org/quake3/trunk@1218 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -636,12 +636,15 @@ else # ifeq netbsd # SETUP AND BUILD -- IRIX ############################################################################# -ifeq ($(PLATFORM),irix) +ifeq ($(PLATFORM),irix64) ARCH=mips #default to MIPS - BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 -mips3 \ - -nostdinc -I. -I$(ROOT)/usr/include -DNO_VM_COMPILED + CC = c99 + MKDIR = mkdir -p + + BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 \ + -I. $(shell sdl-config --cflags) -I$(ROOT)/usr/include -DNO_VM_COMPILED RELEASE_CFLAGS=$(BASE_CFLAGS) -O3 DEBUG_CFLAGS=$(BASE_CFLAGS) -g @@ -649,8 +652,10 @@ ifeq ($(PLATFORM),irix) SHLIBCFLAGS= SHLIBLDFLAGS=-shared - LDFLAGS=-ldl -lm - CLIENT_LDFLAGS=-L/usr/X11/$(LIB) -lGL -lX11 -lXext -lm + LDFLAGS=-ldl -lm -lgen + # FIXME: The X libraries probably aren't necessary? + CLIENT_LDFLAGS=-L/usr/X11/$(LIB) $(shell sdl-config --libs) -lGL \ + -lX11 -lXext -lm else # ifeq IRIX @@ -794,9 +799,6 @@ ifeq ($(USE_SVN),1) BASE_CFLAGS += -DSVN_VERSION=\\\"$(SVN_VERSION)\\\" endif -# Require a minimum version of SDL -BASE_CFLAGS += -DMINSDL_MAJOR=1 -DMINSDL_MINOR=2 -DMINSDL_PATCH=7 - ifeq ($(V),1) echo_cmd=@: Q= |