diff build/Makefile.osx @ 334:c70e1ceb1eff

Move Makefile.osx across to .osx.106 and create a new one for the 10.7 / Xcode 4 tools

--- a/build/Makefile.osx	Thu Jun 28 17:47:25 2012 +0100
+++ b/build/Makefile.osx	Fri Jun 29 15:20:37 2012 +0100
@@ -3,7 +3,7 @@
 # libraries, example plugins, and the test host.  Please adjust to
 # suit your operating system requirements.
 #
-# This version of the Makefile is approximately correct for OS/X.
+# This version of the Makefile is approximately correct for OS/X 10.7.
 # Note that it has no "install" target; the following are the
 # library and related files that may be of interest resulting from
 # the build:
@@ -58,35 +58,14 @@
 #
 default:	all
 
-# Architecture and developer SDK selection flags.  Change these only
-# if you want to select a different OS/X compatibility level from the
-# default.
+# Minimum version of OS/X to target. This will determine the
+# compiler's choice of platform SDK material
+MINVERSION := 10.6
+
+# Our default is to try to build for all architectures supported by
+# the MINVERSION in a universal binary.
 #
-# By default, we try to find the oldest available SDK that is newer
-# than 10.4.
-# 
-# If you want to override this to select a particular SDK, change
-# PREFERRED_SDK to the SDK name (e.g. "10.4u") and PREFERRED_MINVERSION
-# to the minimum OS revision (e.g. "10.4").  An example follows this code.
-# 
-SDKPREFIX	:= /Developer/SDKs/MacOSX
-SDKS		:= $(wildcard $(SDKPREFIX)*.sdk)
-SDKVERSIONS	:= $(patsubst $(SDKPREFIX)%.sdk,%,$(SDKS))
-GOOD_SDKS	:= $(filter-out 10.1%,$(filter-out 10.2%,$(filter-out 10.3%,$(filter-out 10.4%,$(SDKVERSIONS)))))
-#
-PREFERRED_SDK	:= $(word 1, $(sort $(GOOD_SDKS)))
-PREFERRED_MINVERSION  := $(patsubst %u,%,$(PREFERRED_SDK))
-#
-# Example: to set your own values, uncomment and adjust:
-# PREFERRED_SDK	:= 10.4u
-# PREFERRED_MINVERSION  := 10.4
-
-SDKFLAGS	= -isysroot /Developer/SDKs/MacOSX$(PREFERRED_SDK).sdk -mmacosx-version-min=$(PREFERRED_MINVERSION)
-
-# Our default is to try to build for all available architectures in a
-# universal binary.
-#
-ARCHFLAGS = $(SDKFLAGS) -arch i386 -arch x86_64 -arch ppc
+ARCHFLAGS = -mmacosx-version-min=$(MINVERSION) -arch x86_64 -arch i386
 
 # Compile flags
 #
@@ -229,13 +208,7 @@
 RDFGEN_TARGET	= \
 		$(RDFGENDIR)/vamp-rdf-template-generator
 
-show:
-		@echo " *** Found available SDK versions: $(SDKVERSIONS)"
-		@test -n "$(PREFERRED_SDK)" || ( echo "Error: Failed to establish preferred SDK version, please ensure at least one Developer SDK is installed" ; exit 1 )
-		@test -n "$(PREFERRED_MINVERSION)" || ( echo "Error: Failed to establish preferred minimum OS version" ; exit 1 )
-		@echo " *** Default SDK is $(PREFERRED_SDK) for minimum OS/X version $(PREFERRED_MINVERSION)"
-
-sdk:		show sdkstatic $(SDK_DYNAMIC) $(HOSTSDK_DYNAMIC)
+sdk:		sdkstatic $(SDK_DYNAMIC) $(HOSTSDK_DYNAMIC)
 
 sdkstatic:	$(SDK_STATIC) $(HOSTSDK_STATIC)
 		$(RANLIB) $(SDK_STATIC)