diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2009-09-15 09:48:11 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2009-09-15 09:48:11 +0000 |
| commit | 8d6644fb7622e7fb2a4702191d330131c9991816 (patch) | |
| tree | 758a7ebf3f051b4ae00c6ee1bea359da6d224ea0 /Makefile | |
| parent | d7a91449f54944ed824e0104f2b645d5130cead2 (diff) | |
| download | ioquake3-aero-8d6644fb7622e7fb2a4702191d330131c9991816.tar.gz ioquake3-aero-8d6644fb7622e7fb2a4702191d330131c9991816.zip | |
* Revert r1624 and r1626-r1628
git-svn-id: svn://svn.icculus.org/quake3/trunk@1629 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 60 |
1 files changed, 9 insertions, 51 deletions
@@ -17,15 +17,6 @@ ifeq ($(COMPILE_PLATFORM),darwin) COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/) endif -ifeq ($(COMPILE_PLATFORM),freebsd) - ifeq ($(COMPILE_ARCH),amd64) - COMPILE_ARCH=x86_64 - endif - ifeq ($(COMPILE_ARCH),i386) - COMPILE_ARCH=x86 - endif -endif - ifeq ($(COMPILE_PLATFORM),mingw32) ifeq ($(COMPILE_ARCH),i386) COMPILE_ARCH=x86 @@ -541,34 +532,15 @@ else # ifeq mingw32 ifeq ($(PLATFORM),freebsd) - FREEBSD_ARCH = $(ARCH) - ifeq ($(ARCH),amd64) - ARCH = x86_64 - endif - ifeq ($(ARCH),i386) - ARCH = x86 - endif - - ifeq ($(FREEBSD_ARCH),x86_64) - FREEBSD_ARCH = amd64 - endif - ifeq ($(FREEBSD_ARCH),x86) - FREEBSD_ARCH = i386 - endif - - ifndef HOMEPATH - HOMEPATH = /.ioquake3 - endif + ifneq (,$(findstring alpha,$(shell uname -m))) + ARCH=axp + else #default to i386 + ARCH=i386 + endif #alpha test - ifndef DEFAULT_LIBDIR - DEFAULT_LIBDIR = /usr/local/lib/ioquake3 - endif BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -DUSE_ICON $(SDL_CFLAGS) -DMAP_ANONYMOUS=MAP_ANON \ - -DHOMEPATH=\\\"$(HOMEPATH)\\\" \ - -DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\" \ - $(shell make -f /dev/null -VCFLAGS MACHINE_ARCH=$(FREEBSD_ARCH)) + -DUSE_ICON $(SDL_CFLAGS) ifeq ($(USE_OPENAL),1) BASE_CFLAGS += -DUSE_OPENAL @@ -586,22 +558,9 @@ ifeq ($(PLATFORM),freebsd) RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \ -fomit-frame-pointer -fexpensive-optimizations else - ifeq ($(ARCH),x86) - ifeq ($(CROSS_COMPILING),1) - BASE_CFLAGS += -m32 - endif - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \ - -fomit-frame-pointer -pipe -ffast-math \ - -falign-loops=2 -falign-jumps=2 -falign-functions=2 \ - -funroll-loops -fstrength-reduce - HAVE_VM_COMPILED=true - else - ifeq ($(ARCH),x86_64) - ifeq ($(CROSS_COMPILING),1) - BASE_CFLAGS += -m64 - endif - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \ - -fomit-frame-pointer -pipe -ffast-math \ + ifeq ($(ARCH),i386) + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \ + -march=pentium -fomit-frame-pointer -pipe -ffast-math \ -falign-loops=2 -falign-jumps=2 -falign-functions=2 \ -funroll-loops -fstrength-reduce HAVE_VM_COMPILED=true @@ -609,7 +568,6 @@ ifeq ($(PLATFORM),freebsd) BASE_CFLAGS += -DNO_VM_COMPILED endif endif - endif DEBUG_CFLAGS=$(BASE_CFLAGS) -g |