From: Rafaël Carré <funman@videolan.org>
Date: Sat, 26 Nov 2011 17:35:37 +0000 (-0500)
Subject: contrib: detect XCode > 3
X-Git-Tag: 1.3.0-git~43
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e47fb7cd004cd51c21f563593501a359a3a3f7ee;p=vlc

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 6032cb552e..4da01e66ba 100644
--- 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 292e9a8088..2f41daf488 100644
--- 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 c212d71335..1c0cf98479 100644
--- 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 d9bafcb7ba..f9bbef6f48 100644
--- 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 $@