diff options
| author | tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-01-03 06:19:11 +0000 |
|---|---|---|
| committer | tjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-01-03 06:19:11 +0000 |
| commit | 1fe6df05a865cc0d1f713f95e3792882c99943b9 (patch) | |
| tree | 76f1576f01b909b1f07bccc37dced7ab9dddaeb6 /Makefile | |
| parent | 6c28490fc7f5130cd73d80e47e18a6cd77bdc10f (diff) | |
| download | ioquake3-aero-1fe6df05a865cc0d1f713f95e3792882c99943b9.tar.gz ioquake3-aero-1fe6df05a865cc0d1f713f95e3792882c99943b9.zip | |
* Update the Mac OS X build process (again)
* Allow BUILD_* env vars to be passed to make to build only specific
components
git-svn-id: svn://svn.icculus.org/quake3/trunk@1246 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 58 |
1 files changed, 16 insertions, 42 deletions
@@ -23,11 +23,21 @@ ifeq ($(COMPILE_PLATFORM),mingw32) endif endif -BUILD_CLIENT = -BUILD_CLIENT_SMP = -BUILD_SERVER = -BUILD_GAME_SO = -BUILD_GAME_QVM = +ifndef BUILD_CLIENT + BUILD_CLIENT = +endif +ifndef BUILD_CLIENT_SMP + BUILD_CLIENT_SMP = +endif +ifndef BUILD_SERVER + BUILD_SERVER = +endif +ifndef BUILD_GAME_SO + BUILD_GAME_SO = +endif +ifndef BUILD_GAME_QVM + BUILD_GAME_QVM = +endif ifneq ($(PLATFORM),darwin) BUILD_CLIENT_SMP = 0 @@ -279,49 +289,13 @@ else # ifeq Linux ifeq ($(PLATFORM),darwin) HAVE_VM_COMPILED=true - BASE_CFLAGS= CLIENT_LDFLAGS= - LDFLAGS= OPTIMIZE= # building the QVMs on MacOSX is broken, atm. BUILD_GAME_QVM=0 - ifeq ($(BUILD_MACOSX_UB),ppc) - CC=gcc-4.0 - BASE_CFLAGS += -arch ppc -mmacosx-version-min=10.4 -DSMP \ - -DMAC_OS_X_VERSION_MIN_REQUIRED=1020 -nostdinc \ - -F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \ - -I"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_INC)" \ - -isystem "$(MACOSX_SDK_DIR)"/usr/include - LDFLAGS += -arch ppc -mmacosx-version-min=10.4 \ - -L"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_LIB)" \ - -F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \ - -Wl,-syslibroot,"$(MACOSX_SDK_DIR)" - ARCH=ppc - - else - ifeq ($(BUILD_MACOSX_UB),i386) - CC=gcc-4.0 - BASE_CFLAGS += -arch i386 -DSMP \ - -mmacosx-version-min=10.4 \ - -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 -nostdinc \ - -F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \ - -I"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_INC)" \ - -isystem "$(MACOSX_SDK_DIR)"/usr/include - LDFLAGS += -arch i386 -mmacosx-version-min=10.4 \ - -L"$(MACOSX_SDK_DIR)"/"$(MACOSX_SDK_LIB)" \ - -F"$(MACOSX_SDK_DIR)"/System/Library/Frameworks \ - -Wl,-syslibroot,"$(MACOSX_SDK_DIR)" - ARCH=i386 - else - # for whatever reason using the headers in the MacOSX SDKs tend to throw - # errors even though they are identical to the system ones which don't - # therefore we shut up warning flags when running the universal build - # script as much as possible. - BASE_CFLAGS += -Wall -Wimplicit -Wstrict-prototypes - endif - endif + BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes ifeq ($(ARCH),ppc) OPTIMIZE += -faltivec -O3 |