Skip to content
Snippets Groups Projects
Commit b6ed31d8 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

Stop Makefile forcing obsolete compilers for Mac and Linux.

Remove -arch ppc from subordinate makefiles.
parent 9bace8b4
No related branches found
No related tags found
No related merge requests found
......@@ -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'.
......
......@@ -19,7 +19,7 @@ outPath := $(platform)/
compilerFlags += -Wall -c -O2
ifeq ($(platform),mac)
compilerFlags += -arch i386 -arch ppc
compilerFlags += -arch i386
endif
linkerFlags += rcs
......
......@@ -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$
......
......@@ -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))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment