contrib: detect XCode > 3

We need -arch to specify which arch to be built, else we have no idea

diff --git a/contrib/src/bghudappkit/rules.mak b/contrib/src/bghudappkit/rules.mak
index 6032cb552ecff7cbd0d66818894ecc08755ad2ba..4da01e66baf2aa6bcecb2ad366ac59fbc3080d4a 100644 (file)
--- a/contrib/src/bghudappkit/rules.mak
+++ b/contrib/src/bghudappkit/rules.mak
@@ -20,7 +20,7 @@ bghudappkit: bghudappkit-git.tar.xz .sum-bghudappkit
        $(MOVE)
 
 .bghudappkit: bghudappkit
-       cd $< && xcodebuild -sdk macosx$(OSX_VERSION)
+       cd $< && xcodebuild $(XCODE_FLAGS)
        install_name_tool -change @loader_path/../../../../../../../BGHUDAppKit.framework/Versions/A/BGHUDAppKit \
                                                                @loader_path/../../../../Versions/A/BGHUDAppKit \
                $</build/Release/BGHUDAppKit.framework/Resources/BGHUDAppKitPlugin.ibplugin/Contents/MacOS/BGHUDAppKitPlugin

diff --git a/contrib/src/growl/rules.mak b/contrib/src/growl/rules.mak
index 292e9a80883f9bfd3ffe03303fe093817902a8ce..2f41daf4885fe9fbf9e452055eee8c8024c0273f 100644 (file)
--- a/contrib/src/growl/rules.mak
+++ b/contrib/src/growl/rules.mak
@@ -23,6 +23,6 @@ growl: growl-$(GROWL_VERSION).tar.bz2 .sum-growl
        touch $@
 
 .growl: growl
-       cd $< && xcodebuild -target Growl.framework -configuration Release
+       cd $< && xcodebuild $(XCODE_FLAGS) -target Growl.framework -configuration Release
        cd $< && cp -R -L build/Release/Growl.framework "$(PREFIX)"
        touch $@

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index c212d71335265cedda123b3e1c546139fdeebe42..1c0cf98479105efcc8f9b2c4136f0782bba995bf 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -108,6 +108,14 @@ else
 EXTRA_CFLAGS += -m32
 EXTRA_LDFLAGS += -m32
 endif
+
+XCODE_FLAGS = -sdk macosx$(OSX_VERSION)
+ifeq ($(xcodebuild -version 2>/dev/null | tee /dev/null|head -1|cut -d\  -f2|cut -d. -f1), 3)
+# XCode 3 doesn't support -arch
+else
+XCODE_FLAGS += -arch $(ARCH)
+endif
+
 endif
 
 

diff --git a/contrib/src/sparkle/rules.mak b/contrib/src/sparkle/rules.mak
index d9bafcb7ba60164ee5bcca76afd899cf1b71a4b2..f9bbef6f48a0fb7226ecaaf86326331a80cbc6e6 100644 (file)
--- a/contrib/src/sparkle/rules.mak
+++ b/contrib/src/sparkle/rules.mak
@@ -21,6 +21,6 @@ sparkle: sparkle-$(SPARKLE_VERSION).zip .sum-sparkle
        touch $@
 
 .sparkle: sparkle
-       cd $</Extras/Source\ Code && $(MAKE) && xcodebuild
+       cd $</Extras/Source\ Code && $(MAKE) && xcodebuild $(XCODE_FLAGS)
        cd $< && cp -R -L Extras/Source\ Code/build/release/Sparkle.framework "$(PREFIX)"
        touch $@