diff options
| -rw-r--r-- | Makefile | 60 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | code/sys/sys_unix.c | 4 |
3 files changed, 10 insertions, 56 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 @@ -80,8 +80,6 @@ Makefile.local: CFLAGS - use this for custom CFLAGS V - set to show cc command line when building DEFAULT_BASEDIR - extra path to search for baseq3 and such - DEFAULT_LIBDIR - extra path to search for libraries - HOMEPATH - alternative home directory BUILD_SERVER - build the 'ioq3ded' server binary BUILD_CLIENT - build the 'ioquake3' client binary BUILD_CLIENT_SMP - build the 'ioquake3-smp' client binary diff --git a/code/sys/sys_unix.c b/code/sys/sys_unix.c index f80a27f..641770c 100644 --- a/code/sys/sys_unix.c +++ b/code/sys/sys_unix.c @@ -54,9 +54,7 @@ char *Sys_DefaultHomePath(void) if( ( p = getenv( "HOME" ) ) != NULL ) { Q_strncpyz( homePath, p, sizeof( homePath ) ); -#ifdef HOMEPATH - Q_strcat( homePath, sizeof( homePath ), HOMEPATH ); -#elif defined(MACOS_X) +#ifdef MACOS_X Q_strcat( homePath, sizeof( homePath ), "/Library" ); mkdir( homePath, 0750 ); /* just in case. */ Q_strcat( homePath, sizeof( homePath ), "/Application Support" ); |