Commit e47fb7cd authored by Rafaël Carré's avatar Rafaël Carré

contrib: detect XCode > 3

We need -arch to specify which arch to be built, else we have no idea
parent 5f8906ff
...@@ -20,7 +20,7 @@ bghudappkit: bghudappkit-git.tar.xz .sum-bghudappkit ...@@ -20,7 +20,7 @@ bghudappkit: bghudappkit-git.tar.xz .sum-bghudappkit
$(MOVE) $(MOVE)
.bghudappkit: bghudappkit .bghudappkit: bghudappkit
cd $< && xcodebuild -sdk macosx$(OSX_VERSION) cd $< && xcodebuild $(XCODE_FLAGS)
install_name_tool -change @loader_path/../../../../../../../BGHUDAppKit.framework/Versions/A/BGHUDAppKit \ install_name_tool -change @loader_path/../../../../../../../BGHUDAppKit.framework/Versions/A/BGHUDAppKit \
@loader_path/../../../../Versions/A/BGHUDAppKit \ @loader_path/../../../../Versions/A/BGHUDAppKit \
$</build/Release/BGHUDAppKit.framework/Resources/BGHUDAppKitPlugin.ibplugin/Contents/MacOS/BGHUDAppKitPlugin $</build/Release/BGHUDAppKit.framework/Resources/BGHUDAppKitPlugin.ibplugin/Contents/MacOS/BGHUDAppKitPlugin
......
...@@ -23,6 +23,6 @@ growl: growl-$(GROWL_VERSION).tar.bz2 .sum-growl ...@@ -23,6 +23,6 @@ growl: growl-$(GROWL_VERSION).tar.bz2 .sum-growl
touch $@ touch $@
.growl: growl .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)" cd $< && cp -R -L build/Release/Growl.framework "$(PREFIX)"
touch $@ touch $@
...@@ -108,6 +108,14 @@ else ...@@ -108,6 +108,14 @@ else
EXTRA_CFLAGS += -m32 EXTRA_CFLAGS += -m32
EXTRA_LDFLAGS += -m32 EXTRA_LDFLAGS += -m32
endif 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 endif
......
...@@ -21,6 +21,6 @@ sparkle: sparkle-$(SPARKLE_VERSION).zip .sum-sparkle ...@@ -21,6 +21,6 @@ sparkle: sparkle-$(SPARKLE_VERSION).zip .sum-sparkle
touch $@ touch $@
.sparkle: sparkle .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)" cd $< && cp -R -L Extras/Source\ Code/build/release/Sparkle.framework "$(PREFIX)"
touch $@ touch $@
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment