dvdnav: fix crash when poorly masterd disc has no menus

[handbrake-jp/handbrake-jp-git.git] / macosx / module.defs

diff --git a/macosx/module.defs b/macosx/module.defs
index 4b9329f..d92160f 100644 (file)
--- a/macosx/module.defs
+++ b/macosx/module.defs
@@ -15,7 +15,7 @@ MACOSX.targs = HandBrakeCLI HandBrake
 ## configuration pattern: (standard|debug)[.ARCH]
 ## eg. for native build, no debug --> standard
 ## eg. for x86_64 build with debug of any level --> debug.x86_64
-MACOSX.conf  = $(MACOSX.map.g.$(MACOSX.GCC.g))$(if $(filter 1,$(BUILD.cross)),.$(BUILD.arch))
+MACOSX.conf  = $(MACOSX.map.g.$(MACOSX.GCC.g)).$(BUILD.arch)
 
 ## this is a mapping to determine which basename config to use in xcodeproj
 MACOSX.map.g.none = standard
@@ -39,11 +39,13 @@ MACOSX.XCODE.project = HandBrake.xcodeproj
 ## $(1) = list of targets
 ## $(2) = list of goals to shunt thru xcodebuild->make
 ##
+XCODE.sysroot = $(foreach sdk,$(GCC.sysroot),-sdk $(sdk))
 MACOSX.XCODE = $(strip \
     cd $(MACOSX.src/) && \
        $(MACOSX.XCODE.exe) \
         -project $(MACOSX.XCODE.project) \
         -configuration $(MACOSX.conf) \
+       $(XCODE.sysroot) \
         $(foreach t,$(1),-target $t) \
         EXTERNAL_SRC='$(XCODE.external.src)' \
         EXTERNAL_BUILD='$(XCODE.external.build)' \