diff --git a/Makefile b/Makefile index 394ca0c9480aaa568622845a0f6eaf7ba7761242..f3973ab22e159a2cd5b614705bc6c36426ca265b 100755 --- a/Makefile +++ b/Makefile @@ -39,14 +39,16 @@ os := linux ifneq ($(shell uname | grep -i darwin),) os := mac # make sure mac builds on gcc 4.0 and uses the 10.5 sdk but sets min version to 10.4 -CXX:=g++-4.0 -CXXFLAGS:= -fno-stack-protector -mmacosx-version-min=10.4 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 -isysroot /Developer/SDKs/MacOSX10.5.sdk -LDFLAGS:= -fno-stack-protector -mmacosx-version-min=10.4 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 -isysroot /Developer/SDKs/MacOSX10.5.sdk +## This may have been valuable once, but as of 2014-01-24 it breaks the build +## CXX:=g++-4.0 +## CXXFLAGS:= -fno-stack-protector -mmacosx-version-min=10.4 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 -isysroot /Developer/SDKs/MacOSX10.5.sdk +## LDFLAGS:= -fno-stack-protector -mmacosx-version-min=10.4 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040 -isysroot /Developer/SDKs/MacOSX10.5.sdk else ifneq ($(or $(shell uname | grep -i cygwin),$(shell uname | grep -i mingw)),) os := windows else #linux system, ensure we're using gcc-4.1 -CXX:=g++-4.1 +## Hopelessly outdated as of 2014-01-24 +## CXX:=g++-4.1 endif # nativeArch: For internal use. Don't override this, instead override 'arch'. diff --git a/external-libs/tinyxml/build/Makefile b/external-libs/tinyxml/build/Makefile index 222b452d591afa12f8222def2be4adc867ebd4b5..5c5be7404a9f8235b3ed4a99fb83e2a247f460e2 100644 --- a/external-libs/tinyxml/build/Makefile +++ b/external-libs/tinyxml/build/Makefile @@ -19,7 +19,7 @@ outPath := $(platform)/ compilerFlags += -Wall -c -O2 ifeq ($(platform),mac) -compilerFlags += -arch i386 -arch ppc +compilerFlags += -arch i386 endif linkerFlags += rcs diff --git a/make/minizip.mk b/make/minizip.mk index 12b4e477fb113f316e6948692ecfde7d748e76dc..e29b60cdc53fc86c3b50ae1517937b80ea44bf87 100644 --- a/make/minizip.mk +++ b/make/minizip.mk @@ -23,7 +23,7 @@ libOpts += -lz else ifeq ($(os),mac) # libOpts += -Lexternal-libs/libxml2/mingw/lib libOpts += -lz -ccFlags += -arch ppc -arch i386 +ccFlags += -arch i386 endif libName := libminizip$ diff --git a/release/release.py b/release/release.py index 482f6ca0bd85118ef900dead8a3cc79e4e1cbb34..a02abf48daa484248e6bef20462168b01113cee0 100644 --- a/release/release.py +++ b/release/release.py @@ -235,7 +235,7 @@ def packageMac(opts): print 'Building the DOM' makeCmd = 'make' + ' -C ' + join(codePath, 'dom') + ' -k' + \ - ' -j ' + getBuildJobs(opts) + ' conf=release' + " arch='x86 ppc'" + ' -j ' + getBuildJobs(opts) + ' conf=release' + " arch='x86'" os.system(makeCmd) zip = createArchive(join(outdir, 'colladadom-mac'), getArchive(opts))