From: <mth...@us...> - 2012-03-24 11:01:24
|
Revision: 12439 http://openmsx.svn.sourceforge.net/openmsx/?rev=12439&view=rev Author: mthuurne Date: 2012-03-24 11:01:12 +0000 (Sat, 24 Mar 2012) Log Message: ----------- For Mac OS X, switch to clang as the compiler and drop PPC support. PPC support was already tricky on OS X 10.6, doing it on 10.7 would be too much of a hassle. Also updated SDK path to use Xcode from the Mac App Store. Modified Paths: -------------- openmsx/trunk/build/main.mk openmsx/trunk/build/platform-darwin.mk Modified: openmsx/trunk/build/main.mk =================================================================== --- openmsx/trunk/build/main.mk 2012-03-21 21:02:19 UTC (rev 12438) +++ openmsx/trunk/build/main.mk 2012-03-24 11:01:12 UTC (rev 12439) @@ -140,10 +140,7 @@ # List of CPUs to compile for. ifeq ($(OPENMSX_TARGET_CPU),univ) -CPU_LIST:=ppc x86 -ifeq ($(shell $(PYTHON) -c 'from platform import mac_ver ; print tuple(int(n) for n in mac_ver()[0].split(".")) >= (10, 6)'),True) -CPU_LIST+=x86_64 -endif +CPU_LIST:=x86 x86_64 else CPU_LIST:=$(OPENMSX_TARGET_CPU) endif Modified: openmsx/trunk/build/platform-darwin.mk =================================================================== --- openmsx/trunk/build/platform-darwin.mk 2012-03-21 21:02:19 UTC (rev 12438) +++ openmsx/trunk/build/platform-darwin.mk 2012-03-24 11:01:12 UTC (rev 12439) @@ -34,27 +34,14 @@ TARGET_FLAGS+=-mmacosx-version-min=$(OSX_MIN_VER) # Select the SDK to use. This can be higher than the OS X minimum version. -ifeq ($(OPENMSX_TARGET_CPU),x86_64) -SDK_PATH:=/Developer/SDKs/MacOSX10.6.sdk -else -# Note: Xcode 4.2 does not include PPC support in all of its dylibs, so when -# building a PPC/universal binary we must use the SDK from Xcode 3. -# If you have Xcode 3 installed in its default location (/Developer), -# please remove the "Xcode3" part of the SDK_PATH definition below. -SDK_PATH:=/Developer/Xcode3/SDKs/MacOSX10.6.sdk -endif +SDK_PATH:=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/ +# The path above is for Xcode from the Mac App Store. If you're using the older +# stand-alone Xcode, this is the right path: +#SDK_PATH:=/Developer/SDKs/MacOSX10.6.sdk TARGET_FLAGS+=-isysroot $(SDK_PATH) -# Select an appropriate GCC version. -ifeq ($(OPENMSX_TARGET_CPU),x86_64) -CXX:=g++-4.2 -else -# GCC from Xcode 4.2 fails to link PPC binaries, so use GCC from Xcode 3. -# GCC 4.2 on PPC and x86 uses a ridiculous amount of memory (about 7 GB) -# and will therefore never finish in a reasonable amount of time if the build -# machine has 4 GB of memory or less. GCC 4.0 does not have this problem. -CXX:=$(SDK_PATH)/../../usr/bin/g++-4.0 -endif +# Select clang as the compiler. +CXX:=clang++ ifeq ($(filter 3RD_%,$(LINK_MODE)),) # Compile against local libs. We assume the binary is intended to be run on This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |