summaryrefslogtreecommitdiffstats
path: root/macosx/module.rules
diff options
context:
space:
mode:
authorkonablend <[email protected]>2013-09-24 00:14:48 +0000
committerkonablend <[email protected]>2013-09-24 00:14:48 +0000
commitc0d3a073e6309939a82b58d9aa693084b088644c (patch)
treec35b319b0a6cf293215a4e9ef9a24bfced92d17f /macosx/module.rules
parent203b7a961fca0513ad09c1b9761faeac26d2edd0 (diff)
BuildSystem: initial Xcode5 support
Tested on MacOSX 10.8.5 w/ Xcode 5.0, 4.6.3 and 4.5.2, various builds, including terminal Xcode, terminal no Xcode and Xcode IDE, and permutations with/without mp4v2 and mkv. - push defs for optional static libraries (OSL) to respective modules - adjust make-driven linking to use OSL - adjust Xcode-driven linking to use OSL via ld -filelist option - add Xcode project group for all OSL - set Xcode project to use clang compiler - add osx 10.8 xcconfig files - add "supplemental" xcconfig file where EXTERNAL_CONFIGURE may be used to specify configure-time options - patch mp4v2 to compile with clang Intructions for custom configure-options within Xcode IDE: 1. edit macosx/xcconfig/supplemental.xcconfig 2. save file (unsure how long it takes IDE to see change but it does) 3. build clean 4. build 5. never commit supplemental.xcconfig to repository - it is meant to exist but not effect the build on a clean checkout, and to be used only as a developer transient developer customization file. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5800 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/module.rules')
-rw-r--r--macosx/module.rules8
1 files changed, 8 insertions, 0 deletions
diff --git a/macosx/module.rules b/macosx/module.rules
index 6ee6c0019..a34b19166 100644
--- a/macosx/module.rules
+++ b/macosx/module.rules
@@ -1,15 +1,23 @@
$(eval $(call import.MODULE.rules,MACOSX))
macosx.build: $(MACOSX.m4.out)
+macosx.build: $(MACOSX.osl.filelist)
macosx.clean:
$(RM.exe) -f $(MACOSX.m4.out)
+ $(RM.exe) -f $(MACOSX.osl.filelist)
$(MACOSX.m4.out): $(BUILD/)project/handbrake.m4
$(MACOSX.m4.out): | $(dir $(MACOSX.m4.out))
$(MACOSX.m4.out): $(MACOSX.build/)%: $(MACOSX.src/)%.m4
$(M4.exe) -Iproject $< > $@
+$(MACOSX.osl.filelist): | $(dir $(MACOSX.osl.filelist))
+$(MACOSX.osl.filelist): $(BUILD/)GNUmakefile
+ @echo "creating $@"
+ @> $@
+ $(foreach i,$(foreach m,$(MODULES.NAMES),$($m.OSL.files)),$(call fn.PRINTLN,@echo $i >> $@))
+
###############################################################################
clean: macosx.clean