# HG changeset patch
# User cannam
# Date 1281712103 0
# Node ID b923a3d9c3d590eae0f33432fd48828d1ad82779
# Parent  250c7aaff287e1ba72d4b0f81fe000c0afb69770
* Update OS/X stuff in Makefiles, so as to build 3-way universal binaries
  using 10.4 SDK (where available, or 10.5 otherwise -- though the choice
  needs to be made by the user)

diff -r 250c7aaff287 -r b923a3d9c3d5 build/Makefile.osx
--- a/build/Makefile.osx	Wed Jun 09 13:50:53 2010 +0000
+++ b/build/Makefile.osx	Fri Aug 13 15:08:23 2010 +0000
@@ -58,11 +58,16 @@
 #
 default:	all
 
-# Architecture and developer SDK selection flags.  Define this only
+# Architecture and developer SDK selection flags.  Change these only
 # if you want to select a different OS/X compatibility level from the
-# default (which is to target 10.4 or newer and build universal binaries).
+# default (which is to target 10.4 or newer and build 3-way universal
+# binaries).
+# 
+# If you don't have the 10.4 version of the OS/X SDK, change "10.4u"
+# and "10.4" to "10.5" (or whatever is the oldest SDK available to
+# you) for maximum portability.
 #
-SDKFLAGS	= -isysroot /Developer/SDKs/MacOSX10.4u.sdk 
+SDKFLAGS	= -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4
 ARCHFLAGS	= $(SDKFLAGS) -arch i386 -arch x86_64 -arch ppc
 
 # Compile flags
diff -r 250c7aaff287 -r b923a3d9c3d5 skeleton/Makefile.skeleton
--- a/skeleton/Makefile.skeleton	Wed Jun 09 13:50:53 2010 +0000
+++ b/skeleton/Makefile.skeleton	Fri Aug 13 15:08:23 2010 +0000
@@ -27,20 +27,23 @@
 VAMP_SDK_DIR = ../vamp-plugin-sdk
 
 
-##  Uncomment these for an OS/X native build using command-line tools:
+## Uncomment these for an OS/X universal binary (PPC and 32- and
+## 64-bit Intel) supporting 10.4 or newer (if you have the 10.4 SDK):
 
-# CXXFLAGS = -I$(VAMP_SDK_DIR) -Wall -fPIC
+# CXXFLAGS = -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -arch i386 -arch x86_64 -arch ppc -I$(VAMP_SDK_DIR) -Wall -fPIC
 # PLUGIN_EXT = .dylib
 # PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-# LDFLAGS = -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list
+# LDFLAGS = $(CXXFLAGS) -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list
 
 
-##  Uncomment these for an OS/X universal binary using command-line tools:
+## Uncomment these for an OS/X universal binary (PPC and 32- and
+## 64-bit Intel) supporting 10.5 or newer (use this if you have the
+## default 10.6 developer tools):
 
-# CXXFLAGS = -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -I$(VAMP_SDK_DIR) -Wall -fPIC
+# CXXFLAGS = -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -arch i386 -arch x86_64 -arch ppc -I$(VAMP_SDK_DIR) -Wall -fPIC
 # PLUGIN_EXT = .dylib
 # PLUGIN = $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT)
-# LDFLAGS = -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list
+# LDFLAGS = $(CXXFLAGS) -dynamiclib -install_name $(PLUGIN) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list
 
 
 ##  Uncomment these for Linux using the standard tools: