mirror of https://github.com/DrBeef/ioq3quest.git
* Revert r1624 and r1626-r1628
This commit is contained in:
parent
ec4ab19090
commit
f89092fda6
60
Makefile
60
Makefile
|
@ -17,15 +17,6 @@ ifeq ($(COMPILE_PLATFORM),darwin)
|
||||||
COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
|
COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
|
||||||
endif
|
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_PLATFORM),mingw32)
|
||||||
ifeq ($(COMPILE_ARCH),i386)
|
ifeq ($(COMPILE_ARCH),i386)
|
||||||
COMPILE_ARCH=x86
|
COMPILE_ARCH=x86
|
||||||
|
@ -541,34 +532,15 @@ else # ifeq mingw32
|
||||||
|
|
||||||
ifeq ($(PLATFORM),freebsd)
|
ifeq ($(PLATFORM),freebsd)
|
||||||
|
|
||||||
FREEBSD_ARCH = $(ARCH)
|
ifneq (,$(findstring alpha,$(shell uname -m)))
|
||||||
ifeq ($(ARCH),amd64)
|
ARCH=axp
|
||||||
ARCH = x86_64
|
else #default to i386
|
||||||
endif
|
ARCH=i386
|
||||||
ifeq ($(ARCH),i386)
|
endif #alpha test
|
||||||
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
|
|
||||||
|
|
||||||
ifndef DEFAULT_LIBDIR
|
|
||||||
DEFAULT_LIBDIR = /usr/local/lib/ioquake3
|
|
||||||
endif
|
|
||||||
|
|
||||||
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
|
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
|
||||||
-DUSE_ICON $(SDL_CFLAGS) -DMAP_ANONYMOUS=MAP_ANON \
|
-DUSE_ICON $(SDL_CFLAGS)
|
||||||
-DHOMEPATH=\\\"$(HOMEPATH)\\\" \
|
|
||||||
-DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\" \
|
|
||||||
$(shell make -f /dev/null -VCFLAGS MACHINE_ARCH=$(FREEBSD_ARCH))
|
|
||||||
|
|
||||||
ifeq ($(USE_OPENAL),1)
|
ifeq ($(USE_OPENAL),1)
|
||||||
BASE_CFLAGS += -DUSE_OPENAL
|
BASE_CFLAGS += -DUSE_OPENAL
|
||||||
|
@ -586,22 +558,9 @@ ifeq ($(PLATFORM),freebsd)
|
||||||
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
|
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
|
||||||
-fomit-frame-pointer -fexpensive-optimizations
|
-fomit-frame-pointer -fexpensive-optimizations
|
||||||
else
|
else
|
||||||
ifeq ($(ARCH),x86)
|
ifeq ($(ARCH),i386)
|
||||||
ifeq ($(CROSS_COMPILING),1)
|
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \
|
||||||
BASE_CFLAGS += -m32
|
-march=pentium -fomit-frame-pointer -pipe -ffast-math \
|
||||||
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 \
|
|
||||||
-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
|
-falign-loops=2 -falign-jumps=2 -falign-functions=2 \
|
||||||
-funroll-loops -fstrength-reduce
|
-funroll-loops -fstrength-reduce
|
||||||
HAVE_VM_COMPILED=true
|
HAVE_VM_COMPILED=true
|
||||||
|
@ -609,7 +568,6 @@ ifeq ($(PLATFORM),freebsd)
|
||||||
BASE_CFLAGS += -DNO_VM_COMPILED
|
BASE_CFLAGS += -DNO_VM_COMPILED
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
|
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
|
||||||
|
|
||||||
|
|
2
README
2
README
|
@ -80,8 +80,6 @@ Makefile.local:
|
||||||
CFLAGS - use this for custom CFLAGS
|
CFLAGS - use this for custom CFLAGS
|
||||||
V - set to show cc command line when building
|
V - set to show cc command line when building
|
||||||
DEFAULT_BASEDIR - extra path to search for baseq3 and such
|
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_SERVER - build the 'ioq3ded' server binary
|
||||||
BUILD_CLIENT - build the 'ioquake3' client binary
|
BUILD_CLIENT - build the 'ioquake3' client binary
|
||||||
BUILD_CLIENT_SMP - build the 'ioquake3-smp' client binary
|
BUILD_CLIENT_SMP - build the 'ioquake3-smp' client binary
|
||||||
|
|
|
@ -54,9 +54,7 @@ char *Sys_DefaultHomePath(void)
|
||||||
if( ( p = getenv( "HOME" ) ) != NULL )
|
if( ( p = getenv( "HOME" ) ) != NULL )
|
||||||
{
|
{
|
||||||
Q_strncpyz( homePath, p, sizeof( homePath ) );
|
Q_strncpyz( homePath, p, sizeof( homePath ) );
|
||||||
#ifdef HOMEPATH
|
#ifdef MACOS_X
|
||||||
Q_strcat( homePath, sizeof( homePath ), HOMEPATH );
|
|
||||||
#elif defined(MACOS_X)
|
|
||||||
Q_strcat( homePath, sizeof( homePath ), "/Library" );
|
Q_strcat( homePath, sizeof( homePath ), "/Library" );
|
||||||
mkdir( homePath, 0750 ); /* just in case. */
|
mkdir( homePath, 0750 ); /* just in case. */
|
||||||
Q_strcat( homePath, sizeof( homePath ), "/Application Support" );
|
Q_strcat( homePath, sizeof( homePath ), "/Application Support" );
|
||||||
|
|
Loading…
Reference in New Issue