summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg
diff options
context:
space:
mode:
authorkonablend <[email protected]>2012-01-04 09:41:11 +0000
committerkonablend <[email protected]>2012-01-04 09:41:11 +0000
commit6d95ab81984cc44296438270aa792255f037c89a (patch)
tree842d42f935c31a5ec8c1529605cd0226d5d29197 /contrib/ffmpeg
parentaad50499b32c44d28a6bae7f353b579e24564e25 (diff)
BuildSystem: Mac OS X - transition to Xcode4
- transition from Xcode3 to Xcode4 - overhaul HandBrake.xcodeproj file - simplify down to 2 configurations: debug, release - add xcconfig for useful variants: osx106.i386, osx106.x86_64, osx107.i386, osx107.x86_64 - add configure --xcode-config as preferred method to choose OSX minimum version and SDK - overhaul Info.plist generation to use m4 instead of cpp - remove use of direct static libraries on command line - Xcode4 now enables -search_paths_first by default - reference external build static libraries project file - greatly simplifying project file maintenance - update universal build targets to use --xcode-config - update ffmpeg hack to build on i386 in both debug and optimized modes - update ffmpeg build to show compile verbosity - enable local yasm when yasm probe fails - remove unused GCC.ldsysroot - remove unused GCC.ldminver - enhance xcodemake to use --sysroot, --minver - update/regenerate docs accordingly - add support for configure-time repo probe when svn repo is incompatible format to Xcode via .svn/HANDBRAKE_REPO_PROBE - replaced make/test/build.matrix.darwin with make/test/build.matrix git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4395 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg')
-rw-r--r--contrib/ffmpeg/module.defs34
1 files changed, 22 insertions, 12 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 97a668dc6..0d4f4eaac 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -52,25 +52,36 @@ else
FFMPEG.CONFIGURE.extra += --enable-pthreads
endif
-ifneq (max,$(FFMPEG.GCC.g))
- FFMPEG.CONFIGURE.extra += --disable-debug
-else
+ifneq (none,$(FFMPEG.GCC.g))
FFMPEG.CONFIGURE.extra += --enable-debug
+else
+ FFMPEG.CONFIGURE.extra += --disable-debug
endif
ifeq (none,$(FFMPEG.GCC.O))
-#
-# gcc on darwin i386 fails to find enough registers when
-# optimizations are disabled
-#
-ifneq (darwin-i386,$(BUILD.system)-$(BUILD.machine))
FFMPEG.CONFIGURE.extra += --disable-optimizations
endif
+
+## enable compile verbosity
+FFMPEG.BUILD.extra = V=1
+
+##
+## llvm inline assembler (used in llvm-gcc and clang) runs out of registers
+## on darwin i386 - unclear if it is a source code or llvm bug.
+##
+ifeq (darwin-i386,$(BUILD.system)-$(BUILD.machine))
+ ## optimize mode hack: use clang
+ ifneq (none,$(FFMPEG.GCC.O))
+ FFMPEG.GCC.gcc = clang
+ endif
+
+ ## debug mode hack: omit frame pointer
+ ifneq (none,$(FFMPEG.GCC.g))
+ FFMPEG.GCC.args.extra += -fomit-frame-pointer
+ endif
endif
-#
-# MPC8 Doesn't compile on SPARC
-#
+## MPC8 Doesn't compile on SPARC
ifeq (solaris,$(BUILD.system))
FFMPEG.CONFIGURE.extra += --disable-demuxer=mpc8
endif
@@ -79,4 +90,3 @@ ifeq (1,$(FEATURE.local_yasm))
FFMPEG.CONFIGURE.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
FFMPEG.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
endif
-