diff options
39 files changed, 1867 insertions, 2682 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 - diff --git a/doc/BUILD-Cygwin b/doc/BUILD-Cygwin index 7f03ca824..eadb7e346 100644 --- a/doc/BUILD-Cygwin +++ b/doc/BUILD-Cygwin @@ -1,4 +1,4 @@ -Guide to Building HandBrake svn2591 (2009062101) on Cygwin +Guide to Building HandBrake svn4394 (2012010401) on Cygwin ********************************************************** Table of Contents @@ -43,12 +43,13 @@ Cygwin; but is not necessarily the only configuration that is possible: * yasm 0.7.2.2153 (for i386 or x86_64 architectures) - Note: It is recommended to use the platform distribution's bundled - compiler for maximum C++ compatibility. If you build with a custom - compiler it will likely introduce non-standard runtime - requirements. There are of course many valid reasons to build with - unbundled compilers, but be aware it is generally unsupported and - left as an exercise to the reader. + Note: It is recommended to use the platform distribution's + standard compiler for maximum C++ compatibility. If you build with + a custom compiler it will likely introduce non-standard runtime + requirements and have new/delete, exception and RTTI + incompatibilities. There are of course many valid reasons to build + with unbundled compilers, but be aware it is generally unsupported + and left as an exercise to the reader. Note: As of this writing, Cygwin has available to it several versions of gcc; only one of which may be found and used in the @@ -64,11 +65,11 @@ Cygwin; but is not necessarily the only configuration that is possible: The following general tools are used on various platforms and it is recommended you use these versions or similar: - * subversion - 1.6.2 + * subversion - 1.6.16 - * python - Python 2.4.6 + * python - Python 2.7.1 - * curl - curl 7.19.4 (or wget) + * curl - curl 7.21.4 (or wget) * m4 - GNU M4 1.4.6 @@ -76,9 +77,9 @@ recommended you use these versions or similar: * patch - Patch 2.5.8 - * tar - GNU tar 1.15.1 + * tar - GNU tar 1.26 - * wget - GNU Wget 1.11.4 (or curl) + * wget - GNU Wget 1.13.4 (or curl) 3 QuickStart ************ @@ -86,7 +87,7 @@ recommended you use these versions or similar: This chapter is for building from a terminal/shell environment in as few commands as possible. Upon completion of the following commands you should have a fresh build of HandBrake. Further instructions are -available beginning with *Note overview:: which describes procedures +available beginning with *note overview:: which describes procedures suitable for repeating builds. This chapter should be skipped by those seeking more than a minimalist build. @@ -136,7 +137,7 @@ exactly the same branch. If you have write-access to the repository, then you may add the appropriate login/password information as needed. It is recommended to -use Subversion 1.5.0 or higher. Lower versions should also work. +use Subversion 1.6.0 or higher. Lower versions should also work. 5.2 Configure ============= @@ -175,12 +176,6 @@ options are also documented here: All-in-one option which launches the build and logs output automatically. Useful for novices and quick-start procedures. -`--disable-xcode' - Disable shunting the build through `xcodebuild'. If this option is - applied, `HandBrakeCLI' will be produced in a similar fashion as - it is on other platforms; sans Xcode and the Cocoa application - will not be produced. Mac OS X only. - `--disable-gtk' Disable building the GTK GUI on applicable platforms such as Linux. @@ -200,6 +195,17 @@ options are also documented here: architectures. The available choices are hard-coded per platform and no sanity checks for the required tools are performed. +`--disable-xcode' + Disable shunting the build through `xcodebuild'. If this option is + applied, `HandBrakeCLI' will be produced in a similar fashion as + it is on other platforms; sans Xcode and the Cocoa application + will not be produced. Mac OS X only. + +`--xcconfig=MODE' + Select Xcode project configuration file. The available modes are + the basenames of files located in `macosx/xcconfig/*.xcconfig' + which direct Xcode to build using various architecture and Mac OS + X deployment options. Mac OS X only. Clean-room procedures dictate that when certain factors change, old builds should be scrapped and new builds configured. This is the main @@ -278,6 +284,10 @@ period. Build auto-generated project documentation. Various articles are produced and may be found in `build/doc/articles'. +`make doc.post' + Build auto-generated project documentation and post produced + articles directly to source tree. + `make report.help' Print list of available makefile vars report targets. These reports detail var definitions and expanded values used by the @@ -302,9 +312,11 @@ scoped targets: --------------------- Contrib modules such as `a52dec', `bzip2', `faac', `faad2', `ffmpeg', -`lame', `libdca', `libdvdread', `libmkv', `libogg', `libsamplerate', -`libtheora', `libvorbis', `mp4v2', `mpeg2dec', `x264' and `zlib' have -the following scoped targets: +`fontconfig', `freetype', `fribidi', `lame', `libass', `libbluray', +`libdca', `libdvdnav', `libdvdread', `libdvdread', `libiconv', +`libmkv', `libogg', `libsamplerate', `libtheora', `libvorbis', +`libxml2', `mp4v2', `mpeg2dec', `x264', `yasm' and `zlib' have the +following scoped targets: `make MODULE.fetch' Download source tarball from the Internet and save to @@ -424,8 +436,8 @@ overwrite `GNUmakefile' and any customizations contained therein would be lost. Here is a short example of what the contents of `_SRC_/custom.defs' might contain: - ## bump to gcc-4.2 in current path - GCC.gcc = /usr/bin/gcc-4.2 + ## bump to gcc-4.6 in current path + GCC.gcc = /usr/bin/gcc-4.6 ## replace optimize for 'speed' with more aggressive settings GCC.args.O.speed = -O3 -fomit-frame-pointer -msse4.2 @@ -465,7 +477,7 @@ Appendix A Project Repository Details root: svn://svn.handbrake.fr/HandBrake branch: trunk uuid: b64f7644-9d1e-0410-96f1-a4d463321fa5 - rev: 2591 - date: 2009-06-21 13:15:04 -0400 + rev: 4394 + date: 2011-12-30 17:21:44 -0500 type: developer diff --git a/doc/BUILD-Linux b/doc/BUILD-Linux index e69baac3d..8d5deb9fd 100644 --- a/doc/BUILD-Linux +++ b/doc/BUILD-Linux @@ -1,4 +1,4 @@ -Guide to Building HandBrake svn4306 (2011102201) on Linux +Guide to Building HandBrake svn4394 (2012010401) on Linux ********************************************************* Table of Contents @@ -44,21 +44,22 @@ Linux; but is not necessarily the only configuration that is possible: * gcc 4.0.0 or higher is reported to work - Note: It is recommended to use the platform distribution's bundled - compiler for maximum C++ compatibility. If you build with a custom - compiler it will likely introduce non-standard runtime - requirements. There are of course many valid reasons to build with - unbundled compilers, but be aware it is generally unsupported and - left as an exercise to the reader. + Note: It is recommended to use the platform distribution's + standard compiler for maximum C++ compatibility. If you build with + a custom compiler it will likely introduce non-standard runtime + requirements and have new/delete, exception and RTTI + incompatibilities. There are of course many valid reasons to build + with unbundled compilers, but be aware it is generally unsupported + and left as an exercise to the reader. The following general tools are used on various platforms and it is recommended you use these versions or similar: - * subversion - 1.6.2 + * subversion - 1.6.16 - * python - Python 2.4.6 + * python - Python 2.7.1 - * curl - curl 7.19.4 (or wget) + * curl - curl 7.21.4 (or wget) * m4 - GNU M4 1.4.6 @@ -66,9 +67,9 @@ recommended you use these versions or similar: * patch - Patch 2.5.8 - * tar - GNU tar 1.15.1 + * tar - GNU tar 1.26 - * wget - GNU Wget 1.11.4 (or curl) + * wget - GNU Wget 1.13.4 (or curl) The GTK UI introduces some significant extra build requirements. If you intend to disable building the GUI with `configure --disable-gtk' you @@ -214,7 +215,7 @@ exactly the same branch. If you have write-access to the repository, then you may add the appropriate login/password information as needed. It is recommended to -use Subversion 1.5.0 or higher. Lower versions should also work. +use Subversion 1.6.0 or higher. Lower versions should also work. 5.2 Configure ============= @@ -253,12 +254,6 @@ options are also documented here: All-in-one option which launches the build and logs output automatically. Useful for novices and quick-start procedures. -`--disable-xcode' - Disable shunting the build through `xcodebuild'. If this option is - applied, `HandBrakeCLI' will be produced in a similar fashion as - it is on other platforms; sans Xcode and the Cocoa application - will not be produced. Mac OS X only. - `--disable-gtk' Disable building the GTK GUI on applicable platforms such as Linux. @@ -278,6 +273,17 @@ options are also documented here: architectures. The available choices are hard-coded per platform and no sanity checks for the required tools are performed. +`--disable-xcode' + Disable shunting the build through `xcodebuild'. If this option is + applied, `HandBrakeCLI' will be produced in a similar fashion as + it is on other platforms; sans Xcode and the Cocoa application + will not be produced. Mac OS X only. + +`--xcconfig=MODE' + Select Xcode project configuration file. The available modes are + the basenames of files located in `macosx/xcconfig/*.xcconfig' + which direct Xcode to build using various architecture and Mac OS + X deployment options. Mac OS X only. Clean-room procedures dictate that when certain factors change, old builds should be scrapped and new builds configured. This is the main @@ -356,6 +362,10 @@ period. Build auto-generated project documentation. Various articles are produced and may be found in `build/doc/articles'. +`make doc.post' + Build auto-generated project documentation and post produced + articles directly to source tree. + `make report.help' Print list of available makefile vars report targets. These reports detail var definitions and expanded values used by the @@ -380,9 +390,11 @@ scoped targets: --------------------- Contrib modules such as `a52dec', `bzip2', `faac', `faad2', `ffmpeg', -`lame', `libdca', `libdvdread', `libmkv', `libogg', `libsamplerate', -`libtheora', `libvorbis', `mp4v2', `mpeg2dec', `x264' and `zlib' have -the following scoped targets: +`fontconfig', `freetype', `fribidi', `lame', `libass', `libbluray', +`libdca', `libdvdnav', `libdvdread', `libdvdread', `libiconv', +`libmkv', `libogg', `libsamplerate', `libtheora', `libvorbis', +`libxml2', `mp4v2', `mpeg2dec', `x264', `yasm' and `zlib' have the +following scoped targets: `make MODULE.fetch' Download source tarball from the Internet and save to @@ -502,8 +514,8 @@ overwrite `GNUmakefile' and any customizations contained therein would be lost. Here is a short example of what the contents of `_SRC_/custom.defs' might contain: - ## bump to gcc-4.2 in current path - GCC.gcc = /usr/bin/gcc-4.2 + ## bump to gcc-4.6 in current path + GCC.gcc = /usr/bin/gcc-4.6 ## replace optimize for 'speed' with more aggressive settings GCC.args.O.speed = -O3 -fomit-frame-pointer -msse4.2 @@ -543,7 +555,7 @@ Appendix A Project Repository Details root: svn://svn.handbrake.fr/HandBrake branch: trunk uuid: b64f7644-9d1e-0410-96f1-a4d463321fa5 - rev: 4306 - date: 2011-10-22 09:38:47 -0700 + rev: 4394 + date: 2011-12-30 17:21:44 -0500 type: developer diff --git a/doc/BUILD-Mac b/doc/BUILD-Mac index 5416aae23..07f56df84 100644 --- a/doc/BUILD-Mac +++ b/doc/BUILD-Mac @@ -1,4 +1,4 @@ -Build Guide for HandBrake svn3349 on Mac OS X +Build Guide for HandBrake 4394svn on Mac OS X ********************************************* Table of Contents @@ -23,8 +23,11 @@ Table of Contents 6 Building via Xcode.app 6.1 Checkout Sources 6.2 Build - 6.3 External Targets - 6.4 User-Defined Settings + 6.3 Note: Debugging + 6.4 Note: Finding Built Products + 6.5 Note: Workspace Log Behaviors + 6.6 External Target + 6.7 User-Defined Settings 7 Troubleshooting Appendix A Project Repository Details @@ -46,29 +49,30 @@ possible: * Mac Intel hardware - * Mac OS X 10.5.7 + * Mac OS X 10.7.2 - * Xcode-3.1.2 + * Xcode 4.2.1 (Build version 4D502) - * gcc 4.0.1 (Apple Inc. build 5490) + * llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) - * yasm 0.8.0.2194 (for i386 and x86_64 architectures) + * yasm 1.1.0.2352 - Note: It is recommended to use the platform distribution's bundled - compiler for maximum C++ compatibility. If you build with a custom - compiler it will likely introduce non-standard runtime - requirements. There are of course many valid reasons to build with - unbundled compilers, but be aware it is generally unsupported and - left as an exercise to the reader. + Note: It is recommended to use the platform distribution's + standard compiler for maximum C++ compatibility. If you build with + a custom compiler it will likely introduce non-standard runtime + requirements and have new/delete, exception and RTTI + incompatibilities. There are of course many valid reasons to build + with unbundled compilers, but be aware it is generally unsupported + and left as an exercise to the reader. The following general tools are used on various platforms and it is recommended you use these versions or similar: - * subversion - 1.6.2 + * subversion - 1.6.16 - * python - Python 2.4.6 + * python - Python 2.7.1 - * curl - curl 7.19.4 (or wget) + * curl - curl 7.21.4 (or wget) * m4 - GNU M4 1.4.6 @@ -76,9 +80,9 @@ recommended you use these versions or similar: * patch - Patch 2.5.8 - * tar - GNU tar 1.15.1 + * tar - GNU tar 1.26 - * wget - GNU Wget 1.11.4 (or curl) + * wget - GNU Wget 1.13.4 (or curl) 3 QuickStart ************ @@ -86,7 +90,7 @@ recommended you use these versions or similar: This chapter is for building from a terminal/shell environment in as few commands as possible. Upon completion of the following commands you should have a fresh build of HandBrake. Further instructions are -available beginning with *Note overview:: which describes procedures +available beginning with *note overview:: which describes procedures suitable for repeating builds. This chapter should be skipped by those seeking more than a minimalist build. @@ -141,7 +145,7 @@ exactly the same branch. If you have write-access to the repository, then you may add the appropriate login/password information as needed. It is recommended to -use Subversion 1.5.0 or higher. Lower versions should also work. +use Subversion 1.6.0 or higher. Lower versions should also work. 5.2 Configure ============= @@ -180,12 +184,6 @@ options are also documented here: All-in-one option which launches the build and logs output automatically. Useful for novices and quick-start procedures. -`--disable-xcode' - Disable shunting the build through `xcodebuild'. If this option is - applied, `HandBrakeCLI' will be produced in a similar fashion as - it is on other platforms; sans Xcode and the Cocoa application - will not be produced. Mac OS X only. - `--disable-gtk' Disable building the GTK GUI on applicable platforms such as Linux. @@ -205,6 +203,17 @@ options are also documented here: architectures. The available choices are hard-coded per platform and no sanity checks for the required tools are performed. +`--disable-xcode' + Disable shunting the build through `xcodebuild'. If this option is + applied, `HandBrakeCLI' will be produced in a similar fashion as + it is on other platforms; sans Xcode and the Cocoa application + will not be produced. Mac OS X only. + +`--xcconfig=MODE' + Select Xcode project configuration file. The available modes are + the basenames of files located in `macosx/xcconfig/*.xcconfig' + which direct Xcode to build using various architecture and Mac OS + X deployment options. Mac OS X only. Clean-room procedures dictate that when certain factors change, old builds should be scrapped and new builds configured. This is the main @@ -283,6 +292,10 @@ period. Build auto-generated project documentation. Various articles are produced and may be found in `build/doc/articles'. +`make doc.post' + Build auto-generated project documentation and post produced + articles directly to source tree. + `make report.help' Print list of available makefile vars report targets. These reports detail var definitions and expanded values used by the @@ -307,9 +320,11 @@ scoped targets: --------------------- Contrib modules such as `a52dec', `bzip2', `faac', `faad2', `ffmpeg', -`lame', `libdca', `libdvdread', `libmkv', `libogg', `libsamplerate', -`libtheora', `libvorbis', `mp4v2', `mpeg2dec', `x264' and `zlib' have -the following scoped targets: +`fontconfig', `freetype', `fribidi', `lame', `libass', `libbluray', +`libdca', `libdvdnav', `libdvdread', `libdvdread', `libiconv', +`libmkv', `libogg', `libsamplerate', `libtheora', `libvorbis', +`libxml2', `mp4v2', `mpeg2dec', `x264', `yasm' and `zlib' have the +following scoped targets: `make MODULE.fetch' Download source tarball from the Internet and save to @@ -429,8 +444,8 @@ overwrite `GNUmakefile' and any customizations contained therein would be lost. Here is a short example of what the contents of `_SRC_/custom.defs' might contain: - ## bump to gcc-4.2 in current path - GCC.gcc = /usr/bin/gcc-4.2 + ## bump to gcc-4.6 in current path + GCC.gcc = /usr/bin/gcc-4.6 ## replace optimize for 'speed' with more aggressive settings GCC.args.O.speed = -O3 -fomit-frame-pointer -msse4.2 @@ -449,21 +464,22 @@ Binaries for all the architectures. make full use of Xcode. Create a dummy (container) build configuration and use it to launch a -nested-build for each architecture serially; optionally you may -substitute `make ub.build.serial' for `make ub.build.parallel' if your -machine has the horsepower: +nested-build for each architecture: ./configure --disable-xcode cd build/ - make ub.build.serial + make ub.build make ub.combine -To specify a subset of architectures to be built first create/edit -`_SRC_/custom.defs' with the following override to build UB for `i386' -and `x86_64' before invoking `make': +The list of architectures is hard coded to HandBrake's desired product +and currently is composed of combining the binaries produced from two +xcconfigs: osx106.i386 and osx106.x86_64. The following example shows +how to specify a different list of xcconfigs: - ## prefer i386 (order is important) - UB.archs = i386 x86_64 + ./configure --disable-xcode + cd build/ + make UB.xcconfigs="osx107.i386 osx107.x86_64" ub.build + make UB.xcconfigs="osx107.i386 osx107.x86_64" ub.combine 6 Building via Xcode.app ************************ @@ -482,135 +498,151 @@ exactly the same branch. If you have write-access to the repository, then you may add the appropriate login/password information as needed. It is recommended to -use Subversion 1.5.0 or higher. Lower versions should also work. +use Subversion 1.6.0 or higher. Lower versions should also work. 6.2 Build ========= -Open Xcode.app from a terminal by using the `open' command which passes -your shell environment and its `PATH' setting to Xcode. Do not attempt -to launch Xcode.app from Finder or by using Finder to open -`HandBrake.xcodeproj' - doing so will defeat any custom path settings -which contain required tools. - - open `macosx/HandBrake.xcodeproj' - -Once the HandBrake Xcode project is open, perform the following steps -to build the default configuration: - - * select active configuration standard - - * select active target HandBrake - - * click Build or Build and Go - -When using Build and Go, xcode launches the application under the gdb -debugger. gdb will encounter a trap when starting the program. This -trap is harmless and you should just 'continue'. For the curious, the -trap occurs because we add some values to the environment with setenv, -then do a brain transplant with execv. Restarting the application with -execv triggers the trap. - -The first build (on an empty `build' directory) will take a bit of -time. You may use the Build Results window to observe progress. The -most time-consuming part of the build is when the external build system -(essentially the terminal method) is triggered by Xcode and a -substantial amount of log transcript ensues. Much of that transcript -are warnings and errors that are part of the normal build process for -3rd-party contributed modules so in general you need not do anything. -However, if Xcode itself reports the build failed, then you must take -corrective action. - -Unfortunately, due to limitations of Xcode we do not have hooks in -place to offer finer-grained control over per-module make actions for -the (external) build system. Thus, you will have to use terminal to -accomplish those tasks. Just `cd' into the build directory which is -associated with your active configuration and perform any necessary -`make' commands. Be careful not to issue commands from the terminal -simultaneously with Xcode tasks as that will confuse both Xcode and -make and likely corrupt your build directory. - -When you click clean in Xcode it will not perform an external build -clean. Basically HandBrakeCLI and HandBrake.app are the only products -which have full Xcode iterative development flexibility. - -Each configuration uses a different `build' directory. This makes it -possible to build each configuration and switch between them without -losing their respective build state. The description of each -configuration and the name convention for build directories are as -follows: - -`standard' - This configuration will build host native architecture. Build - directory is `build.standard' . The standard variant produces - optimized code without debug information. - -`standard.i386' - This configuration will build i386 architecture. Build directory - is `build.standard.i386' . - -`standard.x86_64' - This configuration will build x86_64 architecture. Build directory - is `build.standard.x86_64' . - -`standard.ppc' - This configuration will build ppc architecture. Build directory is - `build.standard.ppc' . - -`standard.ppc64' - This configuration will build ppc64 architecture. Build directory - is `build.standard.ppc64' . - -`debug' - This configuration will build host native architecture. Build - directory is `build.debug' . The debug variant produces - unoptimized code with debug information. - -`debug.i386' - This configuration will build i386 architecture. Build directory - is `build.debug.i386' . The debug variant produces unoptimized - code with debug information. - -`debug.x86_64' - This configuration will build x86_64 architecture. Build directory - is `build.debug.x86_64' . The debug variant produces unoptimized - code with debug information. - -`debug.ppc' - This configuration will build ppc architecture. Build directory is - `build.debug.ppc' . The debug variant produces unoptimized code - with debug information. - -`debug.ppc64' - This configuration will build ppc64 architecture. Build directory - is `build.debug.ppc64' . The debug variant produces unoptimized - code with debug information. - -6.3 External Targets -==================== +Perform the following steps to build: + + * Finder - navigate to `macosx/' in the HandBrake source tree + + * Finder - open `HandBrake.xcodeproj' + + * Xcode workspace - select scheme HandBrake [RELEASE] + + * Xcode menu - select Product -> Build + + * Xcode workspace - Show the Log navigator + + * Xcode workspace Log navigator - select top Build item + +6.3 Note: Debugging +=================== + +When debugging, Xcode launches the application under the gdb debugger. +gdb will encounter a trap when starting the program. This trap is +harmless and you should just 'continue'. For the curious, the trap +occurs because we add some values to the environment with setenv, then +do a brain transplant with execv. Restarting the application with execv +triggers the trap. + +6.4 Note: Finding Built Products +================================ + +Under default Xcode.app options the products from a build are managed +by the Xcode Organizer. Perform the following steps to open Finder at +top of build tree and navigate to release products: + + * Xcode menu - select Window -> Organizer + + * Xcode organizer - select Projects tab + + * Xcode organizer Projects - select HandBrake item -The following external targets appear in the Xcode project and perform -build and clean actions. + * HandBrake item - click Derived Data location arrow (immediately + right of path) -`external' - Target maps to `make build' and `make clean' for everything Xcode - products depend upon from the external build system. + * Finder - navigate to Build -> Products -> release -`libhb' - Target maps to `make libhb.build' and `make libhb.clean'. + Note: There is a bug with Xcode Organizer. The very first time an + Xcode project is opened the Project view Derived Data is + greyed-out. Workaround glitch by selecting any other tab and then + reselecting Projects tab. -`contrib' - Target maps to `make contrib.build' and `make contrib.xclean'. +6.5 Note: Workspace Log Behaviors +================================= +The default Workspace behavior does not display latest Build log in the +navigator and quickly becomes tedious. To automatically switch to Log +navigator and show current log: -6.4 User-Defined Settings + * Xcode menu - select Behaviors -> Edit Behaviors + + * Xcode behaviors - select Build starts + + * navigator - enable, select Show, select Log Navigator + + * nagivate to - select current log + + Note: The Log navigator supports some possibly confusing options. + It is recommended to only show results for the last build by + selecting Recent. If All is selected then it will look as though + Xcode is performing a build, but in reality it is bringing forward + log output from prior builds and it becomes impossible to tell if + any single log entry represents actual work performed or if it was + brought forward from history. + + Note: When building external target, many 3rd-party contributed + modules have warnings and errors which may safely be ignored and + are ignored by the external build system. Ultimately, look to the + workspace status indicator for Build Succeeded. + +6.6 External Target +=================== + +The external target mechanism is used to launch a full terminal-based +build from within Xcode. Unfortunately, we do not have hooks in place +to offer finer-grained control over per-module make actions. However, +you can still use terminal to accomplish those tasks after launching +the build at least once or doing a clean from within Xcode. Be careful +to not issue terminal commands simultaneously with Xcode tasks. + +Invoking a clean from Xcode always destroys the entire external build +tree and subsequently configures it. Changing settings in Xcode such as +selecting xcconfig files should always be followed by a clean. This +allows the external build system configuration to accurately reflect +Xcode project changes. + +The following are some examples of using `make' from the terminal to +effect various components of the external build. But first, you must +open a terminal at the top of the external build output tree. Here we +navigate to external build configured for release: + + * Xcode menu - select Window -> Organizer + + * Xcode organizer - select Projects tab + + * Xcode organizer Projects - select HandBrake item + + * HandBrake item - click Derived Data location arrow (immediately + right of path) + + * Finder - navigate to Build -> Products -> release -> external + +Example; external build failed but error is buried in a parallelized +log; redo build sequentially: + + make xclean + make BUILD.jobs=1 + +Example; build external x264 module: + + make x264.clean + make x264 + +Example; extract, configure, build and install external x264 module: + + make x264.xclean + make x264.install + +Example; something in a big module is failing; redo build sequentially: + + make ffmpeg.clean + make BUILD.jobs=1 ffmpeg + +6.7 User-Defined Settings ========================= -The following user defined settings are used in Xcode project for the -external build system: +The following user defined settings are visible in Xcode project and +are used for the external build system. `EXTERNAL_BUILD' - Specifies the build (scratch) directory for each configuration. + Do not modify; used to specify the build (scratch) directory. + +`EXTERNAL_DRIVER' + Do not modify; used for internal/external build coordination and + must always be `xcode'. `EXTERNAL_JOBS' Specifies the concurrency factor for the external build system @@ -618,14 +650,17 @@ external build system: external builds if your system has the horsepower and resources. Specifying a value greater than the number of CPU cores (or virtual cores) in your system is unlikely to produce gains and - will needlessly consume extra resources. - -`EXTERNAL_METHOD' - Do not modify; Used for internal/external build coordination and - must always be `xcode'. + will needlessly consume extra resources. A special string value of + auto sets the factor to the number of active CPUs on the host + system. `EXTERNAL_SRC' - Specifies the top-level source directory for HandBrake. + Do not modify; specifies the top-level source directory for + HandBrake, relative to Xcode project. + +`EXTERNAL_XCCONFIG' + Do not modify; specifies which xcconfig file is active. Defined + inside xcconfig file. 7 Troubleshooting @@ -664,7 +699,7 @@ Appendix A Project Repository Details root: svn://svn.handbrake.fr/HandBrake branch: trunk uuid: b64f7644-9d1e-0410-96f1-a4d463321fa5 - rev: 3349 - date: 2010-06-02 09:49:18 -0700 + rev: 4394 + date: 2011-12-30 17:21:44 -0500 type: developer diff --git a/doc/texi/Building.osx.texi b/doc/texi/Building.osx.texi index 6afa9b543..5c661c5eb 100644 --- a/doc/texi/Building.osx.texi +++ b/doc/texi/Building.osx.texi @@ -20,10 +20,10 @@ Building on @value{OS.osx} is well supported. It is the reference platform for @ @itemize @bullet @item Mac Intel hardware -@item @value{OS.osx} 10.5.7 -@item Xcode-3.1.2 -@item gcc 4.0.1 (Apple Inc. build 5490) -@item yasm 0.8.0.2194 (for i386 and x86_64 architectures) +@item @value{OS.osx} 10.7.2 +@item Xcode 4.2.1 (Build version 4D502) +@item llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) +@item yasm 1.1.0.2352 @end itemize @include building/prerequisites.bundled.texi @@ -49,20 +49,22 @@ This section outlines convenience procedures for creating Universal Binaries for The dummy (container) build configuration uses @command{--disable-xcode}; but the nested architecture builds will all make full use of Xcode. @end quotation -Create a dummy (container) build configuration and use it to launch a nested-build for each architecture @i{serially}; optionally you may substitute @command{make ub.build.serial} for @command{make ub.build.parallel} if your machine has the horsepower: +Create a dummy (container) build configuration and use it to launch a nested-build for each architecture: @example ./configure --disable-xcode cd build/ -make ub.build.serial +make ub.build make ub.combine @end example -To specify a subset of architectures to be built first create/edit @file{_SRC_/custom.defs} with the following override to build UB for @samp{i386} and @samp{x86_64} before invoking @command{make}: +The list of architectures is hard coded to @value{HB.name}'s desired product and currently is composed of combining the binaries produced from two xcconfigs: osx106.i386 and osx106.x86_64. The following example shows how to specify a different list of xcconfigs: @example -## prefer i386 (order is important) -UB.archs = i386 x86_64 +./configure --disable-xcode +cd build/ +make UB.xcconfigs="osx107.i386 osx107.x86_64" ub.build +make UB.xcconfigs="osx107.i386 osx107.x86_64" ub.combine @end example @c %**------------------------------------------------------------------------- diff --git a/doc/texi/building/chapter.via.terminal.texi b/doc/texi/building/chapter.via.terminal.texi index 69f1424db..bdd665e23 100644 --- a/doc/texi/building/chapter.via.terminal.texi +++ b/doc/texi/building/chapter.via.terminal.texi @@ -37,9 +37,6 @@ This defaults to a reasonable platform-specific value. All-in-one option which launches the build and logs output automatically. Useful for novices and quick-start procedures. -@item --disable-xcode -Disable shunting the build through @command{xcodebuild}. If this option is applied, @command{HandBrakeCLI} will be produced in a similar fashion as it is on other platforms; sans Xcode and the Cocoa application will not be produced. @value{OS.osx} only. - @item --disable-gtk Disable building the GTK GUI on applicable platforms such as @value{OS.linux}. @@ -54,6 +51,11 @@ This generally maps to gcc options @samp{-g0}, @samp{-O0}, @samp{-O3}, @samp{-Os @item --arch=MODE Select build architecture. The available architectures vary by platform. Most platforms support exactly one architecture except @value{OS.osx} which has support for various universal binary architectures. The available choices are hard-coded per platform and no sanity checks for the required tools are performed. +@item --disable-xcode +Disable shunting the build through @command{xcodebuild}. If this option is applied, @command{HandBrakeCLI} will be produced in a similar fashion as it is on other platforms; sans Xcode and the Cocoa application will not be produced. @value{OS.osx} only. + +@item --xcconfig=MODE +Select Xcode project configuration file. The available modes are the basenames of files located in @file{macosx/xcconfig/*.xcconfig} which direct Xcode to build using various architecture and @value{OS.osx} deployment options. @value{OS.osx} only. @end table Clean-room procedures dictate that when certain factors change, old builds should be scrapped and new builds configured. This is the main reason for requiring a scratch directory; to promote consistent, reliable and clean software builds. The following is a short list of some of the reasons why someone may choose to scrap an existing build: @@ -114,6 +116,9 @@ Clean all build output including contrib modules. Configuration is retained. @item make doc Build auto-generated project documentation. Various articles are produced and may be found in @file{build/doc/articles}. +@item make doc.post +Build auto-generated project documentation and post produced articles directly to source tree. + @item make report.help Print list of available makefile vars report targets. These reports detail var definitions and expanded values used by the build system. @@ -140,7 +145,7 @@ Clean build output for @i{MODULE}. @anchor{terminal.targets.contrib} @subsection Contrib Modules -Contrib modules such as @samp{a52dec}, @samp{bzip2}, @samp{faac}, @samp{faad2}, @samp{ffmpeg}, @samp{lame}, @samp{libdca}, @samp{libdvdread}, @samp{libmkv}, @samp{libogg}, @samp{libsamplerate}, @samp{libtheora}, @samp{libvorbis}, @samp{mp4v2}, @samp{mpeg2dec}, @samp{x264} and @samp{zlib} have the following scoped targets: +Contrib modules such as @samp{a52dec}, @samp{bzip2}, @samp{faac}, @samp{faad2}, @samp{ffmpeg}, @samp{fontconfig}, @samp{freetype}, @samp{fribidi}, @samp{lame}, @samp{libass}, @samp{libbluray}, @samp{libdca}, @samp{libdvdnav}, @samp{libdvdread}, @samp{libdvdread}, @samp{libiconv}, @samp{libmkv}, @samp{libogg}, @samp{libsamplerate}, @samp{libtheora}, @samp{libvorbis}, @samp{libxml2}, @samp{mp4v2}, @samp{mpeg2dec}, @samp{x264}, @samp{yasm} and @samp{zlib} have the following scoped targets: @table @samp @item make @i{MODULE}.fetch @@ -232,8 +237,8 @@ Custom makevar rules specific to a @file{build} directory. The purpose is to allow a place to store local build settings for testing, tweaking, and experimenting with build configuration without losing your settings if @command{configure} is invoked; ie: @command{configure} would overwrite @file{GNUmakefile} and any customizations contained therein would be lost. Here is a short example of what the contents of @file{_SRC_/custom.defs} might contain: @example -## bump to gcc-4.2 in current path -GCC.gcc = /usr/bin/gcc-4.2 +## bump to gcc-4.6 in current path +GCC.gcc = /usr/bin/gcc-4.6 ## replace optimize for 'speed' with more aggressive settings GCC.args.O.speed = -O3 -fomit-frame-pointer -msse4.2 diff --git a/doc/texi/building/chapter.via.xcode.texi b/doc/texi/building/chapter.via.xcode.texi index 0b0c2b435..83d1e9362 100644 --- a/doc/texi/building/chapter.via.xcode.texi +++ b/doc/texi/building/chapter.via.xcode.texi @@ -9,102 +9,125 @@ @c %**------------------------------------------------------------------------- @anchor{xcode.build} @section Build -Open Xcode.app from a terminal by using the @command{open} command which passes your shell environment and its @samp{PATH} setting to Xcode. Do not attempt to launch Xcode.app from Finder or by using Finder to open @file{HandBrake.xcodeproj} -- doing so will defeat any custom path settings which contain required tools. - -@example -open @file{macosx/HandBrake.xcodeproj} -@end example - -Once the HandBrake Xcode project is open, perform the following steps to build the default configuration: +Perform the following steps to build: @itemize -@item select active configuration @b{standard} -@item select active target @b{HandBrake} -@item click @b{Build} or @b{Build and Go} +@item Finder - navigate to @file{macosx/} in the @value{HB.name} source tree +@item Finder - open @file{HandBrake.xcodeproj} +@item Xcode workspace - select scheme @b{HandBrake [RELEASE]} +@item Xcode menu - select Product -> Build +@item Xcode workspace - Show the Log navigator +@item Xcode workspace Log navigator - select top Build item @end itemize -When using Build and Go, xcode launches the application under the gdb debugger. gdb will encounter a trap when starting the program. This trap is harmless and you should just 'continue'. For the curious, the trap occurs because we add some values to the environment with setenv, then do a brain transplant with execv. Restarting the application with execv triggers the trap. +@c %**------------------------------------------------------------------------- +@anchor{xcode.note.debug} +@section Note: Debugging +When debugging, Xcode launches the application under the gdb debugger. gdb will encounter a trap when starting the program. This trap is harmless and you should just 'continue'. For the curious, the trap occurs because we add some values to the environment with setenv, then do a brain transplant with execv. Restarting the application with execv triggers the trap. -The first build (on an empty @file{build} directory) will take a bit of time. You may use the Build Results window to observe progress. The most time-consuming part of the build is when the external build system (essentially the @b{terminal} method) is triggered by Xcode and a substantial amount of log transcript ensues. Much of that transcript are warnings and errors that are part of the normal build process for 3rd-party contributed modules so in general you need not do anything. However, if Xcode itself reports the build failed, then you must take corrective action. +@c %**------------------------------------------------------------------------- +@anchor{xcode.note.products} +@section Note: Finding Built Products +Under default Xcode.app options the products from a build are managed by the Xcode Organizer. Perform the following steps to open Finder at top of build tree and navigate to release products: -Unfortunately, due to limitations of Xcode we do not have hooks in place to offer finer-grained control over per-module make actions for the (external) build system. Thus, you will have to use @b{terminal} to accomplish those tasks. Just @command{cd} into the build directory which is associated with your active configuration and perform any necessary @command{make} commands. @b{Be careful not to issue commands from the terminal simultaneously with Xcode tasks} as that will confuse both Xcode and make and likely corrupt your build directory. +@itemize +@item Xcode menu - select Window -> Organizer +@item Xcode organizer - select Projects tab +@item Xcode organizer Projects - select @value{HB.name} item +@item @value{HB.name} item - click Derived Data location arrow (immediately right of path) +@item Finder - navigate to Build -> Products -> release +@end itemize -When you click @b{clean} in Xcode it will not perform an external build clean. Basically @b{HandBrakeCLI} and @b{HandBrake.app} are the only products which have full Xcode iterative development flexibility. +@quotation Note +There is a bug with Xcode Organizer. The very first time an Xcode project is opened the Project view Derived Data is greyed-out. Workaround glitch by selecting any other tab and then reselecting Projects tab. +@end quotation -Each configuration uses a different @file{build} directory. This makes it possible to build each configuration and switch between them without losing their respective build state. The description of each configuration and the name convention for build directories are as follows: +@c %**------------------------------------------------------------------------- +@anchor{xcode.note.behaviors} +@section Note: Workspace Log Behaviors +The default Workspace behavior does not display latest Build log in the navigator and quickly becomes tedious. To automatically switch to Log navigator and show current log: -@table @samp -@item standard -This configuration will build @b{host native} architecture. Build directory is @file{build.standard} . -The standard variant produces optimized code without debug information. +@itemize +@item Xcode menu - select Behaviors -> Edit Behaviors +@item Xcode behaviors - select Build starts +@item navigator - enable, select Show, select Log Navigator +@item nagivate to - select current log +@end itemize -@item standard.i386 -This configuration will build @b{i386} architecture. Build directory is @file{build.standard.i386} . +@quotation Note +The Log navigator supports some possibly confusing options. It is recommended to only show results for the last build by selecting @b{Recent}. If @b{All} is selected then it will look as though Xcode is performing a build, but in reality it is bringing forward log output from prior builds and it becomes impossible to tell if any single log entry represents actual work performed or if it was brought forward from history. +@end quotation -@item standard.x86_64 -This configuration will build @b{x86_64} architecture. Build directory is @file{build.standard.x86_64} . +@quotation Note +When building external target, many 3rd-party contributed modules have warnings and errors which may safely be ignored and are ignored by the external build system. Ultimately, look to the workspace status indicator for @b{Build Succeeded}. +@end quotation -@item standard.ppc -This configuration will build @b{ppc} architecture. Build directory is @file{build.standard.ppc} . +@c %**------------------------------------------------------------------------- +@anchor{xcode.note.external} +@section External Target +The external target mechanism is used to launch a full terminal-based build from within Xcode. Unfortunately, we do not have hooks in place to offer finer-grained control over per-module make actions. However, you can still use @b{terminal} to accomplish those tasks after launching the build at least once or doing a clean from within Xcode. @b{Be careful to not issue terminal commands simultaneously with Xcode tasks.} -@item standard.ppc64 -This configuration will build @b{ppc64} architecture. Build directory is @file{build.standard.ppc64} . +Invoking a clean from Xcode always destroys the entire external build tree and subsequently configures it. Changing settings in Xcode such as selecting xcconfig files should always be followed by a clean. This allows the external build system configuration to accurately reflect Xcode project changes. -@item debug -This configuration will build @b{host native architecture}. Build directory is @file{build.debug} . -The debug variant produces unoptimized code with debug information. +The following are some examples of using @command{make} from the terminal to effect various components of the external build. But first, you must open a terminal at the top of the external build output tree. Here we navigate to external build configured for @b{release}: -@item debug.i386 -This configuration will build @b{i386} architecture. Build directory is @file{build.debug.i386} . -The debug variant produces unoptimized code with debug information. +@itemize +@item Xcode menu - select Window -> Organizer +@item Xcode organizer - select Projects tab +@item Xcode organizer Projects - select @value{HB.name} item +@item @value{HB.name} item - click Derived Data location arrow (immediately right of path) +@item Finder - navigate to Build -> Products -> release -> external +@end itemize -@item debug.x86_64 -This configuration will build @b{x86_64} architecture. Build directory is @file{build.debug.x86_64} . -The debug variant produces unoptimized code with debug information. +Example; external build failed but error is buried in a parallelized log; redo build sequentially: -@item debug.ppc -This configuration will build @b{ppc} architecture. Build directory is @file{build.debug.ppc} . -The debug variant produces unoptimized code with debug information. +@example +make xclean +make BUILD.jobs=1 +@end example -@item debug.ppc64 -This configuration will build @b{ppc64} architecture. Build directory is @file{build.debug.ppc64} . -The debug variant produces unoptimized code with debug information. -@end table +Example; build external x264 module: -@c %**------------------------------------------------------------------------- -@anchor{xcode.extenal} -@section External Targets -The following external targets appear in the Xcode project and perform @b{build} and @b{clean} actions. +@example +make x264.clean +make x264 +@end example -@table @samp -@item external -Target maps to @command{make build} and @command{make clean} for everything Xcode products depend upon from the external build system. +Example; extract, configure, build and install external x264 module: -@item libhb -Target maps to @command{make libhb.build} and @command{make libhb.clean}. +@example +make x264.xclean +make x264.install +@end example -@item contrib -Target maps to @command{make contrib.build} and @command{make contrib.xclean}. +Example; something in a big module is failing; redo build sequentially: -@end table +@example +make ffmpeg.clean +make BUILD.jobs=1 ffmpeg +@end example @c %**------------------------------------------------------------------------- @anchor{xcode.userdefined} @section User-Defined Settings -The following user defined settings are used in Xcode project for the external build system: +The following user defined settings are visible in Xcode project and are used +for the external build system. @table @samp @item EXTERNAL_BUILD -Specifies the build (scratch) directory for each configuration. +Do not modify; used to specify the build (scratch) directory. + +@item EXTERNAL_DRIVER +Do not modify; used for internal/external build coordination and must always be @samp{xcode}. @item EXTERNAL_JOBS Specifies the concurrency factor for the external build system when builds are launched from within Xcode. -Modify for faster external builds if your system has the horsepower and resources. Specifying a value greater than the number of CPU cores (or virtual cores) in your system is unlikely to produce gains and will needlessly consume extra resources. - -@item EXTERNAL_METHOD -Do not modify; Used for internal/external build coordination and must always be @samp{xcode}. +Modify for faster external builds if your system has the horsepower and resources. Specifying a value greater than the number of CPU cores (or virtual cores) in your system is unlikely to produce gains and will needlessly consume extra resources. A special string value of @b{auto} sets the factor to the number of active CPUs on the host system. @item EXTERNAL_SRC -Specifies the top-level source directory for @value{HB.name}. +Do not modify; specifies the top-level source directory for @value{HB.name}, relative to Xcode project. + +@item EXTERNAL_XCCONFIG +Do not modify; specifies which xcconfig file is active. Defined inside xcconfig file. @end table diff --git a/doc/texi/building/method.checkout.texi b/doc/texi/building/method.checkout.texi index ca2352cec..32f668635 100644 --- a/doc/texi/building/method.checkout.texi +++ b/doc/texi/building/method.checkout.texi @@ -6,4 +6,4 @@ Checkout @value{HB.name} from the official source-code repository. Sources are checked out from the @samp{@value{HB.repo.branch}} branch. This document was generated from that very branch, and for example purposes, we will use exactly the same branch. -If you have write-access to the repository, then you may add the appropriate login/password information as needed. It is recommended to use Subversion 1.5.0 or higher. Lower versions should also work. +If you have write-access to the repository, then you may add the appropriate login/password information as needed. It is recommended to use Subversion 1.6.0 or higher. Lower versions should also work. diff --git a/doc/texi/building/prerequisites.bundled.texi b/doc/texi/building/prerequisites.bundled.texi index f5af0fcce..b9f5b7590 100644 --- a/doc/texi/building/prerequisites.bundled.texi +++ b/doc/texi/building/prerequisites.bundled.texi @@ -1,3 +1,3 @@ @quotation Note -It is recommended to use the platform distribution's bundled compiler for maximum C++ compatibility. If you build with a custom compiler it will likely introduce non-standard runtime requirements. There are of course many valid reasons to build with unbundled compilers, but be aware it is generally unsupported and left as an exercise to the reader. +It is recommended to use the platform distribution's standard compiler for maximum C++ compatibility. If you build with a custom compiler it will likely introduce non-standard runtime requirements and have new/delete, exception and RTTI incompatibilities. There are of course many valid reasons to build with unbundled compilers, but be aware it is generally unsupported and left as an exercise to the reader. @end quotation diff --git a/doc/texi/building/prerequisites.common.texi b/doc/texi/building/prerequisites.common.texi index a975f9d56..64c21fd38 100644 --- a/doc/texi/building/prerequisites.common.texi +++ b/doc/texi/building/prerequisites.common.texi @@ -1,12 +1,12 @@ The following general tools are used on various platforms and it is recommended you use these versions or similar: @itemize @bullet -@item subversion - 1.6.2 -@item python - Python 2.4.6 -@item curl - curl 7.19.4 (or wget) +@item subversion - 1.6.16 +@item python - Python 2.7.1 +@item curl - curl 7.21.4 (or wget) @item m4 - GNU M4 1.4.6 @item make - GNU Make 3.81 @item patch - Patch 2.5.8 -@item tar - GNU tar 1.15.1 -@item wget - GNU Wget 1.11.4 (or curl) +@item tar - GNU tar 1.26 +@item wget - GNU Wget 1.13.4 (or curl) @end itemize diff --git a/macosx/English.lproj/PicturePreview.xib b/macosx/English.lproj/PicturePreview.xib index 09a1fdee7..397307a3f 100644 --- a/macosx/English.lproj/PicturePreview.xib +++ b/macosx/English.lproj/PicturePreview.xib @@ -103,7 +103,6 @@ </object> <string key="NSFrame">{{-3, -3}, {488, 368}}</string> <reference key="NSSuperview" ref="353606868"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="48693112"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="955430771"> @@ -131,7 +130,6 @@ </object> <string key="NSFrameSize">{482, 362}</string> <reference key="NSSuperview" ref="353606868"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="768906858"/> <object class="NSColor" key="kCoderFillColor"> <int key="NSColorSpace">1</int> @@ -157,7 +155,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{20, 9}, {77, 16}}</string> <reference key="NSSuperview" ref="385854969"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="66510867"/> <object class="NSArray" key="NSViewContentFilters"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -197,7 +194,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{357, 10}, {59, 16}}</string> <reference key="NSSuperview" ref="385854969"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="700607930"/> <object class="NSArray" key="NSViewContentFilters"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -233,7 +229,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{259, 10}, {92, 16}}</string> <reference key="NSSuperview" ref="385854969"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="141370142"/> <object class="NSArray" key="NSViewContentFilters"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -273,7 +268,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{101, 14}, {75, 11}}</string> <reference key="NSSuperview" ref="385854969"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="598619000"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="567286013"> @@ -306,7 +300,6 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{184, 11}, {58, 15}}</string> <reference key="NSSuperview" ref="385854969"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="81685190"/> <object class="NSArray" key="NSViewContentFilters"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -392,7 +385,6 @@ <int key="NSvFlags">290</int> <string key="NSFrame">{{18, 39}, {402, 16}}</string> <reference key="NSSuperview" ref="385854969"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="798240356"/> <object class="NSArray" key="NSViewContentFilters"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -429,7 +421,6 @@ <int key="NSvFlags">290</int> <string key="NSFrame">{{15, 55}, {408, 20}}</string> <reference key="NSSuperview" ref="385854969"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="396925210"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="921881842"> @@ -455,7 +446,6 @@ <int key="NSvFlags">290</int> <string key="NSFrame">{{16, 80}, {408, 12}}</string> <reference key="NSSuperview" ref="385854969"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="628196212"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1032360651"> @@ -472,13 +462,11 @@ </object> <string key="NSFrame">{{1, 1}, {438, 97}}</string> <reference key="NSSuperview" ref="92351498"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="245200984"/> </object> </object> <string key="NSFrame">{{21, 121}, {440, 99}}</string> <reference key="NSSuperview" ref="353606868"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="385854969"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -534,7 +522,6 @@ <int key="NSvFlags">290</int> <string key="NSFrame">{{18, 27}, {407, 21}}</string> <reference key="NSSuperview" ref="1068222891"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="964331174"/> <object class="NSArray" key="NSViewContentFilters"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -570,7 +557,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{200, 53}, {39, 25}}</string> <reference key="NSSuperview" ref="1068222891"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="894608246"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="19809002"> @@ -596,7 +582,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{171, 53}, {30, 25}}</string> <reference key="NSSuperview" ref="1068222891"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="102183813"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="913339095"> @@ -623,7 +608,6 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{238, 53}, {32, 25}}</string> <reference key="NSSuperview" ref="1068222891"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="630042886"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="117507013"> @@ -645,7 +629,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{331, 56}, {77, 16}}</string> <reference key="NSSuperview" ref="1068222891"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="886140787"/> <object class="NSArray" key="NSViewContentFilters"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -681,7 +664,6 @@ <int key="NSvFlags">290</int> <string key="NSFrame">{{18, 10}, {399, 12}}</string> <reference key="NSSuperview" ref="1068222891"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="113790059"> @@ -698,13 +680,11 @@ </object> <string key="NSFrame">{{1, 1}, {438, 97}}</string> <reference key="NSSuperview" ref="700607930"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="897614796"/> </object> </object> <string key="NSFrame">{{21, 16}, {440, 99}}</string> <reference key="NSSuperview" ref="353606868"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="1068222891"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -749,7 +729,6 @@ <object class="NSPSMatrix" key="NSDrawMatrix"/> <string key="NSFrame">{{23, 26}, {336, 12}}</string> <reference key="NSSuperview" ref="1067699710"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="569473100"/> <object class="NSArray" key="NSViewContentFilters"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -773,7 +752,6 @@ <int key="NSvFlags">265</int> <string key="NSFrame">{{366, 24}, {58, 16}}</string> <reference key="NSSuperview" ref="1067699710"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="92351498"/> <object class="NSArray" key="NSViewContentFilters"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -809,7 +787,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{21, 59}, {394, 14}}</string> <reference key="NSSuperview" ref="1067699710"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="196868285"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="304208899"> @@ -828,13 +805,11 @@ </object> <string key="NSFrame">{{1, 1}, {438, 98}}</string> <reference key="NSSuperview" ref="768906858"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="986015194"/> </object> </object> <string key="NSFrame">{{21, 233}, {440, 100}}</string> <reference key="NSSuperview" ref="353606868"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="1067699710"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -866,13 +841,11 @@ </object> <string key="NSFrameSize">{480, 360}</string> <reference key="NSSuperview" ref="289177107"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="844127024"/> </object> </object> <string key="NSFrameSize">{480, 360}</string> <reference key="NSSuperview" ref="49161063"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="353606868"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -904,10 +877,9 @@ </object> <string key="NSFrameSize">{480, 360}</string> <reference key="NSSuperview"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="289177107"/> </object> - <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> + <string key="NSScreenRect">{{0, 0}, {2560, 1578}}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string> <bool key="NSWindowIsRestorable">YES</bool> </object> @@ -1841,219 +1813,7 @@ <nil key="sourceID"/> <int key="maxID">395</int> </object> - <object class="IBClassDescriber" key="IBDocument.Classes"> - <object class="NSMutableArray" key="referencedPartialClassDescriptions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">PreviewController</string> - <string key="superclassName">NSWindowController</string> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>fCancelPreviewMovieButton</string> - <string>fCreatePreviewMovieButton</string> - <string>fEncodingControlBox</string> - <string>fGoBackwardOneFrameButton</string> - <string>fGoForwardOneFrameButton</string> - <string>fGoToBeginningButton</string> - <string>fGoToEndButton</string> - <string>fGoToStillPreviewButton</string> - <string>fInfoField</string> - <string>fMovieCreationProgressIndicator</string> - <string>fMovieInfoField</string> - <string>fMoviePlaybackControlBox</string> - <string>fMovieScrubberSlider</string> - <string>fMovieView</string> - <string>fPictureControlBox</string> - <string>fPictureSettingsToggleButton</string> - <string>fPictureSlider</string> - <string>fPictureView</string> - <string>fPictureViewArea</string> - <string>fPlayPauseButton</string> - <string>fPreviewMovieLengthPopUp</string> - <string>fPreviewMovieStatusField</string> - <string>fPreviewWindow</string> - <string>fScaleToScreenToggleButton</string> - <string>fShowPreviewMovieButton</string> - <string>fscaleInfoField</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSButton</string> - <string>NSButton</string> - <string>NSBox</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSTextField</string> - <string>NSProgressIndicator</string> - <string>NSTextField</string> - <string>NSBox</string> - <string>NSSlider</string> - <string>QTMovieView</string> - <string>NSBox</string> - <string>NSButton</string> - <string>NSSlider</string> - <string>NSImageView</string> - <string>NSBox</string> - <string>NSButton</string> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>NSWindow</string> - <string>NSButton</string> - <string>NSButton</string> - <string>NSTextField</string> - </object> - </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>fCancelPreviewMovieButton</string> - <string>fCreatePreviewMovieButton</string> - <string>fEncodingControlBox</string> - <string>fGoBackwardOneFrameButton</string> - <string>fGoForwardOneFrameButton</string> - <string>fGoToBeginningButton</string> - <string>fGoToEndButton</string> - <string>fGoToStillPreviewButton</string> - <string>fInfoField</string> - <string>fMovieCreationProgressIndicator</string> - <string>fMovieInfoField</string> - <string>fMoviePlaybackControlBox</string> - <string>fMovieScrubberSlider</string> - <string>fMovieView</string> - <string>fPictureControlBox</string> - <string>fPictureSettingsToggleButton</string> - <string>fPictureSlider</string> - <string>fPictureView</string> - <string>fPictureViewArea</string> - <string>fPlayPauseButton</string> - <string>fPreviewMovieLengthPopUp</string> - <string>fPreviewMovieStatusField</string> - <string>fPreviewWindow</string> - <string>fScaleToScreenToggleButton</string> - <string>fShowPreviewMovieButton</string> - <string>fscaleInfoField</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBToOneOutletInfo"> - <string key="name">fCancelPreviewMovieButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fCreatePreviewMovieButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fEncodingControlBox</string> - <string key="candidateClassName">NSBox</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fGoBackwardOneFrameButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fGoForwardOneFrameButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fGoToBeginningButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fGoToEndButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fGoToStillPreviewButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fInfoField</string> - <string key="candidateClassName">NSTextField</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fMovieCreationProgressIndicator</string> - <string key="candidateClassName">NSProgressIndicator</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fMovieInfoField</string> - <string key="candidateClassName">NSTextField</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fMoviePlaybackControlBox</string> - <string key="candidateClassName">NSBox</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fMovieScrubberSlider</string> - <string key="candidateClassName">NSSlider</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fMovieView</string> - <string key="candidateClassName">QTMovieView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fPictureControlBox</string> - <string key="candidateClassName">NSBox</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fPictureSettingsToggleButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fPictureSlider</string> - <string key="candidateClassName">NSSlider</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fPictureView</string> - <string key="candidateClassName">NSImageView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fPictureViewArea</string> - <string key="candidateClassName">NSBox</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fPlayPauseButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fPreviewMovieLengthPopUp</string> - <string key="candidateClassName">NSPopUpButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fPreviewMovieStatusField</string> - <string key="candidateClassName">NSTextField</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fPreviewWindow</string> - <string key="candidateClassName">NSWindow</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fScaleToScreenToggleButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fShowPreviewMovieButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fscaleInfoField</string> - <string key="candidateClassName">NSTextField</string> - </object> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">./Classes/PreviewController.h</string> - </object> - </object> - </object> - </object> + <object class="IBClassDescriber" key="IBDocument.Classes"/> <int key="IBDocument.localizationMode">0</int> <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index fdf6f0f5a..27ddfcfb2 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -7,2175 +7,1073 @@ objects = { /* Begin PBXBuildFile section */ - 0DFA5C7B0B8DD1E90020BC09 /* HandBrake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */; }; - 0DFF0C100B6BCEE800549488 /* test.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC760B4CA8F40064E04C /* test.c */; }; - 253886010BFE0A5B0064E995 /* HBOutputRedirect.h in Headers */ = {isa = PBXBuildFile; fileRef = 253885FF0BFE0A5B0064E995 /* HBOutputRedirect.h */; }; - 253886020BFE0A5B0064E995 /* HBOutputRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = 253886000BFE0A5B0064E995 /* HBOutputRedirect.m */; }; - 253886170BFE0C160064E995 /* HBOutputPanelController.h in Headers */ = {isa = PBXBuildFile; fileRef = 253886150BFE0C160064E995 /* HBOutputPanelController.h */; }; - 253886180BFE0C160064E995 /* HBOutputPanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 253886160BFE0C160064E995 /* HBOutputPanelController.m */; }; - 25DE1FB60C169A0C00F01FC8 /* HBPreferencesController.h in Headers */ = {isa = PBXBuildFile; fileRef = 25DE1FB40C169A0C00F01FC8 /* HBPreferencesController.h */; }; - 25DE1FB70C169A0C00F01FC8 /* HBPreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 25DE1FB50C169A0C00F01FC8 /* HBPreferencesController.m */; }; - 2713E6300F676510002E0A01 /* libhb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2713E50C0F675F32002E0A01 /* libhb.a */; }; - 2713E6420F676526002E0A01 /* libhb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2713E50C0F675F32002E0A01 /* libhb.a */; }; - 2728D25B0FE8419900758EC9 /* HandBrake-64.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2728D25A0FE8419900758EC9 /* HandBrake-64.icns */; }; - 274DD1E40FEF109900881E69 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 274DD1E30FEF109900881E69 /* libiconv.dylib */; }; - 274DD20B0FEF10FD00881E69 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 274DD1E30FEF109900881E69 /* libiconv.dylib */; }; - 2774BE900F66F47100B65FC6 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2774BE8F0F66F47100B65FC6 /* libbz2.dylib */; }; - 2774BE920F66F48200B65FC6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2774BE910F66F48200B65FC6 /* libz.dylib */; }; - 2774BEC70F66F61A00B65FC6 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2774BE8F0F66F47100B65FC6 /* libbz2.dylib */; }; - 2774BEC80F66F61A00B65FC6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2774BE910F66F48200B65FC6 /* libz.dylib */; }; - 278070240F5C261300699207 /* ChapterTitles.h in Headers */ = {isa = PBXBuildFile; fileRef = 593034E90BBA39A100172349 /* ChapterTitles.h */; }; - 27AC71850F5A0AF600053B83 /* fakexcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27AC71840F5A0AF600053B83 /* fakexcode.cpp */; }; - 4DD93F8F082036E8008E1322 /* Controller.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DF3C8CB052889CD00A80101 /* Controller.h */; }; - 4DD93F92082036E8008E1322 /* HBPreviewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D1FD381073D19CE00E46515 /* HBPreviewController.h */; }; - 4DD93F97082036E8008E1322 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; - 4DD93F9A082036E8008E1322 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; settings = {ATTRIBUTES = (); }; }; - 4DD93F9B082036E8008E1322 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DF3C8CC052889CD00A80101 /* Controller.m */; }; - 4DD93F9E082036E8008E1322 /* HBPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1FD382073D19CE00E46515 /* HBPreviewController.m */; }; - 4DD93FA2082036E8008E1322 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; - 4DD93FA3082036E8008E1322 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEB2024052B055F00C39CA9 /* IOKit.framework */; }; - 4DD93FA4082036E8008E1322 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */; }; - 59CBD2370BBB44DA004A3BE3 /* parsecsv.c in Sources */ = {isa = PBXBuildFile; fileRef = 59CBD2360BBB44DA004A3BE3 /* parsecsv.c */; }; - 59CBD2650BBB4D1B004A3BE3 /* ChapterTitles.m in Sources */ = {isa = PBXBuildFile; fileRef = 593034EA0BBA39A100172349 /* ChapterTitles.m */; }; - A20F47010EBB5EC2005B861B /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A20F47000EBB5EC2005B861B /* QTKit.framework */; }; - A22C85EC0D05D35000C10E36 /* HBPresets.h in Headers */ = {isa = PBXBuildFile; fileRef = A22C85EA0D05D35000C10E36 /* HBPresets.h */; }; - A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */ = {isa = PBXBuildFile; fileRef = A22C85EB0D05D35000C10E36 /* HBPresets.m */; }; - A256080C0FD06720006A4277 /* Brushed_Window.png in Resources */ = {isa = PBXBuildFile; fileRef = A256080B0FD06720006A4277 /* Brushed_Window.png */; }; - A25962E10F15077500B3BF4E /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A25962E00F15077500B3BF4E /* Quartz.framework */; }; - A273E0510C57B39A00493A45 /* Pause.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04A0C57B39A00493A45 /* Pause.tiff */; }; - A273E0520C57B39A00493A45 /* Play.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04B0C57B39A00493A45 /* Play.tiff */; }; - A273E0530C57B39A00493A45 /* Stop.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04C0C57B39A00493A45 /* Stop.tiff */; }; - A27BB4EA0EFAB9310027CDF9 /* PicturePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = A27BB4E80EFAB9310027CDF9 /* PicturePreview.xib */; }; - A29E05800BE1283E000533F5 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A29E057F0BE1283E000533F5 /* Growl.framework */; }; - A29E058B0BE12889000533F5 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A29E057F0BE1283E000533F5 /* Growl.framework */; }; - A2A1EC310C76C35E00827E0D /* HBDVDDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */; }; - A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A1EC390C76C58400827E0D /* HBDVDDetector.m */; }; - A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */; }; - A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */; }; - A2D0A0AB0D3E5929002D57CB /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; }; - A2D0A0BF0D3E596F002D57CB /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; }; - A2D18AA70FD81C50003C997B /* HBSubtitles.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D18AA50FD81C50003C997B /* HBSubtitles.h */; }; - A2D18AA80FD81C50003C997B /* HBSubtitles.m in Sources */ = {isa = PBXBuildFile; fileRef = A2D18AA60FD81C50003C997B /* HBSubtitles.m */; }; - A2D7AD670C998AD30082CA33 /* ActivityWindow.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */; }; - A2D7AD680C998AD30082CA33 /* AddToQueue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */; }; - A2D7AD690C998AD30082CA33 /* Drawer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD600C998AD30082CA33 /* Drawer.tiff */; }; - A2D7AD6B0C998AD30082CA33 /* pref-audio.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD620C998AD30082CA33 /* pref-audio.tiff */; }; - A2D7AD6D0C998AD30082CA33 /* pref-picture.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD640C998AD30082CA33 /* pref-picture.tiff */; }; - A2D7AD6E0C998AD30082CA33 /* Queue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD650C998AD30082CA33 /* Queue.tiff */; }; - A2D7AD6F0C998AD30082CA33 /* Source.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD660C998AD30082CA33 /* Source.tiff */; }; - A906A0510F7A7B210007A827 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A906A0500F7A7B210007A827 /* AudioToolbox.framework */; }; - A906A0520F7A7B210007A827 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A906A0500F7A7B210007A827 /* AudioToolbox.framework */; }; - A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */; }; - A9AC41E00C918DB500DDF9B8 /* HBAdvancedController.h in Headers */ = {isa = PBXBuildFile; fileRef = A9AC41DE0C918DB500DDF9B8 /* HBAdvancedController.h */; }; - D234BCBD1240E82800BE2E98 /* HBAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = D234BCB91240E82800BE2E98 /* HBAudio.h */; }; - D234BCBE1240E82800BE2E98 /* HBAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = D234BCBA1240E82800BE2E98 /* HBAudio.m */; }; - D234BCBF1240E82800BE2E98 /* HBAudioController.h in Headers */ = {isa = PBXBuildFile; fileRef = D234BCBB1240E82800BE2E98 /* HBAudioController.h */; }; - D234BCC01240E82800BE2E98 /* HBAudioController.m in Sources */ = {isa = PBXBuildFile; fileRef = D234BCBC1240E82800BE2E98 /* HBAudioController.m */; }; - D289A9F30DBBE7AC00CE614B /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D289A9F20DBBE7AC00CE614B /* CoreServices.framework */; }; - D289AAC40DBBF3F100CE614B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEB2024052B055F00C39CA9 /* IOKit.framework */; }; - E3003C7F0C88505D0072F2A8 /* DeleteHighlightPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = E3003C7E0C88505D0072F2A8 /* DeleteHighlightPressed.png */; }; - E3003CB50C8852B70072F2A8 /* DeletePressed.png in Resources */ = {isa = PBXBuildFile; fileRef = E3003CB40C8852B70072F2A8 /* DeletePressed.png */; }; - E37167890C92F6180072B384 /* JobPassSecondSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = E37167830C92F6180072B384 /* JobPassSecondSmall.png */; }; - E371678A0C92F6180072B384 /* JobPassSubtitleSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = E37167840C92F6180072B384 /* JobPassSubtitleSmall.png */; }; - E371678B0C92F6180072B384 /* JobPassFirstSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = E37167850C92F6180072B384 /* JobPassFirstSmall.png */; }; - E37167A90C92FAA50072B384 /* JobPassUnknownSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = E37167A70C92FAA50072B384 /* JobPassUnknownSmall.png */; }; - E37172670C977D340072B384 /* HBImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E37172650C977D340072B384 /* HBImageAndTextCell.m */; }; - E37172680C977D340072B384 /* HBImageAndTextCell.h in Headers */ = {isa = PBXBuildFile; fileRef = E37172660C977D340072B384 /* HBImageAndTextCell.h */; }; - E37C89410C83988F00C1B919 /* DeleteHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = E37C893D0C83988F00C1B919 /* DeleteHighlight.png */; }; - E37C89420C83988F00C1B919 /* Delete.png in Resources */ = {isa = PBXBuildFile; fileRef = E37C893E0C83988F00C1B919 /* Delete.png */; }; - E37C89430C83988F00C1B919 /* JobSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = E37C893F0C83988F00C1B919 /* JobSmall.png */; }; - E37C89440C83988F00C1B919 /* JobLarge.png in Resources */ = {isa = PBXBuildFile; fileRef = E37C89400C83988F00C1B919 /* JobLarge.png */; }; - E37C89470C83989F00C1B919 /* HBQueueController.mm in Sources */ = {isa = PBXBuildFile; fileRef = E37C89450C83989F00C1B919 /* HBQueueController.mm */; }; - E37C89480C83989F00C1B919 /* HBQueueController.h in Headers */ = {isa = PBXBuildFile; fileRef = E37C89460C83989F00C1B919 /* HBQueueController.h */; }; - E3997A2C0CAB58BC00287239 /* EncodeWorking3.png in Resources */ = {isa = PBXBuildFile; fileRef = E3997A260CAB58BC00287239 /* EncodeWorking3.png */; }; - E3997A2D0CAB58BC00287239 /* EncodeWorking4.png in Resources */ = {isa = PBXBuildFile; fileRef = E3997A270CAB58BC00287239 /* EncodeWorking4.png */; }; - E3997A2E0CAB58BC00287239 /* EncodeWorking1.png in Resources */ = {isa = PBXBuildFile; fileRef = E3997A280CAB58BC00287239 /* EncodeWorking1.png */; }; - E3997A2F0CAB58BC00287239 /* EncodeWorking0.png in Resources */ = {isa = PBXBuildFile; fileRef = E3997A290CAB58BC00287239 /* EncodeWorking0.png */; }; - E3997A300CAB58BC00287239 /* EncodeWorking2.png in Resources */ = {isa = PBXBuildFile; fileRef = E3997A2A0CAB58BC00287239 /* EncodeWorking2.png */; }; - E3997A310CAB58BC00287239 /* EncodeWorking5.png in Resources */ = {isa = PBXBuildFile; fileRef = E3997A2B0CAB58BC00287239 /* EncodeWorking5.png */; }; - E39AA4E60D32DC0B0007A415 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E39AA4DA0D32DC0B0007A415 /* MainMenu.xib */; }; - E39AA4E70D32DC0B0007A415 /* Queue.xib in Resources */ = {isa = PBXBuildFile; fileRef = E39AA4DC0D32DC0B0007A415 /* Queue.xib */; }; - E39AA4E80D32DC0B0007A415 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = E39AA4DE0D32DC0B0007A415 /* Preferences.xib */; }; - E39AA4E90D32DC0B0007A415 /* PictureSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = E39AA4E00D32DC0B0007A415 /* PictureSettings.xib */; }; - E39AA4EA0D32DC0B0007A415 /* AdvancedView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E39AA4E20D32DC0B0007A415 /* AdvancedView.xib */; }; - E39AA4EB0D32DC0B0007A415 /* OutputPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = E39AA4E40D32DC0B0007A415 /* OutputPanel.xib */; }; - E3C844F60CA6B3F90013B683 /* RevealPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = E3C844F20CA6B3F90013B683 /* RevealPressed.png */; }; - E3C844F70CA6B3F90013B683 /* RevealHighlightPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = E3C844F30CA6B3F90013B683 /* RevealHighlightPressed.png */; }; - E3C844F80CA6B3F90013B683 /* RevealHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = E3C844F40CA6B3F90013B683 /* RevealHighlight.png */; }; - E3C844F90CA6B3F90013B683 /* Reveal.png in Resources */ = {isa = PBXBuildFile; fileRef = E3C844F50CA6B3F90013B683 /* Reveal.png */; }; - E3C845870CA6E9080013B683 /* EncodeComplete.png in Resources */ = {isa = PBXBuildFile; fileRef = E3C845860CA6E9080013B683 /* EncodeComplete.png */; }; - E3FC10910D1611EC00470E7B /* EncodeCanceled.png in Resources */ = {isa = PBXBuildFile; fileRef = E3FC10900D1611EC00470E7B /* EncodeCanceled.png */; }; + 273F202314ADB8650021BE6D /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202214ADB8650021BE6D /* IOKit.framework */; }; + 273F202614ADB8A40021BE6D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202514ADB8A40021BE6D /* libz.dylib */; }; + 273F202814ADB8BE0021BE6D /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202714ADB8BE0021BE6D /* libbz2.dylib */; }; + 273F202A14ADB8D60021BE6D /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202914ADB8D60021BE6D /* libiconv.dylib */; }; + 273F203014ADB9790021BE6D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202F14ADB9790021BE6D /* AudioToolbox.framework */; }; + 273F203314ADB9F00021BE6D /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F203214ADB9F00021BE6D /* CoreServices.framework */; }; + 273F203C14ADBC210021BE6D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F203B14ADBC210021BE6D /* Cocoa.framework */; }; + 273F208914ADBE3B0021BE6D /* fakexcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 273F208514ADBE3B0021BE6D /* fakexcode.cpp */; }; + 273F208A14ADBE3B0021BE6D /* parsecsv.c in Sources */ = {isa = PBXBuildFile; fileRef = 273F208614ADBE3B0021BE6D /* parsecsv.c */; }; + 273F208B14ADBE3B0021BE6D /* test.c in Sources */ = {isa = PBXBuildFile; fileRef = 273F208814ADBE3B0021BE6D /* test.c */; }; + 273F20AB14ADBE670021BE6D /* ChapterTitles.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F208D14ADBE670021BE6D /* ChapterTitles.m */; }; + 273F20AC14ADBE670021BE6D /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F208F14ADBE670021BE6D /* Controller.m */; }; + 273F20AD14ADBE670021BE6D /* HBAdvancedController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209014ADBE670021BE6D /* HBAdvancedController.m */; }; + 273F20AE14ADBE670021BE6D /* HBAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209214ADBE670021BE6D /* HBAudio.m */; }; + 273F20AF14ADBE670021BE6D /* HBAudioController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209414ADBE670021BE6D /* HBAudioController.m */; }; + 273F20B114ADBE670021BE6D /* HBDVDDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209814ADBE670021BE6D /* HBDVDDetector.m */; }; + 273F20B214ADBE670021BE6D /* HBImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209A14ADBE670021BE6D /* HBImageAndTextCell.m */; }; + 273F20B314ADBE670021BE6D /* HBOutputPanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209C14ADBE670021BE6D /* HBOutputPanelController.m */; }; + 273F20B414ADBE670021BE6D /* HBOutputRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209E14ADBE670021BE6D /* HBOutputRedirect.m */; }; + 273F20B514ADBE670021BE6D /* HBPreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A014ADBE670021BE6D /* HBPreferencesController.m */; }; + 273F20B614ADBE670021BE6D /* HBPresets.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A214ADBE670021BE6D /* HBPresets.m */; }; + 273F20B714ADBE670021BE6D /* HBPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A414ADBE670021BE6D /* HBPreviewController.m */; }; + 273F20B814ADBE670021BE6D /* HBQueueController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A614ADBE670021BE6D /* HBQueueController.mm */; }; + 273F20B914ADBE670021BE6D /* HBSubtitles.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A814ADBE670021BE6D /* HBSubtitles.m */; }; + 273F20BA14ADBE670021BE6D /* PictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20AA14ADBE670021BE6D /* PictureController.m */; }; + 273F20BE14ADC09F0021BE6D /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 273F20BD14ADC09F0021BE6D /* main.mm */; }; + 273F20C314ADC4AE0021BE6D /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202914ADB8D60021BE6D /* libiconv.dylib */; }; + 273F20C414ADC4B60021BE6D /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202714ADB8BE0021BE6D /* libbz2.dylib */; }; + 273F20C514ADC4BD0021BE6D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202514ADB8A40021BE6D /* libz.dylib */; }; + 273F20C614ADC4F50021BE6D /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202214ADB8650021BE6D /* IOKit.framework */; }; + 273F20C814ADC4FF0021BE6D /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F20C714ADC4FF0021BE6D /* QTKit.framework */; }; + 273F20C914ADC5150021BE6D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202F14ADB9790021BE6D /* AudioToolbox.framework */; }; + 273F20CB14ADC89A0021BE6D /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 273F20BF14ADC1250021BE6D /* Growl.framework */; }; + 273F20CC14ADC8A10021BE6D /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 273F20C014ADC1250021BE6D /* Sparkle.framework */; }; + 273F214614ADCBF80021BE6D /* HandBrake-64.icns in Resources */ = {isa = PBXBuildFile; fileRef = 273F211E14ADCBF70021BE6D /* HandBrake-64.icns */; }; + 273F214714ADCBF80021BE6D /* HandBrake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 273F211F14ADCBF70021BE6D /* HandBrake.icns */; }; + 273F214814ADCBF80021BE6D /* ActivityWindow.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F212114ADCBF70021BE6D /* ActivityWindow.tiff */; }; + 273F214914ADCBF80021BE6D /* AddToQueue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F212214ADCBF70021BE6D /* AddToQueue.tiff */; }; + 273F214B14ADCBF80021BE6D /* Brushed_Window.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212414ADCBF70021BE6D /* Brushed_Window.png */; }; + 273F214C14ADCBF80021BE6D /* Delete.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212514ADCBF70021BE6D /* Delete.png */; }; + 273F214D14ADCBF80021BE6D /* DeleteHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212614ADCBF70021BE6D /* DeleteHighlight.png */; }; + 273F214E14ADCBF80021BE6D /* DeleteHighlightPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212714ADCBF70021BE6D /* DeleteHighlightPressed.png */; }; + 273F214F14ADCBF80021BE6D /* DeletePressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212814ADCBF70021BE6D /* DeletePressed.png */; }; + 273F215014ADCBF80021BE6D /* Drawer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F212914ADCBF80021BE6D /* Drawer.tiff */; }; + 273F215114ADCBF80021BE6D /* EncodeCanceled.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212A14ADCBF80021BE6D /* EncodeCanceled.png */; }; + 273F215214ADCBF80021BE6D /* EncodeComplete.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212B14ADCBF80021BE6D /* EncodeComplete.png */; }; + 273F215314ADCBF80021BE6D /* EncodeWorking0.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212C14ADCBF80021BE6D /* EncodeWorking0.png */; }; + 273F215414ADCBF80021BE6D /* EncodeWorking1.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212D14ADCBF80021BE6D /* EncodeWorking1.png */; }; + 273F215514ADCBF80021BE6D /* EncodeWorking2.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212E14ADCBF80021BE6D /* EncodeWorking2.png */; }; + 273F215614ADCBF80021BE6D /* EncodeWorking3.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F212F14ADCBF80021BE6D /* EncodeWorking3.png */; }; + 273F215714ADCBF80021BE6D /* EncodeWorking4.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213014ADCBF80021BE6D /* EncodeWorking4.png */; }; + 273F215814ADCBF80021BE6D /* EncodeWorking5.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213114ADCBF80021BE6D /* EncodeWorking5.png */; }; + 273F215A14ADCBF80021BE6D /* JobLarge.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213314ADCBF80021BE6D /* JobLarge.png */; }; + 273F215B14ADCBF80021BE6D /* JobPassFirstSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213414ADCBF80021BE6D /* JobPassFirstSmall.png */; }; + 273F215D14ADCBF80021BE6D /* JobPassSecondSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213614ADCBF80021BE6D /* JobPassSecondSmall.png */; }; + 273F215F14ADCBF80021BE6D /* JobPassSubtitleSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213814ADCBF80021BE6D /* JobPassSubtitleSmall.png */; }; + 273F216014ADCBF80021BE6D /* JobPassUnknownSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213914ADCBF80021BE6D /* JobPassUnknownSmall.png */; }; + 273F216114ADCBF80021BE6D /* JobSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F213A14ADCBF80021BE6D /* JobSmall.png */; }; + 273F216214ADCBF80021BE6D /* Pause.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F213B14ADCBF80021BE6D /* Pause.tiff */; }; + 273F216314ADCBF80021BE6D /* Play.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F213C14ADCBF80021BE6D /* Play.tiff */; }; + 273F216414ADCBF80021BE6D /* pref-audio.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F213D14ADCBF80021BE6D /* pref-audio.tiff */; }; + 273F216514ADCBF80021BE6D /* pref-picture.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F213E14ADCBF80021BE6D /* pref-picture.tiff */; }; + 273F216614ADCBF80021BE6D /* Queue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F213F14ADCBF80021BE6D /* Queue.tiff */; }; + 273F216714ADCBF80021BE6D /* Reveal.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F214014ADCBF80021BE6D /* Reveal.png */; }; + 273F216814ADCBF80021BE6D /* RevealHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F214114ADCBF80021BE6D /* RevealHighlight.png */; }; + 273F216914ADCBF80021BE6D /* RevealHighlightPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F214214ADCBF80021BE6D /* RevealHighlightPressed.png */; }; + 273F216A14ADCBF80021BE6D /* RevealPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 273F214314ADCBF80021BE6D /* RevealPressed.png */; }; + 273F216B14ADCBF80021BE6D /* Source.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F214414ADCBF80021BE6D /* Source.tiff */; }; + 273F216C14ADCBF80021BE6D /* Stop.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 273F214514ADCBF80021BE6D /* Stop.tiff */; }; + 273F218A14ADDDA10021BE6D /* AdvancedView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F217A14ADDDA10021BE6D /* AdvancedView.xib */; }; + 273F218B14ADDDA10021BE6D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 273F217C14ADDDA10021BE6D /* InfoPlist.strings */; }; + 273F218C14ADDDA10021BE6D /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F217E14ADDDA10021BE6D /* MainMenu.xib */; }; + 273F218D14ADDDA10021BE6D /* OutputPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F218014ADDDA10021BE6D /* OutputPanel.xib */; }; + 273F218E14ADDDA10021BE6D /* PicturePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F218214ADDDA10021BE6D /* PicturePreview.xib */; }; + 273F218F14ADDDA10021BE6D /* PictureSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F218414ADDDA10021BE6D /* PictureSettings.xib */; }; + 273F219014ADDDA10021BE6D /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F218614ADDDA10021BE6D /* Preferences.xib */; }; + 273F219114ADDDA10021BE6D /* Queue.xib in Resources */ = {isa = PBXBuildFile; fileRef = 273F218814ADDDA10021BE6D /* Queue.xib */; }; + 273F21C114ADE7A20021BE6D /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F20BF14ADC1250021BE6D /* Growl.framework */; }; + 273F21C214ADE7BC0021BE6D /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F20C014ADC1250021BE6D /* Sparkle.framework */; }; + 27D6C72514B1019100B785E4 /* libhb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhb.a */; }; + 27D6C72614B1019100B785E4 /* libhb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhb.a */; }; + 27D6C74114B102DA00B785E4 /* liba52.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72714B102DA00B785E4 /* liba52.a */; }; + 27D6C74214B102DA00B785E4 /* liba52.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72714B102DA00B785E4 /* liba52.a */; }; + 27D6C74314B102DA00B785E4 /* libass.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72814B102DA00B785E4 /* libass.a */; }; + 27D6C74414B102DA00B785E4 /* libass.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72814B102DA00B785E4 /* libass.a */; }; + 27D6C74514B102DA00B785E4 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72914B102DA00B785E4 /* libavcodec.a */; }; + 27D6C74614B102DA00B785E4 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72914B102DA00B785E4 /* libavcodec.a */; }; + 27D6C74714B102DA00B785E4 /* libavformat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72A14B102DA00B785E4 /* libavformat.a */; }; + 27D6C74814B102DA00B785E4 /* libavformat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72A14B102DA00B785E4 /* libavformat.a */; }; + 27D6C74914B102DA00B785E4 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72B14B102DA00B785E4 /* libavutil.a */; }; + 27D6C74A14B102DA00B785E4 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72B14B102DA00B785E4 /* libavutil.a */; }; + 27D6C74B14B102DA00B785E4 /* libbluray.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72C14B102DA00B785E4 /* libbluray.a */; }; + 27D6C74C14B102DA00B785E4 /* libbluray.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72C14B102DA00B785E4 /* libbluray.a */; }; + 27D6C74D14B102DA00B785E4 /* libdca.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72D14B102DA00B785E4 /* libdca.a */; }; + 27D6C74E14B102DA00B785E4 /* libdca.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72D14B102DA00B785E4 /* libdca.a */; }; + 27D6C74F14B102DA00B785E4 /* libdvdnav.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72E14B102DA00B785E4 /* libdvdnav.a */; }; + 27D6C75014B102DA00B785E4 /* libdvdnav.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72E14B102DA00B785E4 /* libdvdnav.a */; }; + 27D6C75114B102DA00B785E4 /* libdvdread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72F14B102DA00B785E4 /* libdvdread.a */; }; + 27D6C75214B102DA00B785E4 /* libdvdread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72F14B102DA00B785E4 /* libdvdread.a */; }; + 27D6C75314B102DA00B785E4 /* libfaac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73014B102DA00B785E4 /* libfaac.a */; }; + 27D6C75414B102DA00B785E4 /* libfaac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73014B102DA00B785E4 /* libfaac.a */; }; + 27D6C75514B102DA00B785E4 /* libfontconfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73114B102DA00B785E4 /* libfontconfig.a */; }; + 27D6C75614B102DA00B785E4 /* libfontconfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73114B102DA00B785E4 /* libfontconfig.a */; }; + 27D6C75714B102DA00B785E4 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73214B102DA00B785E4 /* libfreetype.a */; }; + 27D6C75814B102DA00B785E4 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73214B102DA00B785E4 /* libfreetype.a */; }; + 27D6C75914B102DA00B785E4 /* libfribidi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73314B102DA00B785E4 /* libfribidi.a */; }; + 27D6C75A14B102DA00B785E4 /* libfribidi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73314B102DA00B785E4 /* libfribidi.a */; }; + 27D6C75B14B102DA00B785E4 /* libmkv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73414B102DA00B785E4 /* libmkv.a */; }; + 27D6C75C14B102DA00B785E4 /* libmkv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73414B102DA00B785E4 /* libmkv.a */; }; + 27D6C75E14B102DA00B785E4 /* libmp3lame.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73614B102DA00B785E4 /* libmp3lame.a */; }; + 27D6C75F14B102DA00B785E4 /* libmp3lame.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73614B102DA00B785E4 /* libmp3lame.a */; }; + 27D6C76014B102DA00B785E4 /* libmp4v2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73714B102DA00B785E4 /* libmp4v2.a */; }; + 27D6C76114B102DA00B785E4 /* libmp4v2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73714B102DA00B785E4 /* libmp4v2.a */; }; + 27D6C76214B102DA00B785E4 /* libmpeg2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73814B102DA00B785E4 /* libmpeg2.a */; }; + 27D6C76314B102DA00B785E4 /* libmpeg2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73814B102DA00B785E4 /* libmpeg2.a */; }; + 27D6C76414B102DA00B785E4 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73914B102DA00B785E4 /* libogg.a */; }; + 27D6C76514B102DA00B785E4 /* libogg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73914B102DA00B785E4 /* libogg.a */; }; + 27D6C76614B102DA00B785E4 /* libsamplerate.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73A14B102DA00B785E4 /* libsamplerate.a */; }; + 27D6C76714B102DA00B785E4 /* libsamplerate.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73A14B102DA00B785E4 /* libsamplerate.a */; }; + 27D6C76814B102DA00B785E4 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73B14B102DA00B785E4 /* libswscale.a */; }; + 27D6C76914B102DA00B785E4 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73B14B102DA00B785E4 /* libswscale.a */; }; + 27D6C76A14B102DA00B785E4 /* libtheora.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73C14B102DA00B785E4 /* libtheora.a */; }; + 27D6C76B14B102DA00B785E4 /* libtheora.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73C14B102DA00B785E4 /* libtheora.a */; }; + 27D6C76C14B102DA00B785E4 /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73D14B102DA00B785E4 /* libvorbis.a */; }; + 27D6C76D14B102DA00B785E4 /* libvorbis.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73D14B102DA00B785E4 /* libvorbis.a */; }; + 27D6C76E14B102DA00B785E4 /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73E14B102DA00B785E4 /* libvorbisenc.a */; }; + 27D6C76F14B102DA00B785E4 /* libvorbisenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73E14B102DA00B785E4 /* libvorbisenc.a */; }; + 27D6C77014B102DA00B785E4 /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73F14B102DA00B785E4 /* libx264.a */; }; + 27D6C77114B102DA00B785E4 /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73F14B102DA00B785E4 /* libx264.a */; }; + 27D6C77214B102DA00B785E4 /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C74014B102DA00B785E4 /* libxml2.a */; }; + 27D6C77314B102DA00B785E4 /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C74014B102DA00B785E4 /* libxml2.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 277C2E530F5DFF400067D708 /* PBXContainerItemProxy */ = { + 273F217614ADD2580021BE6D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + containerPortal = 273F1FE014AD9DA40021BE6D /* Project object */; proxyType = 1; - remoteGlobalIDString = 27F143770F5DF34F00A684FF; + remoteGlobalIDString = 273F216E14ADD2170021BE6D; remoteInfo = external; }; - 277C2E550F5DFF450067D708 /* PBXContainerItemProxy */ = { + 2781697014B02B1B00A28B61 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + containerPortal = 273F1FE014AD9DA40021BE6D /* Project object */; proxyType = 1; - remoteGlobalIDString = 27F143770F5DF34F00A684FF; + remoteGlobalIDString = 273F216E14ADD2170021BE6D; remoteInfo = external; }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - A29E05840BE12861000533F5 /* CopyFiles */ = { + 273F1FFD14ADAE950021BE6D /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; + files = ( + ); + runOnlyForDeploymentPostprocessing = 1; + }; + 273F20CA14ADC86C0021BE6D /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - A29E058B0BE12889000533F5 /* Growl.framework in CopyFiles */, - A2D0A0BF0D3E596F002D57CB /* Sparkle.framework in CopyFiles */, + 273F20CB14ADC89A0021BE6D /* Growl.framework in CopyFiles */, + 273F20CC14ADC8A10021BE6D /* Sparkle.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; - 0D6E35760B6BD4F0005AABB3 /* HandBrake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HandBrake.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = "<group>"; }; - 0DFF0C0A0B6BCEC200549488 /* HandBrakeCLI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = HandBrakeCLI; sourceTree = BUILT_PRODUCTS_DIR; }; - 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; - 253885FF0BFE0A5B0064E995 /* HBOutputRedirect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBOutputRedirect.h; sourceTree = "<group>"; }; - 253886000BFE0A5B0064E995 /* HBOutputRedirect.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBOutputRedirect.m; sourceTree = "<group>"; }; - 253886150BFE0C160064E995 /* HBOutputPanelController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBOutputPanelController.h; sourceTree = "<group>"; }; - 253886160BFE0C160064E995 /* HBOutputPanelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBOutputPanelController.m; sourceTree = "<group>"; }; - 25DE1FB40C169A0C00F01FC8 /* HBPreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPreferencesController.h; sourceTree = "<group>"; }; - 25DE1FB50C169A0C00F01FC8 /* HBPreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreferencesController.m; sourceTree = "<group>"; }; - 2713E50C0F675F32002E0A01 /* libhb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhb.a; path = libhb/libhb.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 2728D25A0FE8419900758EC9 /* HandBrake-64.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "HandBrake-64.icns"; sourceTree = "<group>"; }; - 274DD1E30FEF109900881E69 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = /usr/lib/libiconv.dylib; sourceTree = "<absolute>"; }; - 2774BE8F0F66F47100B65FC6 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; }; - 2774BE910F66F48200B65FC6 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; - 27AC71840F5A0AF600053B83 /* fakexcode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fakexcode.cpp; path = ../test/fakexcode.cpp; sourceTree = SOURCE_ROOT; }; - 29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; }; - 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; }; - 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; }; - 4D1FD381073D19CE00E46515 /* HBPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBPreviewController.h; sourceTree = "<group>"; }; - 4D1FD382073D19CE00E46515 /* HBPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBPreviewController.m; sourceTree = "<group>"; }; - 4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; - 4DEB2024052B055F00C39CA9 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; }; - 4DF3C8CB052889CD00A80101 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; }; - 4DF3C8CC052889CD00A80101 /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; }; - 526FBC760B4CA8F40064E04C /* test.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = test.c; path = ../test/test.c; sourceTree = SOURCE_ROOT; }; - 593034E90BBA39A100172349 /* ChapterTitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChapterTitles.h; sourceTree = "<group>"; }; - 593034EA0BBA39A100172349 /* ChapterTitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChapterTitles.m; sourceTree = "<group>"; }; - 59CBD2360BBB44DA004A3BE3 /* parsecsv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = parsecsv.c; path = ../test/parsecsv.c; sourceTree = SOURCE_ROOT; }; - A20F46DB0EBB5E7A005B861B /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; }; - A20F47000EBB5EC2005B861B /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = "<absolute>"; }; - A22C85EA0D05D35000C10E36 /* HBPresets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPresets.h; sourceTree = "<group>"; }; - A22C85EB0D05D35000C10E36 /* HBPresets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPresets.m; sourceTree = "<group>"; }; - A256080B0FD06720006A4277 /* Brushed_Window.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Brushed_Window.png; path = icons/Brushed_Window.png; sourceTree = "<group>"; }; - A25962E00F15077500B3BF4E /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = "<absolute>"; }; - A273E04A0C57B39A00493A45 /* Pause.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Pause.tiff; sourceTree = "<group>"; }; - A273E04B0C57B39A00493A45 /* Play.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Play.tiff; sourceTree = "<group>"; }; - A273E04C0C57B39A00493A45 /* Stop.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Stop.tiff; sourceTree = "<group>"; }; - A27BB4E90EFAB9310027CDF9 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PicturePreview.xib; sourceTree = "<group>"; }; - A29E057F0BE1283E000533F5 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Growl.framework; sourceTree = "<group>"; }; - A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBDVDDetector.h; sourceTree = "<group>"; }; - A2A1EC390C76C58400827E0D /* HBDVDDetector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBDVDDetector.m; sourceTree = "<group>"; }; - A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; }; - A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureController.m; sourceTree = "<group>"; }; - A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; }; - A2D18AA50FD81C50003C997B /* HBSubtitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitles.h; sourceTree = "<group>"; }; - A2D18AA60FD81C50003C997B /* HBSubtitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitles.m; sourceTree = "<group>"; }; - A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = ActivityWindow.tiff; sourceTree = "<group>"; }; - A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = AddToQueue.tiff; sourceTree = "<group>"; }; - A2D7AD600C998AD30082CA33 /* Drawer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Drawer.tiff; sourceTree = "<group>"; }; - A2D7AD620C998AD30082CA33 /* pref-audio.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "pref-audio.tiff"; sourceTree = "<group>"; }; - A2D7AD640C998AD30082CA33 /* pref-picture.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "pref-picture.tiff"; sourceTree = "<group>"; }; - A2D7AD650C998AD30082CA33 /* Queue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Queue.tiff; sourceTree = "<group>"; }; - A2D7AD660C998AD30082CA33 /* Source.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Source.tiff; sourceTree = "<group>"; }; - A906A0500F7A7B210007A827 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = "<absolute>"; }; - A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBAdvancedController.m; sourceTree = "<group>"; }; - A9AC41DE0C918DB500DDF9B8 /* HBAdvancedController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBAdvancedController.h; sourceTree = "<group>"; }; - D234BCB91240E82800BE2E98 /* HBAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudio.h; sourceTree = "<group>"; }; - D234BCBA1240E82800BE2E98 /* HBAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudio.m; sourceTree = "<group>"; }; - D234BCBB1240E82800BE2E98 /* HBAudioController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioController.h; sourceTree = "<group>"; }; - D234BCBC1240E82800BE2E98 /* HBAudioController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioController.m; sourceTree = "<group>"; }; - D289A9F20DBBE7AC00CE614B /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; }; - E3003C7E0C88505D0072F2A8 /* DeleteHighlightPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeleteHighlightPressed.png; sourceTree = "<group>"; }; - E3003CB40C8852B70072F2A8 /* DeletePressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeletePressed.png; sourceTree = "<group>"; }; - E37167830C92F6180072B384 /* JobPassSecondSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSecondSmall.png; sourceTree = "<group>"; }; - E37167840C92F6180072B384 /* JobPassSubtitleSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSubtitleSmall.png; sourceTree = "<group>"; }; - E37167850C92F6180072B384 /* JobPassFirstSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassFirstSmall.png; sourceTree = "<group>"; }; - E37167A70C92FAA50072B384 /* JobPassUnknownSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassUnknownSmall.png; sourceTree = "<group>"; }; - E37172650C977D340072B384 /* HBImageAndTextCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBImageAndTextCell.m; sourceTree = "<group>"; }; - E37172660C977D340072B384 /* HBImageAndTextCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBImageAndTextCell.h; sourceTree = "<group>"; }; - E37C893D0C83988F00C1B919 /* DeleteHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeleteHighlight.png; sourceTree = "<group>"; }; - E37C893E0C83988F00C1B919 /* Delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Delete.png; sourceTree = "<group>"; }; - E37C893F0C83988F00C1B919 /* JobSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobSmall.png; sourceTree = "<group>"; }; - E37C89400C83988F00C1B919 /* JobLarge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobLarge.png; sourceTree = "<group>"; }; - E37C89450C83989F00C1B919 /* HBQueueController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = HBQueueController.mm; sourceTree = "<group>"; }; - E37C89460C83989F00C1B919 /* HBQueueController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBQueueController.h; sourceTree = "<group>"; }; - E3997A260CAB58BC00287239 /* EncodeWorking3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking3.png; sourceTree = "<group>"; }; - E3997A270CAB58BC00287239 /* EncodeWorking4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking4.png; sourceTree = "<group>"; }; - E3997A280CAB58BC00287239 /* EncodeWorking1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking1.png; sourceTree = "<group>"; }; - E3997A290CAB58BC00287239 /* EncodeWorking0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking0.png; sourceTree = "<group>"; }; - E3997A2A0CAB58BC00287239 /* EncodeWorking2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking2.png; sourceTree = "<group>"; }; - E3997A2B0CAB58BC00287239 /* EncodeWorking5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking5.png; sourceTree = "<group>"; }; - E39AA4DB0D32DC0B0007A415 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; }; - E39AA4DD0D32DC0B0007A415 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Queue.xib; sourceTree = "<group>"; }; - E39AA4DF0D32DC0B0007A415 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preferences.xib; sourceTree = "<group>"; }; - E39AA4E10D32DC0B0007A415 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PictureSettings.xib; sourceTree = "<group>"; }; - E39AA4E30D32DC0B0007A415 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/AdvancedView.xib; sourceTree = "<group>"; }; - E39AA4E50D32DC0B0007A415 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/OutputPanel.xib; sourceTree = "<group>"; }; - E3C844F20CA6B3F90013B683 /* RevealPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealPressed.png; sourceTree = "<group>"; }; - E3C844F30CA6B3F90013B683 /* RevealHighlightPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealHighlightPressed.png; sourceTree = "<group>"; }; - E3C844F40CA6B3F90013B683 /* RevealHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealHighlight.png; sourceTree = "<group>"; }; - E3C844F50CA6B3F90013B683 /* Reveal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Reveal.png; sourceTree = "<group>"; }; - E3C845860CA6E9080013B683 /* EncodeComplete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeComplete.png; sourceTree = "<group>"; }; - E3FC10900D1611EC00470E7B /* EncodeCanceled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeCanceled.png; sourceTree = "<group>"; }; + 271BA4C014B119F800BC1D2C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = external/macosx/Info.plist; sourceTree = BUILT_PRODUCTS_DIR; }; + 273F1FFF14ADAE950021BE6D /* HandBrakeCLI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = HandBrakeCLI; sourceTree = BUILT_PRODUCTS_DIR; }; + 273F202214ADB8650021BE6D /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + 273F202514ADB8A40021BE6D /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + 273F202714ADB8BE0021BE6D /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; }; + 273F202914ADB8D60021BE6D /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; }; + 273F202F14ADB9790021BE6D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + 273F203214ADB9F00021BE6D /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; + 273F203914ADBC210021BE6D /* HandBrake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HandBrake.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 273F203B14ADBC210021BE6D /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; + 273F203E14ADBC210021BE6D /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; + 273F203F14ADBC210021BE6D /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; + 273F204014ADBC210021BE6D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 273F208514ADBE3B0021BE6D /* fakexcode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fakexcode.cpp; sourceTree = "<group>"; }; + 273F208614ADBE3B0021BE6D /* parsecsv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parsecsv.c; sourceTree = "<group>"; }; + 273F208714ADBE3B0021BE6D /* parsecsv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parsecsv.h; sourceTree = "<group>"; }; + 273F208814ADBE3B0021BE6D /* test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = test.c; sourceTree = "<group>"; }; + 273F208C14ADBE670021BE6D /* ChapterTitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChapterTitles.h; sourceTree = "<group>"; }; + 273F208D14ADBE670021BE6D /* ChapterTitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChapterTitles.m; sourceTree = "<group>"; }; + 273F208E14ADBE670021BE6D /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; }; + 273F208F14ADBE670021BE6D /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; }; + 273F209014ADBE670021BE6D /* HBAdvancedController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAdvancedController.m; sourceTree = "<group>"; }; + 273F209114ADBE670021BE6D /* HBAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudio.h; sourceTree = "<group>"; }; + 273F209214ADBE670021BE6D /* HBAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudio.m; sourceTree = "<group>"; }; + 273F209314ADBE670021BE6D /* HBAudioController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioController.h; sourceTree = "<group>"; }; + 273F209414ADBE670021BE6D /* HBAudioController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioController.m; sourceTree = "<group>"; }; + 273F209714ADBE670021BE6D /* HBDVDDetector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBDVDDetector.h; sourceTree = "<group>"; }; + 273F209814ADBE670021BE6D /* HBDVDDetector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBDVDDetector.m; sourceTree = "<group>"; }; + 273F209914ADBE670021BE6D /* HBImageAndTextCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBImageAndTextCell.h; sourceTree = "<group>"; }; + 273F209A14ADBE670021BE6D /* HBImageAndTextCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBImageAndTextCell.m; sourceTree = "<group>"; }; + 273F209B14ADBE670021BE6D /* HBOutputPanelController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBOutputPanelController.h; sourceTree = "<group>"; }; + 273F209C14ADBE670021BE6D /* HBOutputPanelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBOutputPanelController.m; sourceTree = "<group>"; }; + 273F209D14ADBE670021BE6D /* HBOutputRedirect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBOutputRedirect.h; sourceTree = "<group>"; }; + 273F209E14ADBE670021BE6D /* HBOutputRedirect.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBOutputRedirect.m; sourceTree = "<group>"; }; + 273F209F14ADBE670021BE6D /* HBPreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPreferencesController.h; sourceTree = "<group>"; }; + 273F20A014ADBE670021BE6D /* HBPreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreferencesController.m; sourceTree = "<group>"; }; + 273F20A114ADBE670021BE6D /* HBPresets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPresets.h; sourceTree = "<group>"; }; + 273F20A214ADBE670021BE6D /* HBPresets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPresets.m; sourceTree = "<group>"; }; + 273F20A314ADBE670021BE6D /* HBPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPreviewController.h; sourceTree = "<group>"; }; + 273F20A414ADBE670021BE6D /* HBPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreviewController.m; sourceTree = "<group>"; }; + 273F20A514ADBE670021BE6D /* HBQueueController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBQueueController.h; sourceTree = "<group>"; }; + 273F20A614ADBE670021BE6D /* HBQueueController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HBQueueController.mm; sourceTree = "<group>"; }; + 273F20A714ADBE670021BE6D /* HBSubtitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitles.h; sourceTree = "<group>"; }; + 273F20A814ADBE670021BE6D /* HBSubtitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitles.m; sourceTree = "<group>"; }; + 273F20A914ADBE670021BE6D /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; }; + 273F20AA14ADBE670021BE6D /* PictureController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureController.m; sourceTree = "<group>"; }; + 273F20BD14ADC09F0021BE6D /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; }; + 273F20BF14ADC1250021BE6D /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Growl.framework; sourceTree = "<group>"; }; + 273F20C014ADC1250021BE6D /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; }; + 273F20C714ADC4FF0021BE6D /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; }; + 273F211E14ADCBF70021BE6D /* HandBrake-64.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "HandBrake-64.icns"; sourceTree = "<group>"; }; + 273F211F14ADCBF70021BE6D /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = "<group>"; }; + 273F212114ADCBF70021BE6D /* ActivityWindow.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = ActivityWindow.tiff; sourceTree = "<group>"; }; + 273F212214ADCBF70021BE6D /* AddToQueue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = AddToQueue.tiff; sourceTree = "<group>"; }; + 273F212414ADCBF70021BE6D /* Brushed_Window.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brushed_Window.png; sourceTree = "<group>"; }; + 273F212514ADCBF70021BE6D /* Delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Delete.png; sourceTree = "<group>"; }; + 273F212614ADCBF70021BE6D /* DeleteHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeleteHighlight.png; sourceTree = "<group>"; }; + 273F212714ADCBF70021BE6D /* DeleteHighlightPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeleteHighlightPressed.png; sourceTree = "<group>"; }; + 273F212814ADCBF70021BE6D /* DeletePressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeletePressed.png; sourceTree = "<group>"; }; + 273F212914ADCBF80021BE6D /* Drawer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Drawer.tiff; sourceTree = "<group>"; }; + 273F212A14ADCBF80021BE6D /* EncodeCanceled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeCanceled.png; sourceTree = "<group>"; }; + 273F212B14ADCBF80021BE6D /* EncodeComplete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeComplete.png; sourceTree = "<group>"; }; + 273F212C14ADCBF80021BE6D /* EncodeWorking0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking0.png; sourceTree = "<group>"; }; + 273F212D14ADCBF80021BE6D /* EncodeWorking1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking1.png; sourceTree = "<group>"; }; + 273F212E14ADCBF80021BE6D /* EncodeWorking2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking2.png; sourceTree = "<group>"; }; + 273F212F14ADCBF80021BE6D /* EncodeWorking3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking3.png; sourceTree = "<group>"; }; + 273F213014ADCBF80021BE6D /* EncodeWorking4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking4.png; sourceTree = "<group>"; }; + 273F213114ADCBF80021BE6D /* EncodeWorking5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking5.png; sourceTree = "<group>"; }; + 273F213314ADCBF80021BE6D /* JobLarge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobLarge.png; sourceTree = "<group>"; }; + 273F213414ADCBF80021BE6D /* JobPassFirstSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassFirstSmall.png; sourceTree = "<group>"; }; + 273F213614ADCBF80021BE6D /* JobPassSecondSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSecondSmall.png; sourceTree = "<group>"; }; + 273F213814ADCBF80021BE6D /* JobPassSubtitleSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSubtitleSmall.png; sourceTree = "<group>"; }; + 273F213914ADCBF80021BE6D /* JobPassUnknownSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassUnknownSmall.png; sourceTree = "<group>"; }; + 273F213A14ADCBF80021BE6D /* JobSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobSmall.png; sourceTree = "<group>"; }; + 273F213B14ADCBF80021BE6D /* Pause.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Pause.tiff; sourceTree = "<group>"; }; + 273F213C14ADCBF80021BE6D /* Play.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Play.tiff; sourceTree = "<group>"; }; + 273F213D14ADCBF80021BE6D /* pref-audio.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "pref-audio.tiff"; sourceTree = "<group>"; }; + 273F213E14ADCBF80021BE6D /* pref-picture.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "pref-picture.tiff"; sourceTree = "<group>"; }; + 273F213F14ADCBF80021BE6D /* Queue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Queue.tiff; sourceTree = "<group>"; }; + 273F214014ADCBF80021BE6D /* Reveal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Reveal.png; sourceTree = "<group>"; }; + 273F214114ADCBF80021BE6D /* RevealHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealHighlight.png; sourceTree = "<group>"; }; + 273F214214ADCBF80021BE6D /* RevealHighlightPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealHighlightPressed.png; sourceTree = "<group>"; }; + 273F214314ADCBF80021BE6D /* RevealPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealPressed.png; sourceTree = "<group>"; }; + 273F214414ADCBF80021BE6D /* Source.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Source.tiff; sourceTree = "<group>"; }; + 273F214514ADCBF80021BE6D /* Stop.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Stop.tiff; sourceTree = "<group>"; }; + 273F217B14ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = AdvancedView.xib; sourceTree = "<group>"; }; + 273F217D14ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; }; + 273F217F14ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = MainMenu.xib; sourceTree = "<group>"; }; + 273F218114ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = OutputPanel.xib; sourceTree = "<group>"; }; + 273F218314ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = PicturePreview.xib; sourceTree = "<group>"; }; + 273F218514ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = PictureSettings.xib; sourceTree = "<group>"; }; + 273F218714ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Preferences.xib; sourceTree = "<group>"; }; + 273F218914ADDDA10021BE6D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Queue.xib; sourceTree = "<group>"; }; + 273F219614ADDE9A0021BE6D /* Brushed Window.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "Brushed Window.tiff"; sourceTree = "<group>"; }; + 273F21A514ADDE9A0021BE6D /* Info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Info.png; sourceTree = "<group>"; }; + 273F21A814ADDE9A0021BE6D /* JobPassLarge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassLarge.png; sourceTree = "<group>"; }; + 273F21AA14ADDE9A0021BE6D /* JobPassSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSmall.png; sourceTree = "<group>"; }; + 275916DA14B2AB27007211E9 /* native.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = native.xcconfig; sourceTree = "<group>"; }; + 276941FA14B161B70027798C /* osx107.i386.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = osx107.i386.xcconfig; sourceTree = "<group>"; }; + 277A3FD014AE84C500A835E4 /* osx106.i386.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = osx106.i386.xcconfig; sourceTree = "<group>"; }; + 277A3FD114AE84C500A835E4 /* osx106.x86_64.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = osx106.x86_64.xcconfig; sourceTree = "<group>"; }; + 277A3FD214AE84C500A835E4 /* osx107.x86_64.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = osx107.x86_64.xcconfig; sourceTree = "<group>"; }; + 27D6C72414B1019100B785E4 /* libhb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhb.a; path = external/libhb/libhb.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C72714B102DA00B785E4 /* liba52.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liba52.a; path = external/contrib/lib/liba52.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C72814B102DA00B785E4 /* libass.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libass.a; path = external/contrib/lib/libass.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C72914B102DA00B785E4 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = external/contrib/lib/libavcodec.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C72A14B102DA00B785E4 /* libavformat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavformat.a; path = external/contrib/lib/libavformat.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C72B14B102DA00B785E4 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = external/contrib/lib/libavutil.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C72C14B102DA00B785E4 /* libbluray.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbluray.a; path = external/contrib/lib/libbluray.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C72D14B102DA00B785E4 /* libdca.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdca.a; path = external/contrib/lib/libdca.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C72E14B102DA00B785E4 /* libdvdnav.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdvdnav.a; path = external/contrib/lib/libdvdnav.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C72F14B102DA00B785E4 /* libdvdread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdvdread.a; path = external/contrib/lib/libdvdread.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73014B102DA00B785E4 /* libfaac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfaac.a; path = external/contrib/lib/libfaac.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73114B102DA00B785E4 /* libfontconfig.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfontconfig.a; path = external/contrib/lib/libfontconfig.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73214B102DA00B785E4 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = external/contrib/lib/libfreetype.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73314B102DA00B785E4 /* libfribidi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfribidi.a; path = external/contrib/lib/libfribidi.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73414B102DA00B785E4 /* libmkv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmkv.a; path = external/contrib/lib/libmkv.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73614B102DA00B785E4 /* libmp3lame.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmp3lame.a; path = external/contrib/lib/libmp3lame.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73714B102DA00B785E4 /* libmp4v2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmp4v2.a; path = external/contrib/lib/libmp4v2.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73814B102DA00B785E4 /* libmpeg2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmpeg2.a; path = external/contrib/lib/libmpeg2.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73914B102DA00B785E4 /* libogg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libogg.a; path = external/contrib/lib/libogg.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73A14B102DA00B785E4 /* libsamplerate.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsamplerate.a; path = external/contrib/lib/libsamplerate.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73B14B102DA00B785E4 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = external/contrib/lib/libswscale.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73C14B102DA00B785E4 /* libtheora.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtheora.a; path = external/contrib/lib/libtheora.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73D14B102DA00B785E4 /* libvorbis.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbis.a; path = external/contrib/lib/libvorbis.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73E14B102DA00B785E4 /* libvorbisenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvorbisenc.a; path = external/contrib/lib/libvorbisenc.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C73F14B102DA00B785E4 /* libx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libx264.a; path = external/contrib/lib/libx264.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C74014B102DA00B785E4 /* libxml2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxml2.a; path = external/contrib/lib/libxml2.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 0DFF0C080B6BCEC200549488 /* Frameworks */ = { + 273F1FFC14ADAE950021BE6D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D289A9F30DBBE7AC00CE614B /* CoreServices.framework in Frameworks */, - A906A0520F7A7B210007A827 /* AudioToolbox.framework in Frameworks */, - D289AAC40DBBF3F100CE614B /* IOKit.framework in Frameworks */, - 2713E6300F676510002E0A01 /* libhb.a in Frameworks */, - 274DD1E40FEF109900881E69 /* libiconv.dylib in Frameworks */, - 2774BE900F66F47100B65FC6 /* libbz2.dylib in Frameworks */, - 2774BE920F66F48200B65FC6 /* libz.dylib in Frameworks */, + 273F203014ADB9790021BE6D /* AudioToolbox.framework in Frameworks */, + 273F202314ADB8650021BE6D /* IOKit.framework in Frameworks */, + 273F203314ADB9F00021BE6D /* CoreServices.framework in Frameworks */, + 273F202A14ADB8D60021BE6D /* libiconv.dylib in Frameworks */, + 273F202814ADB8BE0021BE6D /* libbz2.dylib in Frameworks */, + 273F202614ADB8A40021BE6D /* libz.dylib in Frameworks */, + 27D6C72614B1019100B785E4 /* libhb.a in Frameworks */, + 27D6C74214B102DA00B785E4 /* liba52.a in Frameworks */, + 27D6C74414B102DA00B785E4 /* libass.a in Frameworks */, + 27D6C74614B102DA00B785E4 /* libavcodec.a in Frameworks */, + 27D6C74814B102DA00B785E4 /* libavformat.a in Frameworks */, + 27D6C74A14B102DA00B785E4 /* libavutil.a in Frameworks */, + 27D6C74C14B102DA00B785E4 /* libbluray.a in Frameworks */, + 27D6C74E14B102DA00B785E4 /* libdca.a in Frameworks */, + 27D6C75014B102DA00B785E4 /* libdvdnav.a in Frameworks */, + 27D6C75214B102DA00B785E4 /* libdvdread.a in Frameworks */, + 27D6C75414B102DA00B785E4 /* libfaac.a in Frameworks */, + 27D6C75614B102DA00B785E4 /* libfontconfig.a in Frameworks */, + 27D6C75814B102DA00B785E4 /* libfreetype.a in Frameworks */, + 27D6C75A14B102DA00B785E4 /* libfribidi.a in Frameworks */, + 27D6C75C14B102DA00B785E4 /* libmkv.a in Frameworks */, + 27D6C75F14B102DA00B785E4 /* libmp3lame.a in Frameworks */, + 27D6C76114B102DA00B785E4 /* libmp4v2.a in Frameworks */, + 27D6C76314B102DA00B785E4 /* libmpeg2.a in Frameworks */, + 27D6C76514B102DA00B785E4 /* libogg.a in Frameworks */, + 27D6C76714B102DA00B785E4 /* libsamplerate.a in Frameworks */, + 27D6C76914B102DA00B785E4 /* libswscale.a in Frameworks */, + 27D6C76B14B102DA00B785E4 /* libtheora.a in Frameworks */, + 27D6C76D14B102DA00B785E4 /* libvorbis.a in Frameworks */, + 27D6C76F14B102DA00B785E4 /* libvorbisenc.a in Frameworks */, + 27D6C77114B102DA00B785E4 /* libx264.a in Frameworks */, + 27D6C77314B102DA00B785E4 /* libxml2.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 4DD93FA1082036E8008E1322 /* Frameworks */ = { + 273F203614ADBC200021BE6D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4DD93FA2082036E8008E1322 /* Cocoa.framework in Frameworks */, - A25962E10F15077500B3BF4E /* Quartz.framework in Frameworks */, - A20F47010EBB5EC2005B861B /* QTKit.framework in Frameworks */, - 4DD93FA4082036E8008E1322 /* OpenGL.framework in Frameworks */, - A906A0510F7A7B210007A827 /* AudioToolbox.framework in Frameworks */, - 4DD93FA3082036E8008E1322 /* IOKit.framework in Frameworks */, - A29E05800BE1283E000533F5 /* Growl.framework in Frameworks */, - A2D0A0AB0D3E5929002D57CB /* Sparkle.framework in Frameworks */, - 2713E6420F676526002E0A01 /* libhb.a in Frameworks */, - 274DD20B0FEF10FD00881E69 /* libiconv.dylib in Frameworks */, - 2774BEC70F66F61A00B65FC6 /* libbz2.dylib in Frameworks */, - 2774BEC80F66F61A00B65FC6 /* libz.dylib in Frameworks */, + 273F21C114ADE7A20021BE6D /* Growl.framework in Frameworks */, + 273F21C214ADE7BC0021BE6D /* Sparkle.framework in Frameworks */, + 273F20C914ADC5150021BE6D /* AudioToolbox.framework in Frameworks */, + 273F20C814ADC4FF0021BE6D /* QTKit.framework in Frameworks */, + 273F20C614ADC4F50021BE6D /* IOKit.framework in Frameworks */, + 273F203C14ADBC210021BE6D /* Cocoa.framework in Frameworks */, + 273F20C314ADC4AE0021BE6D /* libiconv.dylib in Frameworks */, + 273F20C414ADC4B60021BE6D /* libbz2.dylib in Frameworks */, + 273F20C514ADC4BD0021BE6D /* libz.dylib in Frameworks */, + 27D6C72514B1019100B785E4 /* libhb.a in Frameworks */, + 27D6C74114B102DA00B785E4 /* liba52.a in Frameworks */, + 27D6C74314B102DA00B785E4 /* libass.a in Frameworks */, + 27D6C74514B102DA00B785E4 /* libavcodec.a in Frameworks */, + 27D6C74714B102DA00B785E4 /* libavformat.a in Frameworks */, + 27D6C74914B102DA00B785E4 /* libavutil.a in Frameworks */, + 27D6C74B14B102DA00B785E4 /* libbluray.a in Frameworks */, + 27D6C74D14B102DA00B785E4 /* libdca.a in Frameworks */, + 27D6C74F14B102DA00B785E4 /* libdvdnav.a in Frameworks */, + 27D6C75114B102DA00B785E4 /* libdvdread.a in Frameworks */, + 27D6C75314B102DA00B785E4 /* libfaac.a in Frameworks */, + 27D6C75514B102DA00B785E4 /* libfontconfig.a in Frameworks */, + 27D6C75714B102DA00B785E4 /* libfreetype.a in Frameworks */, + 27D6C75914B102DA00B785E4 /* libfribidi.a in Frameworks */, + 27D6C75B14B102DA00B785E4 /* libmkv.a in Frameworks */, + 27D6C75E14B102DA00B785E4 /* libmp3lame.a in Frameworks */, + 27D6C76014B102DA00B785E4 /* libmp4v2.a in Frameworks */, + 27D6C76214B102DA00B785E4 /* libmpeg2.a in Frameworks */, + 27D6C76414B102DA00B785E4 /* libogg.a in Frameworks */, + 27D6C76614B102DA00B785E4 /* libsamplerate.a in Frameworks */, + 27D6C76814B102DA00B785E4 /* libswscale.a in Frameworks */, + 27D6C76A14B102DA00B785E4 /* libtheora.a in Frameworks */, + 27D6C76C14B102DA00B785E4 /* libvorbis.a in Frameworks */, + 27D6C76E14B102DA00B785E4 /* libvorbisenc.a in Frameworks */, + 27D6C77014B102DA00B785E4 /* libx264.a in Frameworks */, + 27D6C77214B102DA00B785E4 /* libxml2.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 19C28FACFE9D520D11CA2CBB /* Products */ = { + 271BA4C714B1236D00BC1D2C /* Static Libraries */ = { isa = PBXGroup; children = ( - 0DFF0C0A0B6BCEC200549488 /* HandBrakeCLI */, - 0D6E35760B6BD4F0005AABB3 /* HandBrake.app */, + 27D6C72414B1019100B785E4 /* libhb.a */, + 27D6C72714B102DA00B785E4 /* liba52.a */, + 27D6C72814B102DA00B785E4 /* libass.a */, + 27D6C72914B102DA00B785E4 /* libavcodec.a */, + 27D6C72A14B102DA00B785E4 /* libavformat.a */, + 27D6C72B14B102DA00B785E4 /* libavutil.a */, + 27D6C72C14B102DA00B785E4 /* libbluray.a */, + 27D6C72D14B102DA00B785E4 /* libdca.a */, + 27D6C72E14B102DA00B785E4 /* libdvdnav.a */, + 27D6C72F14B102DA00B785E4 /* libdvdread.a */, + 27D6C73014B102DA00B785E4 /* libfaac.a */, + 27D6C73114B102DA00B785E4 /* libfontconfig.a */, + 27D6C73214B102DA00B785E4 /* libfreetype.a */, + 27D6C73314B102DA00B785E4 /* libfribidi.a */, + 27D6C73414B102DA00B785E4 /* libmkv.a */, + 27D6C73614B102DA00B785E4 /* libmp3lame.a */, + 27D6C73714B102DA00B785E4 /* libmp4v2.a */, + 27D6C73814B102DA00B785E4 /* libmpeg2.a */, + 27D6C73914B102DA00B785E4 /* libogg.a */, + 27D6C73A14B102DA00B785E4 /* libsamplerate.a */, + 27D6C73B14B102DA00B785E4 /* libswscale.a */, + 27D6C73C14B102DA00B785E4 /* libtheora.a */, + 27D6C73D14B102DA00B785E4 /* libvorbis.a */, + 27D6C73E14B102DA00B785E4 /* libvorbisenc.a */, + 27D6C73F14B102DA00B785E4 /* libx264.a */, + 27D6C74014B102DA00B785E4 /* libxml2.a */, ); - name = Products; + name = "Static Libraries"; sourceTree = "<group>"; }; - 29B97314FDCFA39411CA2CEA /* HandBrake */ = { + 271BA4C914B1238E00BC1D2C /* Support */ = { isa = PBXGroup; children = ( - 526FBC930B4CAA260064E04C /* HandBrake Sources */, - 526FBC920B4CAA120064E04C /* HandBrakeCLI Sources */, - 29B97317FDCFA39411CA2CEA /* Resources */, - 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, - 29B97323FDCFA39411CA2CEA /* Frameworks */, - 19C28FACFE9D520D11CA2CBB /* Products */, - 274DD1E30FEF109900881E69 /* libiconv.dylib */, + 271BA4C014B119F800BC1D2C /* Info.plist */, ); - name = HandBrake; + name = Support; sourceTree = "<group>"; }; - 29B97317FDCFA39411CA2CEA /* Resources */ = { + 273F1FDE14AD9DA40021BE6D = { isa = PBXGroup; children = ( - A256080B0FD06720006A4277 /* Brushed_Window.png */, - A27BB4E80EFAB9310027CDF9 /* PicturePreview.xib */, - A273E0460C57B39A00493A45 /* icons */, - 0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */, - 2728D25A0FE8419900758EC9 /* HandBrake-64.icns */, - E39AA4DA0D32DC0B0007A415 /* MainMenu.xib */, - E39AA4E20D32DC0B0007A415 /* AdvancedView.xib */, - E39AA4E40D32DC0B0007A415 /* OutputPanel.xib */, - E39AA4E00D32DC0B0007A415 /* PictureSettings.xib */, - E39AA4DE0D32DC0B0007A415 /* Preferences.xib */, - E39AA4DC0D32DC0B0007A415 /* Queue.xib */, + 273F204114ADBC210021BE6D /* HandBrake */, + 273F200214ADAE950021BE6D /* HandBrakeCLI */, + 273F200014ADAE950021BE6D /* Products */, + 27D6C72314B1013400B785E4 /* Products (external) */, + 273F20CD14ADC8E60021BE6D /* Resources */, + 273F219214ADDE440021BE6D /* Resources (unused) */, + 273F203414ADBAC30021BE6D /* Frameworks */, + 273F20CE14ADC9210021BE6D /* Frameworks (bundled) */, + 277A3FCF14AE848400A835E4 /* xcconfig */, ); - name = Resources; sourceTree = "<group>"; }; - 29B97323FDCFA39411CA2CEA /* Frameworks */ = { + 273F200014ADAE950021BE6D /* Products */ = { isa = PBXGroup; children = ( - A906A0500F7A7B210007A827 /* AudioToolbox.framework */, - A25962E00F15077500B3BF4E /* Quartz.framework */, - A20F47000EBB5EC2005B861B /* QTKit.framework */, - A20F46DB0EBB5E7A005B861B /* QuickTime.framework */, - D289A9F20DBBE7AC00CE614B /* CoreServices.framework */, - A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */, - A29E057F0BE1283E000533F5 /* Growl.framework */, - 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, - 4DEB2024052B055F00C39CA9 /* IOKit.framework */, - 4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */, - 29B97325FDCFA39411CA2CEA /* Foundation.framework */, - 29B97324FDCFA39411CA2CEA /* AppKit.framework */, - 2713E50C0F675F32002E0A01 /* libhb.a */, - 2774BE8F0F66F47100B65FC6 /* libbz2.dylib */, - 2774BE910F66F48200B65FC6 /* libz.dylib */, + 273F1FFF14ADAE950021BE6D /* HandBrakeCLI */, + 273F203914ADBC210021BE6D /* HandBrake.app */, + ); + name = Products; + sourceTree = "<group>"; + }; + 273F200214ADAE950021BE6D /* HandBrakeCLI */ = { + isa = PBXGroup; + children = ( + 273F208514ADBE3B0021BE6D /* fakexcode.cpp */, + 273F208614ADBE3B0021BE6D /* parsecsv.c */, + 273F208714ADBE3B0021BE6D /* parsecsv.h */, + 273F208814ADBE3B0021BE6D /* test.c */, + ); + name = HandBrakeCLI; + path = ../test; + sourceTree = "<group>"; + }; + 273F203414ADBAC30021BE6D /* Frameworks */ = { + isa = PBXGroup; + children = ( + 273F20C714ADC4FF0021BE6D /* QTKit.framework */, + 273F202F14ADB9790021BE6D /* AudioToolbox.framework */, + 273F203B14ADBC210021BE6D /* Cocoa.framework */, + 273F203214ADB9F00021BE6D /* CoreServices.framework */, + 273F202214ADB8650021BE6D /* IOKit.framework */, + 273F203D14ADBC210021BE6D /* Other Frameworks */, + 273F202914ADB8D60021BE6D /* libiconv.dylib */, + 273F202714ADB8BE0021BE6D /* libbz2.dylib */, + 273F202514ADB8A40021BE6D /* libz.dylib */, ); name = Frameworks; sourceTree = "<group>"; }; - 526FBC920B4CAA120064E04C /* HandBrakeCLI Sources */ = { + 273F203D14ADBC210021BE6D /* Other Frameworks */ = { + isa = PBXGroup; + children = ( + 273F203E14ADBC210021BE6D /* AppKit.framework */, + 273F203F14ADBC210021BE6D /* CoreData.framework */, + 273F204014ADBC210021BE6D /* Foundation.framework */, + ); + name = "Other Frameworks"; + sourceTree = "<group>"; + }; + 273F204114ADBC210021BE6D /* HandBrake */ = { isa = PBXGroup; children = ( - 27AC71840F5A0AF600053B83 /* fakexcode.cpp */, - 526FBC760B4CA8F40064E04C /* test.c */, - 59CBD2360BBB44DA004A3BE3 /* parsecsv.c */, + 273F208C14ADBE670021BE6D /* ChapterTitles.h */, + 273F208D14ADBE670021BE6D /* ChapterTitles.m */, + 273F208E14ADBE670021BE6D /* Controller.h */, + 273F208F14ADBE670021BE6D /* Controller.m */, + 273F209014ADBE670021BE6D /* HBAdvancedController.m */, + 273F209114ADBE670021BE6D /* HBAudio.h */, + 273F209214ADBE670021BE6D /* HBAudio.m */, + 273F209314ADBE670021BE6D /* HBAudioController.h */, + 273F209414ADBE670021BE6D /* HBAudioController.m */, + 273F209714ADBE670021BE6D /* HBDVDDetector.h */, + 273F209814ADBE670021BE6D /* HBDVDDetector.m */, + 273F209914ADBE670021BE6D /* HBImageAndTextCell.h */, + 273F209A14ADBE670021BE6D /* HBImageAndTextCell.m */, + 273F209B14ADBE670021BE6D /* HBOutputPanelController.h */, + 273F209C14ADBE670021BE6D /* HBOutputPanelController.m */, + 273F209D14ADBE670021BE6D /* HBOutputRedirect.h */, + 273F209E14ADBE670021BE6D /* HBOutputRedirect.m */, + 273F209F14ADBE670021BE6D /* HBPreferencesController.h */, + 273F20A014ADBE670021BE6D /* HBPreferencesController.m */, + 273F20A114ADBE670021BE6D /* HBPresets.h */, + 273F20A214ADBE670021BE6D /* HBPresets.m */, + 273F20A314ADBE670021BE6D /* HBPreviewController.h */, + 273F20A414ADBE670021BE6D /* HBPreviewController.m */, + 273F20A514ADBE670021BE6D /* HBQueueController.h */, + 273F20A614ADBE670021BE6D /* HBQueueController.mm */, + 273F20A714ADBE670021BE6D /* HBSubtitles.h */, + 273F20A814ADBE670021BE6D /* HBSubtitles.m */, + 273F20A914ADBE670021BE6D /* PictureController.h */, + 273F20AA14ADBE670021BE6D /* PictureController.m */, + 273F20BD14ADC09F0021BE6D /* main.mm */, ); - name = "HandBrakeCLI Sources"; + name = HandBrake; + sourceTree = "<group>"; + }; + 273F20CD14ADC8E60021BE6D /* Resources */ = { + isa = PBXGroup; + children = ( + 273F217914ADDDA10021BE6D /* English.lproj */, + 273F212014ADCBF70021BE6D /* icons */, + 273F211E14ADCBF70021BE6D /* HandBrake-64.icns */, + 273F211F14ADCBF70021BE6D /* HandBrake.icns */, + ); + name = Resources; sourceTree = "<group>"; }; - 526FBC930B4CAA260064E04C /* HandBrake Sources */ = { + 273F20CE14ADC9210021BE6D /* Frameworks (bundled) */ = { isa = PBXGroup; children = ( - D234BCB91240E82800BE2E98 /* HBAudio.h */, - D234BCBA1240E82800BE2E98 /* HBAudio.m */, - D234BCBB1240E82800BE2E98 /* HBAudioController.h */, - D234BCBC1240E82800BE2E98 /* HBAudioController.m */, - A2D18AA50FD81C50003C997B /* HBSubtitles.h */, - A2D18AA60FD81C50003C997B /* HBSubtitles.m */, - 4DF3C8CB052889CD00A80101 /* Controller.h */, - 4DF3C8CC052889CD00A80101 /* Controller.m */, - A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */, - A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */, - A22C85EA0D05D35000C10E36 /* HBPresets.h */, - A22C85EB0D05D35000C10E36 /* HBPresets.m */, - 4D1FD381073D19CE00E46515 /* HBPreviewController.h */, - 4D1FD382073D19CE00E46515 /* HBPreviewController.m */, - 593034E90BBA39A100172349 /* ChapterTitles.h */, - 593034EA0BBA39A100172349 /* ChapterTitles.m */, - A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */, - A2A1EC390C76C58400827E0D /* HBDVDDetector.m */, - 253885FF0BFE0A5B0064E995 /* HBOutputRedirect.h */, - 253886000BFE0A5B0064E995 /* HBOutputRedirect.m */, - 253886150BFE0C160064E995 /* HBOutputPanelController.h */, - 253886160BFE0C160064E995 /* HBOutputPanelController.m */, - 25DE1FB40C169A0C00F01FC8 /* HBPreferencesController.h */, - 25DE1FB50C169A0C00F01FC8 /* HBPreferencesController.m */, - E37C89460C83989F00C1B919 /* HBQueueController.h */, - E37C89450C83989F00C1B919 /* HBQueueController.mm */, - A9AC41DE0C918DB500DDF9B8 /* HBAdvancedController.h */, - A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */, - E37172660C977D340072B384 /* HBImageAndTextCell.h */, - E37172650C977D340072B384 /* HBImageAndTextCell.m */, - 29B97316FDCFA39411CA2CEA /* main.mm */, + 273F20BF14ADC1250021BE6D /* Growl.framework */, + 273F20C014ADC1250021BE6D /* Sparkle.framework */, ); - name = "HandBrake Sources"; + name = "Frameworks (bundled)"; sourceTree = "<group>"; }; - A273E0460C57B39A00493A45 /* icons */ = { + 273F212014ADCBF70021BE6D /* icons */ = { isa = PBXGroup; children = ( - A2D7AD660C998AD30082CA33 /* Source.tiff */, - A273E04A0C57B39A00493A45 /* Pause.tiff */, - A273E04B0C57B39A00493A45 /* Play.tiff */, - A273E04C0C57B39A00493A45 /* Stop.tiff */, - A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */, - A2D7AD650C998AD30082CA33 /* Queue.tiff */, - A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */, - A2D7AD600C998AD30082CA33 /* Drawer.tiff */, - A2D7AD620C998AD30082CA33 /* pref-audio.tiff */, - A2D7AD640C998AD30082CA33 /* pref-picture.tiff */, - E37C893E0C83988F00C1B919 /* Delete.png */, - E3003CB40C8852B70072F2A8 /* DeletePressed.png */, - E37C893D0C83988F00C1B919 /* DeleteHighlight.png */, - E3003C7E0C88505D0072F2A8 /* DeleteHighlightPressed.png */, - E37C89400C83988F00C1B919 /* JobLarge.png */, - E37C893F0C83988F00C1B919 /* JobSmall.png */, - E37167850C92F6180072B384 /* JobPassFirstSmall.png */, - E37167830C92F6180072B384 /* JobPassSecondSmall.png */, - E37167840C92F6180072B384 /* JobPassSubtitleSmall.png */, - E37167A70C92FAA50072B384 /* JobPassUnknownSmall.png */, - E3C844F50CA6B3F90013B683 /* Reveal.png */, - E3C844F20CA6B3F90013B683 /* RevealPressed.png */, - E3C844F40CA6B3F90013B683 /* RevealHighlight.png */, - E3C844F30CA6B3F90013B683 /* RevealHighlightPressed.png */, - E3FC10900D1611EC00470E7B /* EncodeCanceled.png */, - E3C845860CA6E9080013B683 /* EncodeComplete.png */, - E3997A290CAB58BC00287239 /* EncodeWorking0.png */, - E3997A280CAB58BC00287239 /* EncodeWorking1.png */, - E3997A2A0CAB58BC00287239 /* EncodeWorking2.png */, - E3997A260CAB58BC00287239 /* EncodeWorking3.png */, - E3997A270CAB58BC00287239 /* EncodeWorking4.png */, - E3997A2B0CAB58BC00287239 /* EncodeWorking5.png */, + 273F212114ADCBF70021BE6D /* ActivityWindow.tiff */, + 273F212214ADCBF70021BE6D /* AddToQueue.tiff */, + 273F212414ADCBF70021BE6D /* Brushed_Window.png */, + 273F212514ADCBF70021BE6D /* Delete.png */, + 273F212614ADCBF70021BE6D /* DeleteHighlight.png */, + 273F212714ADCBF70021BE6D /* DeleteHighlightPressed.png */, + 273F212814ADCBF70021BE6D /* DeletePressed.png */, + 273F212914ADCBF80021BE6D /* Drawer.tiff */, + 273F212A14ADCBF80021BE6D /* EncodeCanceled.png */, + 273F212B14ADCBF80021BE6D /* EncodeComplete.png */, + 273F212C14ADCBF80021BE6D /* EncodeWorking0.png */, + 273F212D14ADCBF80021BE6D /* EncodeWorking1.png */, + 273F212E14ADCBF80021BE6D /* EncodeWorking2.png */, + 273F212F14ADCBF80021BE6D /* EncodeWorking3.png */, + 273F213014ADCBF80021BE6D /* EncodeWorking4.png */, + 273F213114ADCBF80021BE6D /* EncodeWorking5.png */, + 273F213314ADCBF80021BE6D /* JobLarge.png */, + 273F213414ADCBF80021BE6D /* JobPassFirstSmall.png */, + 273F213614ADCBF80021BE6D /* JobPassSecondSmall.png */, + 273F213814ADCBF80021BE6D /* JobPassSubtitleSmall.png */, + 273F213914ADCBF80021BE6D /* JobPassUnknownSmall.png */, + 273F213A14ADCBF80021BE6D /* JobSmall.png */, + 273F213B14ADCBF80021BE6D /* Pause.tiff */, + 273F213C14ADCBF80021BE6D /* Play.tiff */, + 273F213D14ADCBF80021BE6D /* pref-audio.tiff */, + 273F213E14ADCBF80021BE6D /* pref-picture.tiff */, + 273F213F14ADCBF80021BE6D /* Queue.tiff */, + 273F214014ADCBF80021BE6D /* Reveal.png */, + 273F214114ADCBF80021BE6D /* RevealHighlight.png */, + 273F214214ADCBF80021BE6D /* RevealHighlightPressed.png */, + 273F214314ADCBF80021BE6D /* RevealPressed.png */, + 273F214414ADCBF80021BE6D /* Source.tiff */, + 273F214514ADCBF80021BE6D /* Stop.tiff */, ); path = icons; sourceTree = "<group>"; }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 4DD93F8E082036E8008E1322 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 4DD93F8F082036E8008E1322 /* Controller.h in Headers */, - 4DD93F92082036E8008E1322 /* HBPreviewController.h in Headers */, - A2A1EC310C76C35E00827E0D /* HBDVDDetector.h in Headers */, - 253886010BFE0A5B0064E995 /* HBOutputRedirect.h in Headers */, - 253886170BFE0C160064E995 /* HBOutputPanelController.h in Headers */, - 25DE1FB60C169A0C00F01FC8 /* HBPreferencesController.h in Headers */, - E37C89480C83989F00C1B919 /* HBQueueController.h in Headers */, - A9AC41E00C918DB500DDF9B8 /* HBAdvancedController.h in Headers */, - E37172680C977D340072B384 /* HBImageAndTextCell.h in Headers */, - A22C85EC0D05D35000C10E36 /* HBPresets.h in Headers */, - A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */, - 278070240F5C261300699207 /* ChapterTitles.h in Headers */, - A2D18AA70FD81C50003C997B /* HBSubtitles.h in Headers */, - D234BCBD1240E82800BE2E98 /* HBAudio.h in Headers */, - D234BCBF1240E82800BE2E98 /* HBAudioController.h in Headers */, + 273F217914ADDDA10021BE6D /* English.lproj */ = { + isa = PBXGroup; + children = ( + 273F217A14ADDDA10021BE6D /* AdvancedView.xib */, + 273F217C14ADDDA10021BE6D /* InfoPlist.strings */, + 273F217E14ADDDA10021BE6D /* MainMenu.xib */, + 273F218014ADDDA10021BE6D /* OutputPanel.xib */, + 273F218214ADDDA10021BE6D /* PicturePreview.xib */, + 273F218414ADDDA10021BE6D /* PictureSettings.xib */, + 273F218614ADDDA10021BE6D /* Preferences.xib */, + 273F218814ADDDA10021BE6D /* Queue.xib */, ); - runOnlyForDeploymentPostprocessing = 0; + path = English.lproj; + sourceTree = "<group>"; }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXLegacyTarget section */ - 27F143770F5DF34F00A684FF /* external */ = { - isa = PBXLegacyTarget; - buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake"; - buildConfigurationList = 27F1438E0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "external" */; - buildPhases = ( + 273F219214ADDE440021BE6D /* Resources (unused) */ = { + isa = PBXGroup; + children = ( + 273F219314ADDE9A0021BE6D /* icons */, ); - buildToolPath = /bin/sh; - dependencies = ( + name = "Resources (unused)"; + sourceTree = "<group>"; + }; + 273F219314ADDE9A0021BE6D /* icons */ = { + isa = PBXGroup; + children = ( + 273F219614ADDE9A0021BE6D /* Brushed Window.tiff */, + 273F21A514ADDE9A0021BE6D /* Info.png */, + 273F21A814ADDE9A0021BE6D /* JobPassLarge.png */, + 273F21AA14ADDE9A0021BE6D /* JobPassSmall.png */, ); - name = external; - passBuildSettingsInEnvironment = 1; - productName = external; + path = icons; + sourceTree = "<group>"; }; - 27F1437E0F5DF36000A684FF /* contrib */ = { - isa = PBXLegacyTarget; - buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake"; - buildConfigurationList = 27F1438F0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "contrib" */; - buildPhases = ( + 277A3FCF14AE848400A835E4 /* xcconfig */ = { + isa = PBXGroup; + children = ( + 275916DA14B2AB27007211E9 /* native.xcconfig */, + 277A3FD014AE84C500A835E4 /* osx106.i386.xcconfig */, + 277A3FD114AE84C500A835E4 /* osx106.x86_64.xcconfig */, + 276941FA14B161B70027798C /* osx107.i386.xcconfig */, + 277A3FD214AE84C500A835E4 /* osx107.x86_64.xcconfig */, ); - buildToolPath = /bin/sh; - dependencies = ( + path = xcconfig; + sourceTree = "<group>"; + }; + 27D6C72314B1013400B785E4 /* Products (external) */ = { + isa = PBXGroup; + children = ( + 271BA4C914B1238E00BC1D2C /* Support */, + 271BA4C714B1236D00BC1D2C /* Static Libraries */, ); - name = contrib; - passBuildSettingsInEnvironment = 1; - productName = contrib; + name = "Products (external)"; + sourceTree = "<group>"; }; - 27F143850F5DF37600A684FF /* libhb */ = { +/* End PBXGroup section */ + +/* Begin PBXLegacyTarget section */ + 273F216E14ADD2170021BE6D /* external */ = { isa = PBXLegacyTarget; - buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake"; - buildConfigurationList = 27F143900F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "libhb" */; + buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake\""; + buildConfigurationList = 273F217114ADD2170021BE6D /* Build configuration list for PBXLegacyTarget "external" */; buildPhases = ( ); - buildToolPath = /bin/sh; + buildToolPath = /bin/bash; + buildWorkingDirectory = ""; dependencies = ( ); - name = libhb; + name = external; passBuildSettingsInEnvironment = 1; productName = libhb; }; /* End PBXLegacyTarget section */ /* Begin PBXNativeTarget section */ - 0DFF0C090B6BCEC200549488 /* HandBrakeCLI */ = { + 273F1FFE14ADAE950021BE6D /* HandBrakeCLI */ = { isa = PBXNativeTarget; - buildConfigurationList = 0DFF0C0C0B6BCEE000549488 /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */; + buildConfigurationList = 273F200714ADAE950021BE6D /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */; buildPhases = ( - 0DFF0C070B6BCEC200549488 /* Sources */, - 0DFF0C080B6BCEC200549488 /* Frameworks */, + 273F1FFB14ADAE950021BE6D /* Sources */, + 273F1FFC14ADAE950021BE6D /* Frameworks */, + 273F1FFD14ADAE950021BE6D /* CopyFiles */, ); buildRules = ( ); dependencies = ( - 277C2E560F5DFF450067D708 /* PBXTargetDependency */, + 273F217714ADD2580021BE6D /* PBXTargetDependency */, ); name = HandBrakeCLI; productName = HandBrakeCLI; - productReference = 0DFF0C0A0B6BCEC200549488 /* HandBrakeCLI */; + productReference = 273F1FFF14ADAE950021BE6D /* HandBrakeCLI */; productType = "com.apple.product-type.tool"; }; - 4DD93F8D082036E8008E1322 /* HandBrake */ = { + 273F203814ADBC200021BE6D /* HandBrake */ = { isa = PBXNativeTarget; - buildConfigurationList = 4D4E7BC0087804870051572B /* Build configuration list for PBXNativeTarget "HandBrake" */; + buildConfigurationList = 273F205314ADBC210021BE6D /* Build configuration list for PBXNativeTarget "HandBrake" */; buildPhases = ( - 4DD93F8E082036E8008E1322 /* Headers */, - 4DD93F95082036E8008E1322 /* Resources */, - 4DD93F99082036E8008E1322 /* Sources */, - 4DD93FA1082036E8008E1322 /* Frameworks */, - A29E05840BE12861000533F5 /* CopyFiles */, + 273F203514ADBC200021BE6D /* Sources */, + 273F203614ADBC200021BE6D /* Frameworks */, + 273F203714ADBC200021BE6D /* Resources */, + 273F20CA14ADC86C0021BE6D /* CopyFiles */, ); buildRules = ( ); dependencies = ( - 277C2E540F5DFF400067D708 /* PBXTargetDependency */, + 2781697114B02B1B00A28B61 /* PBXTargetDependency */, ); name = HandBrake; productName = HandBrake; - productReference = 0D6E35760B6BD4F0005AABB3 /* HandBrake.app */; + productReference = 273F203914ADBC210021BE6D /* HandBrake.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { + 273F1FE014AD9DA40021BE6D /* Project object */ = { isa = PBXProject; attributes = { - BuildIndependentTargetsInParallel = YES; LastUpgradeCheck = 0420; }; - buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */; + buildConfigurationList = 273F1FE314AD9DA40021BE6D /* Build configuration list for PBXProject "HandBrake" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; - hasScannedForEncodings = 1; + hasScannedForEncodings = 0; knownRegions = ( + en, English, - Japanese, - French, - German, ); - mainGroup = 29B97314FDCFA39411CA2CEA /* HandBrake */; + mainGroup = 273F1FDE14AD9DA40021BE6D; + productRefGroup = 273F200014ADAE950021BE6D /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 4DD93F8D082036E8008E1322 /* HandBrake */, - 0DFF0C090B6BCEC200549488 /* HandBrakeCLI */, - 27F143770F5DF34F00A684FF /* external */, - 27F143850F5DF37600A684FF /* libhb */, - 27F1437E0F5DF36000A684FF /* contrib */, + 273F203814ADBC200021BE6D /* HandBrake */, + 273F1FFE14ADAE950021BE6D /* HandBrakeCLI */, + 273F216E14ADD2170021BE6D /* external */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 4DD93F95082036E8008E1322 /* Resources */ = { + 273F203714ADBC200021BE6D /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4DD93F97082036E8008E1322 /* InfoPlist.strings in Resources */, - 0DFA5C7B0B8DD1E90020BC09 /* HandBrake.icns in Resources */, - A273E0510C57B39A00493A45 /* Pause.tiff in Resources */, - A273E0520C57B39A00493A45 /* Play.tiff in Resources */, - A273E0530C57B39A00493A45 /* Stop.tiff in Resources */, - E37C89410C83988F00C1B919 /* DeleteHighlight.png in Resources */, - E37C89420C83988F00C1B919 /* Delete.png in Resources */, - E37C89430C83988F00C1B919 /* JobSmall.png in Resources */, - E37C89440C83988F00C1B919 /* JobLarge.png in Resources */, - E3003C7F0C88505D0072F2A8 /* DeleteHighlightPressed.png in Resources */, - E3003CB50C8852B70072F2A8 /* DeletePressed.png in Resources */, - E37167890C92F6180072B384 /* JobPassSecondSmall.png in Resources */, - E371678A0C92F6180072B384 /* JobPassSubtitleSmall.png in Resources */, - E371678B0C92F6180072B384 /* JobPassFirstSmall.png in Resources */, - E37167A90C92FAA50072B384 /* JobPassUnknownSmall.png in Resources */, - A2D7AD670C998AD30082CA33 /* ActivityWindow.tiff in Resources */, - A2D7AD680C998AD30082CA33 /* AddToQueue.tiff in Resources */, - A2D7AD690C998AD30082CA33 /* Drawer.tiff in Resources */, - A2D7AD6B0C998AD30082CA33 /* pref-audio.tiff in Resources */, - A2D7AD6D0C998AD30082CA33 /* pref-picture.tiff in Resources */, - A2D7AD6E0C998AD30082CA33 /* Queue.tiff in Resources */, - A2D7AD6F0C998AD30082CA33 /* Source.tiff in Resources */, - E3C844F60CA6B3F90013B683 /* RevealPressed.png in Resources */, - E3C844F70CA6B3F90013B683 /* RevealHighlightPressed.png in Resources */, - E3C844F80CA6B3F90013B683 /* RevealHighlight.png in Resources */, - E3C844F90CA6B3F90013B683 /* Reveal.png in Resources */, - E3C845870CA6E9080013B683 /* EncodeComplete.png in Resources */, - E3997A2C0CAB58BC00287239 /* EncodeWorking3.png in Resources */, - E3997A2D0CAB58BC00287239 /* EncodeWorking4.png in Resources */, - E3997A2E0CAB58BC00287239 /* EncodeWorking1.png in Resources */, - E3997A2F0CAB58BC00287239 /* EncodeWorking0.png in Resources */, - E3997A300CAB58BC00287239 /* EncodeWorking2.png in Resources */, - E3997A310CAB58BC00287239 /* EncodeWorking5.png in Resources */, - E3FC10910D1611EC00470E7B /* EncodeCanceled.png in Resources */, - E39AA4E60D32DC0B0007A415 /* MainMenu.xib in Resources */, - E39AA4E70D32DC0B0007A415 /* Queue.xib in Resources */, - E39AA4E80D32DC0B0007A415 /* Preferences.xib in Resources */, - E39AA4E90D32DC0B0007A415 /* PictureSettings.xib in Resources */, - E39AA4EA0D32DC0B0007A415 /* AdvancedView.xib in Resources */, - E39AA4EB0D32DC0B0007A415 /* OutputPanel.xib in Resources */, - A27BB4EA0EFAB9310027CDF9 /* PicturePreview.xib in Resources */, - A256080C0FD06720006A4277 /* Brushed_Window.png in Resources */, - 2728D25B0FE8419900758EC9 /* HandBrake-64.icns in Resources */, + 273F214614ADCBF80021BE6D /* HandBrake-64.icns in Resources */, + 273F214714ADCBF80021BE6D /* HandBrake.icns in Resources */, + 273F214814ADCBF80021BE6D /* ActivityWindow.tiff in Resources */, + 273F214914ADCBF80021BE6D /* AddToQueue.tiff in Resources */, + 273F214B14ADCBF80021BE6D /* Brushed_Window.png in Resources */, + 273F214C14ADCBF80021BE6D /* Delete.png in Resources */, + 273F214D14ADCBF80021BE6D /* DeleteHighlight.png in Resources */, + 273F214E14ADCBF80021BE6D /* DeleteHighlightPressed.png in Resources */, + 273F214F14ADCBF80021BE6D /* DeletePressed.png in Resources */, + 273F215014ADCBF80021BE6D /* Drawer.tiff in Resources */, + 273F215114ADCBF80021BE6D /* EncodeCanceled.png in Resources */, + 273F215214ADCBF80021BE6D /* EncodeComplete.png in Resources */, + 273F215314ADCBF80021BE6D /* EncodeWorking0.png in Resources */, + 273F215414ADCBF80021BE6D /* EncodeWorking1.png in Resources */, + 273F215514ADCBF80021BE6D /* EncodeWorking2.png in Resources */, + 273F215614ADCBF80021BE6D /* EncodeWorking3.png in Resources */, + 273F215714ADCBF80021BE6D /* EncodeWorking4.png in Resources */, + 273F215814ADCBF80021BE6D /* EncodeWorking5.png in Resources */, + 273F215A14ADCBF80021BE6D /* JobLarge.png in Resources */, + 273F215B14ADCBF80021BE6D /* JobPassFirstSmall.png in Resources */, + 273F215D14ADCBF80021BE6D /* JobPassSecondSmall.png in Resources */, + 273F215F14ADCBF80021BE6D /* JobPassSubtitleSmall.png in Resources */, + 273F216014ADCBF80021BE6D /* JobPassUnknownSmall.png in Resources */, + 273F216114ADCBF80021BE6D /* JobSmall.png in Resources */, + 273F216214ADCBF80021BE6D /* Pause.tiff in Resources */, + 273F216314ADCBF80021BE6D /* Play.tiff in Resources */, + 273F216414ADCBF80021BE6D /* pref-audio.tiff in Resources */, + 273F216514ADCBF80021BE6D /* pref-picture.tiff in Resources */, + 273F216614ADCBF80021BE6D /* Queue.tiff in Resources */, + 273F216714ADCBF80021BE6D /* Reveal.png in Resources */, + 273F216814ADCBF80021BE6D /* RevealHighlight.png in Resources */, + 273F216914ADCBF80021BE6D /* RevealHighlightPressed.png in Resources */, + 273F216A14ADCBF80021BE6D /* RevealPressed.png in Resources */, + 273F216B14ADCBF80021BE6D /* Source.tiff in Resources */, + 273F216C14ADCBF80021BE6D /* Stop.tiff in Resources */, + 273F218A14ADDDA10021BE6D /* AdvancedView.xib in Resources */, + 273F218B14ADDDA10021BE6D /* InfoPlist.strings in Resources */, + 273F218C14ADDDA10021BE6D /* MainMenu.xib in Resources */, + 273F218D14ADDDA10021BE6D /* OutputPanel.xib in Resources */, + 273F218E14ADDDA10021BE6D /* PicturePreview.xib in Resources */, + 273F218F14ADDDA10021BE6D /* PictureSettings.xib in Resources */, + 273F219014ADDDA10021BE6D /* Preferences.xib in Resources */, + 273F219114ADDDA10021BE6D /* Queue.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 0DFF0C070B6BCEC200549488 /* Sources */ = { + 273F1FFB14ADAE950021BE6D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0DFF0C100B6BCEE800549488 /* test.c in Sources */, - 59CBD2370BBB44DA004A3BE3 /* parsecsv.c in Sources */, - 27AC71850F5A0AF600053B83 /* fakexcode.cpp in Sources */, + 273F208914ADBE3B0021BE6D /* fakexcode.cpp in Sources */, + 273F208A14ADBE3B0021BE6D /* parsecsv.c in Sources */, + 273F208B14ADBE3B0021BE6D /* test.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 4DD93F99082036E8008E1322 /* Sources */ = { + 273F203514ADBC200021BE6D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 59CBD2650BBB4D1B004A3BE3 /* ChapterTitles.m in Sources */, - 4DD93F9A082036E8008E1322 /* main.mm in Sources */, - 4DD93F9B082036E8008E1322 /* Controller.m in Sources */, - 4DD93F9E082036E8008E1322 /* HBPreviewController.m in Sources */, - A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */, - 253886020BFE0A5B0064E995 /* HBOutputRedirect.m in Sources */, - 253886180BFE0C160064E995 /* HBOutputPanelController.m in Sources */, - 25DE1FB70C169A0C00F01FC8 /* HBPreferencesController.m in Sources */, - E37C89470C83989F00C1B919 /* HBQueueController.mm in Sources */, - A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */, - E37172670C977D340072B384 /* HBImageAndTextCell.m in Sources */, - A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */, - A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.m in Sources */, - A2D18AA80FD81C50003C997B /* HBSubtitles.m in Sources */, - D234BCBE1240E82800BE2E98 /* HBAudio.m in Sources */, - D234BCC01240E82800BE2E98 /* HBAudioController.m in Sources */, + 273F20AB14ADBE670021BE6D /* ChapterTitles.m in Sources */, + 273F20AC14ADBE670021BE6D /* Controller.m in Sources */, + 273F20AD14ADBE670021BE6D /* HBAdvancedController.m in Sources */, + 273F20AE14ADBE670021BE6D /* HBAudio.m in Sources */, + 273F20AF14ADBE670021BE6D /* HBAudioController.m in Sources */, + 273F20B114ADBE670021BE6D /* HBDVDDetector.m in Sources */, + 273F20B214ADBE670021BE6D /* HBImageAndTextCell.m in Sources */, + 273F20B314ADBE670021BE6D /* HBOutputPanelController.m in Sources */, + 273F20B414ADBE670021BE6D /* HBOutputRedirect.m in Sources */, + 273F20B514ADBE670021BE6D /* HBPreferencesController.m in Sources */, + 273F20B614ADBE670021BE6D /* HBPresets.m in Sources */, + 273F20B714ADBE670021BE6D /* HBPreviewController.m in Sources */, + 273F20B814ADBE670021BE6D /* HBQueueController.mm in Sources */, + 273F20B914ADBE670021BE6D /* HBSubtitles.m in Sources */, + 273F20BA14ADBE670021BE6D /* PictureController.m in Sources */, + 273F20BE14ADC09F0021BE6D /* main.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 277C2E540F5DFF400067D708 /* PBXTargetDependency */ = { + 273F217714ADD2580021BE6D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 27F143770F5DF34F00A684FF /* external */; - targetProxy = 277C2E530F5DFF400067D708 /* PBXContainerItemProxy */; + target = 273F216E14ADD2170021BE6D /* external */; + targetProxy = 273F217614ADD2580021BE6D /* PBXContainerItemProxy */; }; - 277C2E560F5DFF450067D708 /* PBXTargetDependency */ = { + 2781697114B02B1B00A28B61 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 27F143770F5DF34F00A684FF /* external */; - targetProxy = 277C2E550F5DFF450067D708 /* PBXContainerItemProxy */; + target = 273F216E14ADD2170021BE6D /* external */; + targetProxy = 2781697014B02B1B00A28B61 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = { + 273F217A14ADDDA10021BE6D /* AdvancedView.xib */ = { isa = PBXVariantGroup; children = ( - 089C165DFE840E0CC02AAC07 /* English */, + 273F217B14ADDDA10021BE6D /* English */, ); - name = InfoPlist.strings; + name = AdvancedView.xib; sourceTree = "<group>"; }; - A27BB4E80EFAB9310027CDF9 /* PicturePreview.xib */ = { + 273F217C14ADDDA10021BE6D /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( - A27BB4E90EFAB9310027CDF9 /* English */, + 273F217D14ADDDA10021BE6D /* English */, ); - name = PicturePreview.xib; + name = InfoPlist.strings; sourceTree = "<group>"; }; - E39AA4DA0D32DC0B0007A415 /* MainMenu.xib */ = { + 273F217E14ADDDA10021BE6D /* MainMenu.xib */ = { isa = PBXVariantGroup; children = ( - E39AA4DB0D32DC0B0007A415 /* English */, + 273F217F14ADDDA10021BE6D /* English */, ); name = MainMenu.xib; sourceTree = "<group>"; }; - E39AA4DC0D32DC0B0007A415 /* Queue.xib */ = { + 273F218014ADDDA10021BE6D /* OutputPanel.xib */ = { isa = PBXVariantGroup; children = ( - E39AA4DD0D32DC0B0007A415 /* English */, + 273F218114ADDDA10021BE6D /* English */, ); - name = Queue.xib; + name = OutputPanel.xib; sourceTree = "<group>"; }; - E39AA4DE0D32DC0B0007A415 /* Preferences.xib */ = { + 273F218214ADDDA10021BE6D /* PicturePreview.xib */ = { isa = PBXVariantGroup; children = ( - E39AA4DF0D32DC0B0007A415 /* English */, + 273F218314ADDDA10021BE6D /* English */, ); - name = Preferences.xib; + name = PicturePreview.xib; sourceTree = "<group>"; }; - E39AA4E00D32DC0B0007A415 /* PictureSettings.xib */ = { + 273F218414ADDDA10021BE6D /* PictureSettings.xib */ = { isa = PBXVariantGroup; children = ( - E39AA4E10D32DC0B0007A415 /* English */, + 273F218514ADDDA10021BE6D /* English */, ); name = PictureSettings.xib; sourceTree = "<group>"; }; - E39AA4E20D32DC0B0007A415 /* AdvancedView.xib */ = { + 273F218614ADDDA10021BE6D /* Preferences.xib */ = { isa = PBXVariantGroup; children = ( - E39AA4E30D32DC0B0007A415 /* English */, + 273F218714ADDDA10021BE6D /* English */, ); - name = AdvancedView.xib; + name = Preferences.xib; sourceTree = "<group>"; }; - E39AA4E40D32DC0B0007A415 /* OutputPanel.xib */ = { + 273F218814ADDDA10021BE6D /* Queue.xib */ = { isa = PBXVariantGroup; children = ( - E39AA4E50D32DC0B0007A415 /* English */, + 273F218914ADDDA10021BE6D /* English */, ); - name = OutputPanel.xib; + name = Queue.xib; sourceTree = "<group>"; }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 0DFF0C0D0B6BCEE000549488 /* debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrakeCLI; - }; - name = debug; - }; - 0DFF0C0E0B6BCEE000549488 /* standard */ = { + 273F1FE614AD9DA40021BE6D /* debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 275916DA14B2AB27007211E9 /* native.xcconfig */; buildSettings = { - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrakeCLI; - }; - name = standard; - }; - 27B4DEB20F65BAB600098046 /* standard.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = i386; - CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; - CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 1; - EXTERNAL_METHOD = xcode; - EXTERNAL_SRC = ..; - FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; - HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; - IBC_NOTICES = NO; - IBC_WARNINGS = NO; - LIBRARY_SEARCH_PATHS = ( - "$(EXTERNAL_BUILD)/libhb", - "$(EXTERNAL_BUILD)/contrib/lib", - ); - OBJROOT = "$(EXTERNAL_BUILD)/macosx"; - SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache"; - SYMROOT = "$(EXTERNAL_BUILD)/macosx"; - }; - name = standard.i386; - }; - 27B4DEB30F65BAB600098046 /* standard.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin; - IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources; - INFOPLIST_FILE = Info.plist; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef"; - INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h"; - INFOPLIST_PREPROCESS = YES; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrake; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - }; - name = standard.i386; - }; - 27B4DEB40F65BAB600098046 /* standard.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrakeCLI; - }; - name = standard.i386; - }; - 27B4DEB50F65BAB600098046 /* standard.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = external; - }; - name = standard.i386; - }; - 27B4DEB60F65BAB600098046 /* standard.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = standard.i386; - }; - 27B4DEB70F65BAB600098046 /* standard.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = contrib; - }; - name = standard.i386; - }; - 27B4DEB80F65BAB700098046 /* standard.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = x86_64; - CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; - CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 1; - EXTERNAL_METHOD = xcode; - EXTERNAL_SRC = ..; - FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; - HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; - IBC_NOTICES = NO; - IBC_WARNINGS = NO; - LIBRARY_SEARCH_PATHS = ( - "$(EXTERNAL_BUILD)/libhb", - "$(EXTERNAL_BUILD)/contrib/lib", - ); - OBJROOT = "$(EXTERNAL_BUILD)/macosx"; - SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache"; - SYMROOT = "$(EXTERNAL_BUILD)/macosx"; - }; - name = standard.x86_64; - }; - 27B4DEB90F65BAB700098046 /* standard.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin; - IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources; - INFOPLIST_FILE = Info.plist; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef"; - INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h"; - INFOPLIST_PREPROCESS = YES; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrake; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - }; - name = standard.x86_64; - }; - 27B4DEBA0F65BAB700098046 /* standard.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrakeCLI; - }; - name = standard.x86_64; - }; - 27B4DEBB0F65BAB700098046 /* standard.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = external; - }; - name = standard.x86_64; - }; - 27B4DEBC0F65BAB700098046 /* standard.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = standard.x86_64; - }; - 27B4DEBD0F65BAB700098046 /* standard.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = contrib; - }; - name = standard.x86_64; - }; - 27B4DEBE0F65BAB800098046 /* standard.ppc */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = ppc; - CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; - CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 1; - EXTERNAL_METHOD = xcode; - EXTERNAL_SRC = ..; - FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; - HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; - IBC_NOTICES = NO; - IBC_WARNINGS = NO; - LIBRARY_SEARCH_PATHS = ( - "$(EXTERNAL_BUILD)/libhb", - "$(EXTERNAL_BUILD)/contrib/lib", - ); - OBJROOT = "$(EXTERNAL_BUILD)/macosx"; - SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache"; - SYMROOT = "$(EXTERNAL_BUILD)/macosx"; - }; - name = standard.ppc; - }; - 27B4DEBF0F65BAB800098046 /* standard.ppc */ = { - isa = XCBuildConfiguration; - buildSettings = { - IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin; - IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources; - INFOPLIST_FILE = Info.plist; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef"; - INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h"; - INFOPLIST_PREPROCESS = YES; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrake; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - }; - name = standard.ppc; - }; - 27B4DEC00F65BAB800098046 /* standard.ppc */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrakeCLI; - }; - name = standard.ppc; - }; - 27B4DEC10F65BAB800098046 /* standard.ppc */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = external; - }; - name = standard.ppc; - }; - 27B4DEC20F65BAB800098046 /* standard.ppc */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = standard.ppc; - }; - 27B4DEC30F65BAB800098046 /* standard.ppc */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = contrib; - }; - name = standard.ppc; - }; - 27B4DEC40F65BAB900098046 /* standard.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = ppc64; - CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; - CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 1; - EXTERNAL_METHOD = xcode; - EXTERNAL_SRC = ..; - FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; - HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; - IBC_NOTICES = NO; - IBC_WARNINGS = NO; - LIBRARY_SEARCH_PATHS = ( - "$(EXTERNAL_BUILD)/libhb", - "$(EXTERNAL_BUILD)/contrib/lib", - ); - OBJROOT = "$(EXTERNAL_BUILD)/macosx"; - SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache"; - SYMROOT = "$(EXTERNAL_BUILD)/macosx"; - }; - name = standard.ppc64; - }; - 27B4DEC50F65BAB900098046 /* standard.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin; - IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources; - INFOPLIST_FILE = Info.plist; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef"; - INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h"; - INFOPLIST_PREPROCESS = YES; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrake; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - }; - name = standard.ppc64; - }; - 27B4DEC60F65BAB900098046 /* standard.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrakeCLI; - }; - name = standard.ppc64; - }; - 27B4DEC70F65BAB900098046 /* standard.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = external; - }; - name = standard.ppc64; - }; - 27B4DEC80F65BAB900098046 /* standard.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = standard.ppc64; - }; - 27B4DEC90F65BAB900098046 /* standard.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = contrib; - }; - name = standard.ppc64; - }; - 27B4DECA0F65BABC00098046 /* debug.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = i386; - CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; - CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; + ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 1; - EXTERNAL_METHOD = xcode; + EXTERNAL_BUILD = "$(CONFIGURATION_BUILD_DIR)/external"; + EXTERNAL_DRIVER = xcode; + EXTERNAL_JOBS = auto; EXTERNAL_SRC = ..; - FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; - HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; - IBC_NOTICES = NO; - IBC_WARNINGS = NO; - LIBRARY_SEARCH_PATHS = ( - "$(EXTERNAL_BUILD)/libhb", - "$(EXTERNAL_BUILD)/contrib/lib", + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", ); - OBJROOT = "$(EXTERNAL_BUILD)/macosx"; - SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache"; + GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + SHARED_PRECOMPS_DIR = "$(CONFIGURATION_TEMP_DIR)/PrecompiledHeaders"; STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "$(EXTERNAL_BUILD)/macosx"; }; - name = debug.i386; - }; - 27B4DECB0F65BABC00098046 /* debug.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin; - IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources; - INFOPLIST_FILE = Info.plist; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef"; - INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h"; - INFOPLIST_PREPROCESS = YES; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrake; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - }; - name = debug.i386; - }; - 27B4DECC0F65BABC00098046 /* debug.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrakeCLI; - }; - name = debug.i386; - }; - 27B4DECD0F65BABC00098046 /* debug.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = external; - }; - name = debug.i386; - }; - 27B4DECE0F65BABC00098046 /* debug.i386 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = debug.i386; + name = debug; }; - 27B4DECF0F65BABC00098046 /* debug.i386 */ = { + 273F1FE714AD9DA40021BE6D /* release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 275916DA14B2AB27007211E9 /* native.xcconfig */; buildSettings = { - PRODUCT_NAME = contrib; + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + EXTERNAL_BUILD = "$(CONFIGURATION_BUILD_DIR)/external"; + EXTERNAL_DRIVER = xcode; + EXTERNAL_JOBS = auto; + EXTERNAL_SRC = ..; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + SHARED_PRECOMPS_DIR = "$(CONFIGURATION_TEMP_DIR)/PrecompiledHeaders"; + STRIP_INSTALLED_PRODUCT = YES; }; - name = debug.i386; + name = release; }; - 27B4DED00F65BABD00098046 /* debug.x86_64 */ = { + 273F200814ADAE950021BE6D /* debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = x86_64; - CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; - CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 1; - EXTERNAL_METHOD = xcode; - EXTERNAL_SRC = ..; - FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; - IBC_NOTICES = NO; - IBC_WARNINGS = NO; LIBRARY_SEARCH_PATHS = ( - "$(EXTERNAL_BUILD)/libhb", - "$(EXTERNAL_BUILD)/contrib/lib", + "$(inherited)", + "\"$(EXTERNAL_BUILD)/libhb\"", + "\"$(EXTERNAL_BUILD)/contrib/lib\"", ); - OBJROOT = "$(EXTERNAL_BUILD)/macosx"; - SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache"; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "$(EXTERNAL_BUILD)/macosx"; + PRODUCT_NAME = "$(TARGET_NAME)"; }; - name = debug.x86_64; - }; - 27B4DED10F65BABD00098046 /* debug.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin; - IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources; - INFOPLIST_FILE = Info.plist; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef"; - INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h"; - INFOPLIST_PREPROCESS = YES; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrake; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - }; - name = debug.x86_64; - }; - 27B4DED20F65BABD00098046 /* debug.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrakeCLI; - }; - name = debug.x86_64; - }; - 27B4DED30F65BABD00098046 /* debug.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = external; - }; - name = debug.x86_64; - }; - 27B4DED40F65BABD00098046 /* debug.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = debug.x86_64; - }; - 27B4DED50F65BABD00098046 /* debug.x86_64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = contrib; - }; - name = debug.x86_64; + name = debug; }; - 27B4DED60F65BABD00098046 /* debug.ppc */ = { + 273F200914ADAE950021BE6D /* release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ppc; - CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; - CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 1; - EXTERNAL_METHOD = xcode; - EXTERNAL_SRC = ..; - FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; - IBC_NOTICES = NO; - IBC_WARNINGS = NO; LIBRARY_SEARCH_PATHS = ( - "$(EXTERNAL_BUILD)/libhb", - "$(EXTERNAL_BUILD)/contrib/lib", - ); - OBJROOT = "$(EXTERNAL_BUILD)/macosx"; - SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache"; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "$(EXTERNAL_BUILD)/macosx"; - }; - name = debug.ppc; - }; - 27B4DED70F65BABD00098046 /* debug.ppc */ = { - isa = XCBuildConfiguration; - buildSettings = { - IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin; - IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources; - INFOPLIST_FILE = Info.plist; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef"; - INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h"; - INFOPLIST_PREPROCESS = YES; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", + "$(inherited)", + "\"$(EXTERNAL_BUILD)/libhb\"", + "\"$(EXTERNAL_BUILD)/contrib/lib\"", ); - PRODUCT_NAME = HandBrake; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; + PRODUCT_NAME = "$(TARGET_NAME)"; }; - name = debug.ppc; + name = release; }; - 27B4DED80F65BABD00098046 /* debug.ppc */ = { + 273F205414ADBC210021BE6D /* debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)\"", ); - PRODUCT_NAME = HandBrakeCLI; - }; - name = debug.ppc; - }; - 27B4DED90F65BABD00098046 /* debug.ppc */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = external; - }; - name = debug.ppc; - }; - 27B4DEDA0F65BABD00098046 /* debug.ppc */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = debug.ppc; - }; - 27B4DEDB0F65BABD00098046 /* debug.ppc */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = contrib; - }; - name = debug.ppc; - }; - 27B4DEDC0F65BABD00098046 /* debug.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = ppc64; - CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; - CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 1; - EXTERNAL_METHOD = xcode; - EXTERNAL_SRC = ..; - FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; - IBC_NOTICES = NO; - IBC_WARNINGS = NO; + INFOPLIST_FILE = "$(EXTERNAL_BUILD)/macosx/Info.plist"; LIBRARY_SEARCH_PATHS = ( - "$(EXTERNAL_BUILD)/libhb", - "$(EXTERNAL_BUILD)/contrib/lib", - ); - OBJROOT = "$(EXTERNAL_BUILD)/macosx"; - SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache"; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "$(EXTERNAL_BUILD)/macosx"; - }; - name = debug.ppc64; - }; - 27B4DEDD0F65BABD00098046 /* debug.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin; - IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources; - INFOPLIST_FILE = Info.plist; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef"; - INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h"; - INFOPLIST_PREPROCESS = YES; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrake; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", + "$(inherited)", + "\"$(EXTERNAL_BUILD)/libhb\"", + "\"$(EXTERNAL_BUILD)/contrib/lib\"", ); + PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; - name = debug.ppc64; - }; - 27B4DEDE0F65BABD00098046 /* debug.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_C_LANGUAGE_STANDARD = "compiler-default"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrakeCLI; - }; - name = debug.ppc64; - }; - 27B4DEDF0F65BABD00098046 /* debug.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = external; - }; - name = debug.ppc64; - }; - 27B4DEE00F65BABD00098046 /* debug.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = debug.ppc64; - }; - 27B4DEE10F65BABD00098046 /* debug.ppc64 */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = contrib; - }; - name = debug.ppc64; - }; - 27F143780F5DF34F00A684FF /* standard */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = external; - }; - name = standard; - }; - 27F143790F5DF34F00A684FF /* debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = external; - }; name = debug; }; - 27F1437F0F5DF36000A684FF /* standard */ = { + 273F205514ADBC210021BE6D /* release */ = { isa = XCBuildConfiguration; buildSettings = { - PRODUCT_NAME = contrib; - }; - name = standard; - }; - 27F143800F5DF36000A684FF /* debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = contrib; - }; - name = debug; - }; - 27F143860F5DF37600A684FF /* standard */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = standard; - }; - 27F143870F5DF37600A684FF /* debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = libhb; - }; - name = debug; - }; - 4D4E7BC1087804870051572B /* debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin; - IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources; - INFOPLIST_FILE = Info.plist; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef"; - INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h"; - INFOPLIST_PREPROCESS = YES; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", - ); - PRODUCT_NAME = HandBrake; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - }; - name = debug; - }; - 4D4E7BC2087804870051572B /* standard */ = { - isa = XCBuildConfiguration; - buildSettings = { - IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin; - IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources; - INFOPLIST_FILE = Info.plist; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef"; - INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h"; - INFOPLIST_PREPROCESS = YES; - OTHER_LDFLAGS = ( - "$(EXTERNAL_BUILD)/contrib/lib/libbluray.a", - "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", - "$(EXTERNAL_BUILD)/contrib/lib/libass.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavformat.a", - "$(EXTERNAL_BUILD)/contrib/lib/libavutil.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdca.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a", - "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfaac.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a", - "$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmkv.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libogg.a", - "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a", - "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a", - "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a", - "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a", - "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a", - "$(EXTERNAL_BUILD)/contrib/lib/libx264.a", - "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a", + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)\"", ); - PRODUCT_NAME = HandBrake; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", + HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; + INFOPLIST_FILE = "$(EXTERNAL_BUILD)/macosx/Info.plist"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(EXTERNAL_BUILD)/libhb\"", + "\"$(EXTERNAL_BUILD)/contrib/lib\"", ); + PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; - name = standard; + name = release; }; - 4D4E7BC5087804870051572B /* debug */ = { + 273F217214ADD2170021BE6D /* debug */ = { isa = XCBuildConfiguration; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; - CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 1; - EXTERNAL_METHOD = xcode; - EXTERNAL_SRC = ..; - FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; - HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; - IBC_NOTICES = NO; - IBC_WARNINGS = NO; - LIBRARY_SEARCH_PATHS = ( - "$(EXTERNAL_BUILD)/libhb", - "$(EXTERNAL_BUILD)/contrib/lib", - ); - OBJROOT = "$(EXTERNAL_BUILD)/macosx"; - SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache"; - STRIP_INSTALLED_PRODUCT = NO; - SYMROOT = "$(EXTERNAL_BUILD)/macosx"; + PRODUCT_NAME = external; }; name = debug; }; - 4D4E7BC6087804870051572B /* standard */ = { + 273F217314ADD2170021BE6D /* release */ = { isa = XCBuildConfiguration; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)"; - CONFIGURATION_TEMP_DIR = "$(SYMROOT)"; - EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)"; - EXTERNAL_JOBS = 1; - EXTERNAL_METHOD = xcode; - EXTERNAL_SRC = ..; - FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; - HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; - IBC_NOTICES = NO; - IBC_WARNINGS = NO; - LIBRARY_SEARCH_PATHS = ( - "$(EXTERNAL_BUILD)/libhb", - "$(EXTERNAL_BUILD)/contrib/lib", - ); - OBJROOT = "$(EXTERNAL_BUILD)/macosx"; - SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; - SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache"; - SYMROOT = "$(EXTERNAL_BUILD)/macosx"; + PRODUCT_NAME = external; }; - name = standard; + name = release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 0DFF0C0C0B6BCEE000549488 /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 0DFF0C0E0B6BCEE000549488 /* standard */, - 27B4DEB40F65BAB600098046 /* standard.i386 */, - 27B4DEBA0F65BAB700098046 /* standard.x86_64 */, - 27B4DEC00F65BAB800098046 /* standard.ppc */, - 27B4DEC60F65BAB900098046 /* standard.ppc64 */, - 0DFF0C0D0B6BCEE000549488 /* debug */, - 27B4DECC0F65BABC00098046 /* debug.i386 */, - 27B4DED20F65BABD00098046 /* debug.x86_64 */, - 27B4DED80F65BABD00098046 /* debug.ppc */, - 27B4DEDE0F65BABD00098046 /* debug.ppc64 */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = standard; - }; - 27F1438E0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "external" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 27F143780F5DF34F00A684FF /* standard */, - 27B4DEB50F65BAB600098046 /* standard.i386 */, - 27B4DEBB0F65BAB700098046 /* standard.x86_64 */, - 27B4DEC10F65BAB800098046 /* standard.ppc */, - 27B4DEC70F65BAB900098046 /* standard.ppc64 */, - 27F143790F5DF34F00A684FF /* debug */, - 27B4DECD0F65BABC00098046 /* debug.i386 */, - 27B4DED30F65BABD00098046 /* debug.x86_64 */, - 27B4DED90F65BABD00098046 /* debug.ppc */, - 27B4DEDF0F65BABD00098046 /* debug.ppc64 */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = standard; - }; - 27F1438F0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "contrib" */ = { + 273F1FE314AD9DA40021BE6D /* Build configuration list for PBXProject "HandBrake" */ = { isa = XCConfigurationList; buildConfigurations = ( - 27F1437F0F5DF36000A684FF /* standard */, - 27B4DEB70F65BAB600098046 /* standard.i386 */, - 27B4DEBD0F65BAB700098046 /* standard.x86_64 */, - 27B4DEC30F65BAB800098046 /* standard.ppc */, - 27B4DEC90F65BAB900098046 /* standard.ppc64 */, - 27F143800F5DF36000A684FF /* debug */, - 27B4DECF0F65BABC00098046 /* debug.i386 */, - 27B4DED50F65BABD00098046 /* debug.x86_64 */, - 27B4DEDB0F65BABD00098046 /* debug.ppc */, - 27B4DEE10F65BABD00098046 /* debug.ppc64 */, + 273F1FE614AD9DA40021BE6D /* debug */, + 273F1FE714AD9DA40021BE6D /* release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = standard; + defaultConfigurationName = release; }; - 27F143900F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "libhb" */ = { + 273F200714ADAE950021BE6D /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */ = { isa = XCConfigurationList; buildConfigurations = ( - 27F143860F5DF37600A684FF /* standard */, - 27B4DEB60F65BAB600098046 /* standard.i386 */, - 27B4DEBC0F65BAB700098046 /* standard.x86_64 */, - 27B4DEC20F65BAB800098046 /* standard.ppc */, - 27B4DEC80F65BAB900098046 /* standard.ppc64 */, - 27F143870F5DF37600A684FF /* debug */, - 27B4DECE0F65BABC00098046 /* debug.i386 */, - 27B4DED40F65BABD00098046 /* debug.x86_64 */, - 27B4DEDA0F65BABD00098046 /* debug.ppc */, - 27B4DEE00F65BABD00098046 /* debug.ppc64 */, + 273F200814ADAE950021BE6D /* debug */, + 273F200914ADAE950021BE6D /* release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = standard; + defaultConfigurationName = release; }; - 4D4E7BC0087804870051572B /* Build configuration list for PBXNativeTarget "HandBrake" */ = { + 273F205314ADBC210021BE6D /* Build configuration list for PBXNativeTarget "HandBrake" */ = { isa = XCConfigurationList; buildConfigurations = ( - 4D4E7BC2087804870051572B /* standard */, - 27B4DEB30F65BAB600098046 /* standard.i386 */, - 27B4DEB90F65BAB700098046 /* standard.x86_64 */, - 27B4DEBF0F65BAB800098046 /* standard.ppc */, - 27B4DEC50F65BAB900098046 /* standard.ppc64 */, - 4D4E7BC1087804870051572B /* debug */, - 27B4DECB0F65BABC00098046 /* debug.i386 */, - 27B4DED10F65BABD00098046 /* debug.x86_64 */, - 27B4DED70F65BABD00098046 /* debug.ppc */, - 27B4DEDD0F65BABD00098046 /* debug.ppc64 */, + 273F205414ADBC210021BE6D /* debug */, + 273F205514ADBC210021BE6D /* release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = standard; + defaultConfigurationName = release; }; - 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */ = { + 273F217114ADD2170021BE6D /* Build configuration list for PBXLegacyTarget "external" */ = { isa = XCConfigurationList; buildConfigurations = ( - 4D4E7BC6087804870051572B /* standard */, - 27B4DEB20F65BAB600098046 /* standard.i386 */, - 27B4DEB80F65BAB700098046 /* standard.x86_64 */, - 27B4DEBE0F65BAB800098046 /* standard.ppc */, - 27B4DEC40F65BAB900098046 /* standard.ppc64 */, - 4D4E7BC5087804870051572B /* debug */, - 27B4DECA0F65BABC00098046 /* debug.i386 */, - 27B4DED00F65BABD00098046 /* debug.x86_64 */, - 27B4DED60F65BABD00098046 /* debug.ppc */, - 27B4DEDC0F65BABD00098046 /* debug.ppc64 */, + 273F217214ADD2170021BE6D /* debug */, + 273F217314ADD2170021BE6D /* release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = standard; + defaultConfigurationName = release; }; /* End XCConfigurationList section */ }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; + rootObject = 273F1FE014AD9DA40021BE6D /* Project object */; } diff --git a/macosx/HandBrake.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/macosx/HandBrake.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..09ac05cf7 --- /dev/null +++ b/macosx/HandBrake.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Workspace + version = "1.0"> + <FileRef + location = "self:HandBrake.xcodeproj"> + </FileRef> +</Workspace> diff --git a/macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..08de0be8d --- /dev/null +++ b/macosx/HandBrake.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key> + <false/> +</dict> +</plist> diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme new file mode 100644 index 000000000..5546d5101 --- /dev/null +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + version = "1.3"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "YES"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "273F203814ADBC200021BE6D" + BuildableName = "HandBrake.app" + BlueprintName = "HandBrake" + ReferencedContainer = "container:HandBrake.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "273F1FFE14ADAE950021BE6D" + BuildableName = "HandBrakeCLI" + BlueprintName = "HandBrakeCLI" + ReferencedContainer = "container:HandBrake.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB" + shouldUseLaunchSchemeArgsEnv = "YES" + buildConfiguration = "debug"> + <Testables> + </Testables> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "273F203814ADBC200021BE6D" + BuildableName = "HandBrake.app" + BlueprintName = "HandBrake" + ReferencedContainer = "container:HandBrake.xcodeproj"> + </BuildableReference> + </MacroExpansion> + </TestAction> + <LaunchAction + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB" + launchStyle = "0" + useCustomWorkingDirectory = "NO" + buildConfiguration = "debug" + debugDocumentVersioning = "YES" + allowLocationSimulation = "YES"> + <BuildableProductRunnable> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "273F203814ADBC200021BE6D" + BuildableName = "HandBrake.app" + BlueprintName = "HandBrake" + ReferencedContainer = "container:HandBrake.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + <AdditionalOptions> + </AdditionalOptions> + </LaunchAction> + <ProfileAction + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + buildConfiguration = "debug" + debugDocumentVersioning = "YES"> + <BuildableProductRunnable> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "273F203814ADBC200021BE6D" + BuildableName = "HandBrake.app" + BlueprintName = "HandBrake" + ReferencedContainer = "container:HandBrake.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "debug"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "debug" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [RELEASE].xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [RELEASE].xcscheme new file mode 100644 index 000000000..9e49d740a --- /dev/null +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [RELEASE].xcscheme @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + version = "1.3"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "YES"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "273F203814ADBC200021BE6D" + BuildableName = "HandBrake.app" + BlueprintName = "HandBrake" + ReferencedContainer = "container:HandBrake.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "273F1FFE14ADAE950021BE6D" + BuildableName = "HandBrakeCLI" + BlueprintName = "HandBrakeCLI" + ReferencedContainer = "container:HandBrake.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB" + shouldUseLaunchSchemeArgsEnv = "YES" + buildConfiguration = "release"> + <Testables> + </Testables> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "273F203814ADBC200021BE6D" + BuildableName = "HandBrake.app" + BlueprintName = "HandBrake" + ReferencedContainer = "container:HandBrake.xcodeproj"> + </BuildableReference> + </MacroExpansion> + </TestAction> + <LaunchAction + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB" + launchStyle = "0" + useCustomWorkingDirectory = "NO" + buildConfiguration = "release" + debugDocumentVersioning = "YES" + allowLocationSimulation = "YES"> + <BuildableProductRunnable> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "273F203814ADBC200021BE6D" + BuildableName = "HandBrake.app" + BlueprintName = "HandBrake" + ReferencedContainer = "container:HandBrake.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + <AdditionalOptions> + </AdditionalOptions> + </LaunchAction> + <ProfileAction + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + buildConfiguration = "release" + debugDocumentVersioning = "YES"> + <BuildableProductRunnable> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "273F203814ADBC200021BE6D" + BuildableName = "HandBrake.app" + BlueprintName = "HandBrake" + ReferencedContainer = "container:HandBrake.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "release"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "release" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> diff --git a/macosx/Info.h.m4 b/macosx/Info.h.m4 deleted file mode 100644 index 39ff7ad64..000000000 --- a/macosx/Info.h.m4 +++ /dev/null @@ -1,14 +0,0 @@ -dnl -dnl This file is used by Xcode Packaging for Info.plist preprocessing. -dnl See Info.plist for how the values are used. -dnl -changequote(<<, >>)dnl -include(<<handbrake.m4>>)dnl -dnl -dnl -dnl -<<#>>define HB_PLIST_BUNDLEVERSION __HB_build -<<#>>define HB_PLIST_DISPLAYNAME __HB_name -<<#>>define HB_PLIST_GETINFOSTRING __HB_build -<<#>>define HB_PLIST_SHORTVERSIONSTRING __HB_version __BUILD_arch -<<#>>define HB_PLIST_SUFEEDURL __HB_url_appcast diff --git a/macosx/Info.plist b/macosx/Info.plist.m4 index a2e33cfb3..28d37c6d3 100644 --- a/macosx/Info.plist +++ b/macosx/Info.plist.m4 @@ -1,19 +1,27 @@ +dnl +dnl +dnl +changequote(<<, >>)dnl +include(<<handbrake.m4>>)dnl +dnl +dnl +dnl <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>CFBundleGetInfoString</key> - <string>HB_PLIST_GETINFOSTRING</string> <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleDisplayName</key> - <string>HB_PLIST_DISPLAYNAME</string> + <string>en</string> + <key>CFBundleDisplayName</key> + <string>__HB_name</string> <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> + <key>CFBundleGetInfoString</key> + <string>__HB_build</string> <key>CFBundleIconFile</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleIdentifier</key> - <string>org.m0k.handbrake</string> + <string>fr.handbrake.${PRODUCT_NAME:rfc1034identifier}</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> @@ -21,18 +29,21 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>HB_PLIST_SHORTVERSIONSTRING</string> + <string>__HB_version __BUILD_arch</string> <key>CFBundleSignature</key> - <string>HB##</string> + <string>????</string> <key>CFBundleVersion</key> - <string>HB_PLIST_BUNDLEVERSION</string> + <string>__HB_build</string> + <key>LSMinimumSystemVersion</key> + <string>${MACOSX_DEPLOYMENT_TARGET}</string> + <key>NSHumanReadableCopyright</key> + <string>Copyright © 2003-2012 __HB_name Developers. +All rights reserved.</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> <string>NSApplication</string> - <key>NSHumanReadableCopyright</key> - <string>© 2003-2011, HandBrake Developers</string> - <key>SUFeedURL</key> - <string>HB_PLIST_SUFEEDURL</string> + <key>SUFeedURL</key> + <string>__HB_url_appcast</string> </dict> </plist> diff --git a/macosx/module.defs b/macosx/module.defs index d92160f93..ff1dff762 100644 --- a/macosx/module.defs +++ b/macosx/module.defs @@ -7,22 +7,6 @@ MACOSX.build/ = $(BUILD/)macosx/ MACOSX.m4.in = $(wildcard $(MACOSX.src/)*.m4) MACOSX.m4.out = $(MACOSX.m4.in:$(MACOSX.src/)%.m4=$(MACOSX.build/)%) -## optional special command to run post macro processing -MACOSX.m4.post.Info.h = $(RM.exe) -f $(MACOSX.build/)HandBrake.build/Preprocessed-Info.plist - -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)).$(BUILD.arch) - -## this is a mapping to determine which basename config to use in xcodeproj -MACOSX.map.g.none = standard -MACOSX.map.g.min = debug -MACOSX.map.g.std = debug -MACOSX.map.g.max = debug - ############################################################################### BUILD.out += $(MACOSX.m4.out) @@ -30,8 +14,20 @@ BUILD.out += $(MACOSX.m4.wc.out) ############################################################################### -MACOSX.XCODE.exe = xcodebuild -MACOSX.XCODE.project = HandBrake.xcodeproj +MACOSX.project = -project $(MACOSX.src/)HandBrake.xcodeproj + +## configuration: must be one of { release, debug } +MACOSX.configuration = -configuration $(MACOSX.map.g.$(MACOSX.GCC.g)) + +## mapping from symbolic debug value to xcode configuration +MACOSX.map.g.none = release +MACOSX.map.g.min = debug +MACOSX.map.g.std = debug +MACOSX.map.g.max = debug + +## xcconfig: must be one of macosx/xcconfig/*.xcconfig +MACOSX.xcconfig = $(foreach x,$(XCODE.xcconfig),-xcconfig $(MACOSX.src/)xcconfig/$(x)) +MACOSX.sdk = $(foreach sdk,$(GCC.sysroot),-sdk $(sdk)) ## launch a build thru xcode; which in turn will do a nested make against ## this build system with normal build rules enabled. @@ -39,20 +35,23 @@ 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) \ + $(XCODEBUILD.exe) \ + $(MACOSX.project) \ $(foreach t,$(1),-target $t) \ - EXTERNAL_SRC='$(XCODE.external.src)' \ - EXTERNAL_BUILD='$(XCODE.external.build)' \ - EXTERNAL_PREFIX='$(XCODE.external.prefix)' \ - EXTERNAL_JOBS='$(BUILD.jobs)' \ - EXTERNAL_METHOD='$(CONF.method)' \ - EXTERNAL_CONFARGS='$(CONF.args)' \ + $(MACOSX.configuration) \ + $(MACOSX.xcconfig) \ + \ + SYMROOT='$(XCODE.symroot)' \ + CONFIGURATION_BUILD_DIR='$(XCODE.symroot)' \ + CONFIGURATION_TEMP_DIR='$(XCODE.symroot)' \ + \ + EXTERNAL_BUILD='$(abspath $(BUILD))' \ + EXTERNAL_CONF_ARGS='$(CONF.args)' \ + EXTERNAL_DRIVER='$(XCODE.driver)' \ EXTERNAL_GOALS='$(3)' \ + EXTERNAL_JOBS='$(BUILD.jobs)' \ EXTERNAL_VARS='$(-*-command-variables-*-)' \ + \ $(2) ) diff --git a/macosx/module.rules b/macosx/module.rules index c6623649c..6ee6c0019 100644 --- a/macosx/module.rules +++ b/macosx/module.rules @@ -9,7 +9,6 @@ $(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.m4.post.$(notdir $@)) ############################################################################### diff --git a/macosx/module.xcode b/macosx/module.xcodebuild index fc52b365e..26b34a9cb 100644 --- a/macosx/module.xcode +++ b/macosx/module.xcodebuild @@ -1,6 +1,4 @@ -## This rules file is processed only when xcode=1 method=terminal -## which hands-off the build to Xcode which in turn may callback this -## build system. +## This file is processed only when shunting build through xcodebuild .PHONY: macosx.build macosx.clean macosx.install diff --git a/macosx/xcconfig/base/arch.i386.xcconfig b/macosx/xcconfig/base/arch.i386.xcconfig new file mode 100644 index 000000000..8f2cab54b --- /dev/null +++ b/macosx/xcconfig/base/arch.i386.xcconfig @@ -0,0 +1 @@ +ARCHS = i386 diff --git a/macosx/xcconfig/base/arch.native.xcconfig b/macosx/xcconfig/base/arch.native.xcconfig new file mode 100644 index 000000000..deda7892e --- /dev/null +++ b/macosx/xcconfig/base/arch.native.xcconfig @@ -0,0 +1 @@ +ARCHS = $(NATIVE_ARCH_ACTUAL) diff --git a/macosx/xcconfig/base/arch.x86_64.xcconfig b/macosx/xcconfig/base/arch.x86_64.xcconfig new file mode 100644 index 000000000..1d72e614a --- /dev/null +++ b/macosx/xcconfig/base/arch.x86_64.xcconfig @@ -0,0 +1 @@ +ARCHS = x86_64 diff --git a/macosx/xcconfig/base/os.osx106.xcconfig b/macosx/xcconfig/base/os.osx106.xcconfig new file mode 100644 index 000000000..c7f502a57 --- /dev/null +++ b/macosx/xcconfig/base/os.osx106.xcconfig @@ -0,0 +1,2 @@ +SDKROOT = macosx10.6 +MACOSX_DEPLOYMENT_TARGET = 10.6 diff --git a/macosx/xcconfig/base/os.osx107.xcconfig b/macosx/xcconfig/base/os.osx107.xcconfig new file mode 100644 index 000000000..6dfd2d540 --- /dev/null +++ b/macosx/xcconfig/base/os.osx107.xcconfig @@ -0,0 +1,2 @@ +SDKROOT = macosx10.7 +MACOSX_DEPLOYMENT_TARGET = 10.7 diff --git a/macosx/xcconfig/native.xcconfig b/macosx/xcconfig/native.xcconfig new file mode 100644 index 000000000..d88c8c44f --- /dev/null +++ b/macosx/xcconfig/native.xcconfig @@ -0,0 +1,2 @@ +#include "base/arch.native.xcconfig" +EXTERNAL_XCCONFIG = native diff --git a/macosx/xcconfig/osx106.i386.xcconfig b/macosx/xcconfig/osx106.i386.xcconfig new file mode 100644 index 000000000..1f0edd35a --- /dev/null +++ b/macosx/xcconfig/osx106.i386.xcconfig @@ -0,0 +1,3 @@ +#include "base/os.osx106.xcconfig" +#include "base/arch.i386.xcconfig" +EXTERNAL_XCCONFIG = osx106.i386 diff --git a/macosx/xcconfig/osx106.x86_64.xcconfig b/macosx/xcconfig/osx106.x86_64.xcconfig new file mode 100644 index 000000000..cc9606ef7 --- /dev/null +++ b/macosx/xcconfig/osx106.x86_64.xcconfig @@ -0,0 +1,3 @@ +#include "base/os.osx106.xcconfig" +#include "base/arch.x86_64.xcconfig" +EXTERNAL_XCCONFIG = osx106.x86_64 diff --git a/macosx/xcconfig/osx107.i386.xcconfig b/macosx/xcconfig/osx107.i386.xcconfig new file mode 100644 index 000000000..6b19b287b --- /dev/null +++ b/macosx/xcconfig/osx107.i386.xcconfig @@ -0,0 +1,3 @@ +#include "base/os.osx107.xcconfig" +#include "base/arch.i386.xcconfig" +EXTERNAL_XCCONFIG = osx107.i386 diff --git a/macosx/xcconfig/osx107.x86_64.xcconfig b/macosx/xcconfig/osx107.x86_64.xcconfig new file mode 100644 index 000000000..d1c434e45 --- /dev/null +++ b/macosx/xcconfig/osx107.x86_64.xcconfig @@ -0,0 +1,3 @@ +#include "base/os.osx107.xcconfig" +#include "base/arch.x86_64.xcconfig" +EXTERNAL_XCCONFIG = osx107.x86_64 diff --git a/make/configure.py b/make/configure.py index 5e61b6e5a..3e6fb81b5 100644 --- a/make/configure.py +++ b/make/configure.py @@ -8,6 +8,7 @@ ############################################################################### import fnmatch +import glob import optparse import os import platform @@ -99,12 +100,6 @@ class Configure( object ): cfg.infof( 'compute: makevar BUILD/ = %s\n', self.build_final ) cfg.infof( 'compute: makevar PREFIX/ = %s\n', self.prefix_final ) - ## xcode does a chdir so we need appropriate values - macosx = os.path.join( self.src_dir, 'macosx' ) - self.xcode_x_src = self._final_dir( macosx, self.src_dir ) - self.xcode_x_build = self._final_dir( macosx, self.build_dir ) - self.xcode_x_prefix = self._final_dir( macosx, self.prefix_dir ) - ## perform chdir and enable log recording def chdir( self ): if os.path.abspath( self.build_dir ) == os.path.abspath( self.src_dir ): @@ -402,8 +397,10 @@ class LDProbe( Action ): ## ## example results from various platforms: ## -## i386-apple-darwin9.6.0 (Mac OS X 10.5.6 Intel) ## powerpc-apple-darwin9.6.0 (Mac OS X 10.5.6 PPC) +## i386-apple-darwin9.6.0 (Mac OS X 10.5.6 Intel) +## x86_64-apple-darwin10.8.0 (Mac OS X 10.6.8 Intel) +## x86_64-apple-darwin11.2.0 (Mac OS X 10.7.2 Intel) ## i686-pc-cygwin (Cygwin, Microsoft Vista) ## x86_64-unknown-linux-gnu (Linux, Fedora 10 x86_64) ## @@ -553,6 +550,9 @@ class ArchAction( Action ): ## some match on system should be made here; otherwise we signal a warning. if host.match( '*-*-cygwin*' ): pass + elif host.match( '*-*-darwin11.*' ): + self.mode['i386'] = 'i386-apple-darwin%s' % (host.release) + self.mode['x86_64'] = 'x86_64-apple-darwin%s' % (host.release) elif host.match( '*-*-darwin*' ): self.mode['i386'] = 'i386-apple-darwin%s' % (host.release) self.mode['x86_64'] = 'x86_64-apple-darwin%s' % (host.release) @@ -628,20 +628,24 @@ class CoreProbe( Action ): class SelectMode( dict ): def __init__( self, descr, *modes, **kwargs ): super( SelectMode, self ).__init__( modes ) - self.descr = descr - self.modes = modes - self.default = kwargs.get('default',modes[0][0]) - self.mode = self.default + self.descr = descr + self.modes = modes + self.what = kwargs.get('what',' mode') + if modes: + self.default = kwargs.get('default',modes[0][0]) + else: + self.default = None + self.mode = self.default def cli_add_option( self, parser, option ): parser.add_option( option, default=self.mode, metavar='MODE', - help='select %s mode: %s' % (self.descr,self.toString()), + help='select %s%s: %s' % (self.descr,self.what,self.toString()), action='callback', callback=self.cli_callback, type='str' ) def cli_callback( self, option, opt_str, value, parser, *args, **kwargs ): if value not in self: - raise optparse.OptionValueError( 'invalid %s mode: %s (choose from %s)' - % (self.descr,value,self.toString( True )) ) + raise optparse.OptionValueError( 'invalid %s%s: %s (choose from: %s)' + % (self.descr,self.what,value,self.toString( True )) ) self.mode = value def toString( self, nodefault=False ): @@ -671,7 +675,23 @@ class SelectMode( dict ): ## class RepoProbe( ShellProbe ): def __init__( self ): - super( RepoProbe, self ).__init__( 'svn info', 'svn info %s' % (cfg.src_dir) ) + svn = 'svn' + + ## Possible the repo was created using an incompatible version than what is + ## available in PATH when probe runs. Workaround by checking for file + ## .svn/HANDBRAKE_REPO_PROBE which points to a preferred svn executable. + try: + hrp = os.path.join( cfg.src_dir, '.svn', 'HANDBRAKE_REPO_PROBE' ) + if os.path.isfile( hrp ) and os.path.getsize( hrp ) > 0: + file = cfg.open( hrp, 'r' ) + line = file.readline().strip() + file.close() + if line: + svn = line + except: + pass + + super( RepoProbe, self ).__init__( 'svn info', '%s info %s' % (svn,cfg.src_dir) ) self.url = 'svn://nowhere.com/project/unknown' self.root = 'svn://nowhere.com/project' @@ -865,7 +885,7 @@ class SelectTool( Action ): self.run() break if not found: - raise optparse.OptionValueError( 'invalid %s mode: %s (choose from %s)' + raise optparse.OptionValueError( 'invalid %s mode: %s (choose from: %s)' % (self.name,value,self.toString( True )) ) def doc_add( self, doc ): @@ -1003,8 +1023,8 @@ class Option( optparse.Option ): conf_args = [] def _conf_record( self, opt, value ): - ## skip conf,force,launch - if re.match( '^--(conf|force|launch).*$', opt ): + ## filter out non-applicable options + if re.match( '^--(force|launch).*$', opt ): return ## remove duplicates (last duplicate wins) @@ -1030,13 +1050,13 @@ def createCLI(): cli.description += 'Configure %s build system.' % (project.name) ## add hidden options - cli.add_option( '--conf-method', default='terminal', action='store', help=optparse.SUPPRESS_HELP ) + cli.add_option( '--xcode-driver', default='bootstrap', action='store', help=optparse.SUPPRESS_HELP ) cli.add_option( '--force', default=False, action='store_true', help='overwrite existing build config' ) cli.add_option( '--verbose', default=False, action='store_true', help='increase verbosity' ) ## add install options grp = OptionGroup( cli, 'Directory Locations' ) - h = IfHost( 'specify sysroot (e.g. for Leopard builds from Snow Leapard)', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value + h = IfHost( 'specify sysroot of SDK for Xcode builds', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value grp.add_option( '--sysroot', default=None, action='store', metavar='DIR', help=h ) grp.add_option( '--src', default=cfg.src_dir, action='store', metavar='DIR', @@ -1064,9 +1084,6 @@ def createCLI(): h = IfHost( 'enable use of ffmpeg mpeg2 decoding', '*-*-*', none=optparse.SUPPRESS_HELP ).value grp.add_option( '--enable-ff-mpeg2', default=False, action='store_true', help=h ) - h = IfHost( 'disable Xcode', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value - grp.add_option( '--disable-xcode', default=False, action='store_true', help=h ) - cli.add_option_group( grp ) ## add launch options @@ -1088,7 +1105,7 @@ def createCLI(): arch.mode.cli_add_option( grp, '--arch' ) grp.add_option( '--cross', default=None, action='store', metavar='SPEC', help='specify GCC cross-compilation spec' ) - h = IfHost( 'Min OS X Version', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value + h = IfHost( 'specify Mac OS X deployment target for Xcode builds', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value grp.add_option( '--minver', default=None, action='store', metavar='VER', help=h ) @@ -1097,6 +1114,16 @@ def createCLI(): cli.add_option_group( grp ) + ## add Xcode options + if host.match( '*-*-darwin*' ): + grp = OptionGroup( cli, 'Xcode Options' ) + grp.add_option( '--disable-xcode', default=False, action='store_true', + help='disable Xcode' ) + grp.add_option( '--xcode-symroot', default='xroot', action='store', metavar='DIR', + help='specify root of the directory hierarchy that contains product files and intermediate build files' ) + xcconfigMode.cli_add_option( grp, '--xcode-config' ) + cli.add_option_group( grp ) + ## add tool locations grp = OptionGroup( cli, 'Tool Basenames and Locations' ) for tool in ToolProbe.tools: @@ -1266,6 +1293,19 @@ try: debugMode = SelectMode( 'debug', ('none','none'), ('min','min'), ('std','std'), ('max','max') ) optimizeMode = SelectMode( 'optimize', ('none','none'), ('speed','speed'), ('size','size'), default='speed' ) + ## find xcconfig values + xcconfigMode = SelectMode( 'xcconfig', ('none',None), what='' ) + if host.match( '*-*-darwin*' ): + for xc in glob.glob( os.path.join(cfg.dir, '../macosx/xcconfig/*.xcconfig') ): + bname = os.path.basename( xc ) + xname = os.path.splitext( bname ) + if xname and xname[0]: + xcconfigMode[xname[0]] = bname + if not 'native' in xcconfigMode: + raise Exception( 'native xcconfig not found' ) + xcconfigMode.default = 'native' + xcconfigMode.mode = xcconfigMode.default + ## create CLI and parse cli = createCLI() (options,args) = cli.parse_args() @@ -1294,6 +1334,10 @@ try: for action in Action.actions: action.run() + ## enable local yasm when yasm probe fails + if Tools.yasm.fail and not options.enable_local_yasm: + options.enable_local_yasm = True + if build.system == 'mingw': dlfcn_test = """ #include <dlfcn.h> @@ -1437,20 +1481,16 @@ int main () doc.add( 'BUILD.ncpu', core.count ) doc.add( 'BUILD.jobs', core.jobs ) - doc.add( 'BUILD.cross', int(options.cross != None or arch.mode.mode != arch.mode.default) ) + doc.add( 'BUILD.cross', int(options.cross != None or arch.mode.mode != arch.mode.default) ) if options.cross: doc.add( 'BUILD.cross.prefix', '%s-' % (options.cross) ) else: doc.add( 'BUILD.cross.prefix', '' ) - doc.add( 'BUILD.method', 'terminal' ) doc.add( 'BUILD.date', time.strftime('%c') ) doc.add( 'BUILD.arch', arch.mode.mode ) doc.addBlank() - doc.add( 'CONF.method', options.conf_method ) - - doc.addBlank() doc.add( 'SRC', cfg.src_final ) doc.add( 'SRC/', cfg.src_final + os.sep ) doc.add( 'BUILD', cfg.build_final ) @@ -1460,22 +1500,25 @@ int main () doc.addBlank() doc.add( 'FEATURE.local_yasm', int( options.enable_local_yasm ) ) - doc.add( 'FEATURE.asm', 'disabled' ) - doc.add( 'FEATURE.gtk', int( not options.disable_gtk )) - doc.add( 'FEATURE.gtk.update.checks', int( not options.disable_gtk_update_checks )) - doc.add( 'FEATURE.gtk.mingw', int( options.enable_gtk_mingw )) - doc.add( 'FEATURE.gst', int( not options.disable_gst )) + doc.add( 'FEATURE.asm', 'disabled' ) + doc.add( 'FEATURE.gtk', int( not options.disable_gtk )) + doc.add( 'FEATURE.gtk.update.checks', int( not options.disable_gtk_update_checks )) + doc.add( 'FEATURE.gtk.mingw', int( options.enable_gtk_mingw )) + doc.add( 'FEATURE.gst', int( not options.disable_gst )) doc.add( 'FEATURE.ff.mpeg2', int( options.enable_ff_mpeg2 )) - doc.add( 'FEATURE.xcode', int( not (Tools.xcodebuild.fail or options.disable_xcode or options.cross) )) + doc.add( 'FEATURE.xcode', int( not (Tools.xcodebuild.fail or options.disable_xcode or options.cross) )) if not Tools.xcodebuild.fail and not options.disable_xcode: doc.addBlank() - doc.add( 'XCODE.external.src', cfg.xcode_x_src ) - doc.add( 'XCODE.external.build', cfg.xcode_x_build ) - doc.add( 'XCODE.external.prefix', cfg.xcode_x_prefix ) + doc.add( 'XCODE.driver', options.xcode_driver ) + if os.path.isabs(options.xcode_symroot): + doc.add( 'XCODE.symroot', options.xcode_symroot ) + else: + doc.add( 'XCODE.symroot', os.path.abspath(os.path.join(cfg.build_dir,options.xcode_symroot)) ) + doc.add( 'XCODE.xcconfig', xcconfigMode[xcconfigMode.mode] ) - doc.addBlank() if build.system == 'mingw': + doc.addBlank() if not dlfcn.fail: doc.add( 'HAS.dlfcn', 1 ) if not pthread.fail: @@ -1513,8 +1556,6 @@ int main () doc.add( 'GCC.archs', '' ) doc.add( 'GCC.sysroot', '' ) doc.add( 'GCC.minver', '' ) - doc.add( 'GCC.ldsysroot', '$(GCC.sysroot)' ) - doc.add( 'GCC.ldminver', '$(GCC.minver)' ) if options.enable_asm and ( not Tools.yasm.fail or options.enable_local_yasm ): asm = '' diff --git a/make/include/gcc.defs b/make/include/gcc.defs index c93d0babd..50b31f100 100644 --- a/make/include/gcc.defs +++ b/make/include/gcc.defs @@ -1,5 +1,5 @@ GCC.gcc = gcc -GCC.gxx = $(dir $(GCC.gcc))$(subst gcc,g++,$(notdir $(GCC.gcc))) +GCC.gxx = $(dir $(GCC.gcc))$(subst clang,clang++,$(subst gcc,g++,$(notdir $(GCC.gcc)))) GCC.strip = $$(if $$(filter none,$$(GCC.g)),1) GCC.dylib = 1 @@ -9,9 +9,7 @@ GCC.H = 0 GCC.W = all GCC.archs = GCC.sysroot = -GCC.ldsysroot = GCC.minver = -GCC.ldminver= GCC.vis = 0 GCC.pic = 0 ifndef GCC.g @@ -49,9 +47,7 @@ GCC.args.H = -H GCC.args.W = -W$(1) GCC.args.archs = -arch $(1) GCC.args.sysroot = --sysroot=$(1) -GCC.args.ldsysroot = -syslibroot $(1) GCC.args.minver = -mmacosx-version-min=$(1) -GCC.args.ldminver = -macosx_version_min $(1) GCC.args.vis = -fvisibility=hidden GCC.args.pic = -fPIC GCC.args.g.none = -g0 @@ -95,9 +91,7 @@ define import.GCC $(1).GCC.W = $$(GCC.W) $(1).GCC.archs = $$(GCC.archs) $(1).GCC.sysroot = $$(GCC.sysroot) - $(1).GCC.ldsysroot = $$(GCC.ldsysroot) $(1).GCC.minver = $$(GCC.minver) - $(1).GCC.ldminver = $$(GCC.ldminver) $(1).GCC.vis = $$(GCC.vis) $(1).GCC.pic = $$(GCC.pic) $(1).GCC.g = $$(GCC.g) @@ -131,9 +125,7 @@ define import.GCC $(1).GCC.args.W = $$(GCC.args.W) $(1).GCC.args.archs = $$(GCC.args.archs) $(1).GCC.args.sysroot = $$(GCC.args.sysroot) - $(1).GCC.args.ldsysroot = $$(GCC.args.ldsysroot) $(1).GCC.args.minver = $$(GCC.args.minver) - $(1).GCC.args.ldminver = $$(GCC.args.ldminver) $(1).GCC.args.vis = $$(GCC.args.vis) $(1).GCC.args.pic = $$(GCC.args.pic) $(1).GCC.args.g.none = $$(GCC.args.g.none) diff --git a/make/include/main.rules b/make/include/main.rules index 5a8d8acfb..158f24a9c 100644 --- a/make/include/main.rules +++ b/make/include/main.rules @@ -3,10 +3,9 @@ ############################################################################### -## file-wide conditional to use xcode rules if xcode=1 method=terminal -## xcodemake will set BUILD.method != terminal to prevent infinite recursion -ifeq (1:terminal,$(FEATURE.xcode):$(BUILD.method)) - include $(SRC/)macosx/module.xcode +## shunt make through xcodebuild when FEATURE.xcode=1 and XCODE.driver is applicable +ifeq (1:shunt,$(FEATURE.xcode):$(if $(filter bootstrap terminal,$(XCODE.driver)),shunt)) + include $(SRC/)macosx/module.xcodebuild else ## only included using special report targets @@ -40,19 +39,15 @@ include $(MODULES:%=$(SRC/)%/module.rules) ############################################################################### -## target which causes re-configure if project-root is svn update'd -$(BUILD/)GNUmakefile: $(wildcard $(SRC/).svn/entries) - $(SRC/)configure --force --conf-method=$(CONF.method) $(CONF.args) - -## target useful to force reconfigure; only helpful for build-system development +## force reconfigure .PHONY: reconfigure reconfigure: - $(SRC/)configure --force --conf-method=$(CONF.method) $(CONF.args) + $(SRC/)configure --force $(CONF.args) ############################################################################### -## target to build all dependency dirs +## build all dependency dirs $(sort $(dir $(BUILD.out))): $(MKDIR.exe) -p $@ -endif ## xcode=1 method=terminal +endif ## FEATURE.xcode XCODE.driver diff --git a/make/test/build.matrix b/make/test/build.matrix new file mode 100755 index 000000000..70d07445b --- /dev/null +++ b/make/test/build.matrix @@ -0,0 +1,156 @@ +#!/usr/bin/env ruby1.9 + +## This script is used to launch a wide variety of builds for darwin. +## It is unsupported and is meant for use only with build-system testing. + +require 'pathname' +require 'thread' + +################################################################################ + +class Printer < Mutex + def p(*args) + synchronize { super } + end + + def puts(*args) + synchronize { super } + end +end + +$out = Printer.new + +################################################################################ + +class Build + def initialize(debug, xcconfig, method) + @debug = debug + @xcconfig = xcconfig + @method = method + if @xcconfig + @dir = '_matrix.%s.%s.%s' % [@debug[0], @xcconfig, @method] + else + @dir = '_matrix.%s.%s' % [@debug[0], @method] + end + @configure = [] + @make = [] + end + + def doit + p = Pathname.new(@dir) + return if p.exist? + p.mkdir + + @configure[0..0] += @debug[1].split + @configure[0..0] += ["--build=#{@dir}"] + @configure << ('--xcode-config=%s' % [@xcconfig]) if @xcconfig + + if [email protected]? + @make[0..0] += ['-C', @dir] + end + + if [email protected]? + return if !run(@configure) + end + if [email protected]? + return if !run(@make, true) + end + end + +private + def run(args, append=false) + s = args.join(' ') + $out.puts s + return Kernel.system('%s %s %s/matrix.log 2>&1' % [s, append ? '>>' : '>', @dir]) + end +end + +################################################################################ + +class BuildTerminal < Build + def initialize(debug, xcconfig) + super(debug, xcconfig, 'term_make') + @configure += './configure --force --disable-xcode'.split + @make += 'make BUILD.jobs=1'.split + end +end + +class BuildLaunch < Build + def initialize(debug, xcconfig) + super(debug, xcconfig, 'launch_make') + @configure += './configure --force --launch --launch-jobs=1 --disable-xcode'.split + end +end + +class BuildTerminalXcode < Build + def initialize(debug, xcconfig) + super(debug, xcconfig, 'term_xcode') + @configure += './configure --force'.split + @make += 'make BUILD.jobs=1'.split + end +end + +class BuildLaunchXcode < Build + def initialize(debug, xcconfig) + super(debug, xcconfig, 'launch_xcode') + @configure += './configure --force --launch --launch-jobs=1'.split + end +end + +################################################################################ + +## probe ncpu +begin + case + when RUBY_PLATFORM =~ /darwin/ + workload = `sysctl -n hw.activecpu 2>/dev/null`[0].to_i + end +rescue + workload = 1 +end + +## create work queue +queue = Queue.new + +## create xcconfig list +xclist = [] +case +when RUBY_PLATFORM =~ /darwin11/ + xclist += 'native osx106.i386 osx106.x86_64 osx107.i386 osx107.x86_64'.split +when RUBY_PLATFORM =~ /darwin10/ + xclist += 'native osx106.i386 osx106.x86_64'.split +end + +## fill queue +[['release',''],['debug','--debug=max --optimize=none']].each do |debug| + [BuildTerminal, BuildLaunch].each do |kind| + queue << kind.new(debug, nil) + end + [BuildTerminalXcode, BuildLaunchXcode].each do |kind| + xclist.each do |xcconfig| + queue << kind.new(debug, xcconfig) + end + end +end + +## process queue +workers = (1..workload).map do |i| + queue << :finish + Thread.new() do |worker| + loop do + item = queue.pop + break if item == :finish + + begin + item.doit + rescue SystemExit + break + rescue + puts 'whups' + end + end + end +end + +## wait for all workers to finish +workers.each(&:join) diff --git a/make/test/build.matrix.darwin b/make/test/build.matrix.darwin deleted file mode 100755 index 7620707b5..000000000 --- a/make/test/build.matrix.darwin +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# - -## This script is used to launch a wide variety of builds for darwin. -## It is unsupported and is meant for use only with build-system testing. - -if [ -z "$1" ]; then - echo "usage: $0 BUILDPREFIX" - exit 1 -fi - -set -e -buildprefix=$1 - -term_make() { - eval $1="make" - eval $2="'--disable-xcode'" -} - -term_xcode() { - eval $1="make" - eval $2="" -} - -launch_make() { - eval $1="launch" - eval $2="'--launch --launch-jobs=0 --launch-quiet --disable-xcode'" -} - -launch_xcode() { - eval $1="launch" - eval $2="'--launch --launch-jobs=0 --launch-quiet'" -} - -for debug in none max; do -for arch in i386 ppc ppc64 x86_64; do - for method in launch_make launch_xcode term_make term_xcode; do - dir=$buildprefix.$arch.$debug.$method - if [ -d $dir ]; then - echo "skipping $dir" - continue - fi - - $method mode args - - cmd="./configure --arch=$arch --debug=$debug --build=$dir $args" - echo $cmd | awk '{ \ - trail = ""; \ - for( i = 4; i <= NF; i++ ) \ - trail = trail " " $i; \ - printf("%-11s %-13s %-30s%s\n", $1, $2, $3, trail) }' - - $cmd - if [ "$mode" = "make" ]; then - (set -x; cd $dir && make -j8 >& log/build.txt) - fi - done -done -done diff --git a/make/variant/darwin.defs b/make/variant/darwin.defs index 4c9d06bb2..755bcb571 100644 --- a/make/variant/darwin.defs +++ b/make/variant/darwin.defs @@ -1,9 +1,10 @@ -UB.archs = i386 x86_64 ppc ppc64 -UB.builds = $(wildcard $(foreach n,$(UB.archs),$(SRC/)build.$n)) -UB.first = $(word 1,$(UB.archs)) -UB.other = $(wordlist 2,999,$(UB.archs)) +UB.xcconfigs = osx106.i386 osx106.x86_64 +UB.builds = $(wildcard $(foreach n,$(UB.xcconfigs),$(SRC/)build.$n)) +UB.first = $(word 1,$(UB.xcconfigs)) +UB.more = $(wordlist 2,999,$(UB.xcconfigs)) +UB.products/ = macosx/release/ -UB.BUILD = $(SRC/)configure --force --build=ub.$(1) --arch=$(1) --launch --launch-quiet +UB.BUILD = $(SRC/)configure --force --build=ub.$(1) --xcconfig=$(1) --launch --launch-quiet ## linefeed is important define UB.BUILD.item @@ -12,7 +13,7 @@ define UB.BUILD.item endef define UB.BUILD.SERIAL - $(foreach n,$(UB.archs),$(call UB.BUILD.item,$n)) + $(foreach n,$(UB.xcconfigs),$(call UB.BUILD.item,$n)) endef define UB.BUILD.PARALLEL @@ -22,16 +23,16 @@ endef define UB.COMBINE $(RM.exe) -fr ub.combine $(MKDIR.exe) -p ub.combine - $(CP.exe) ub.$(UB.first)/HandBrakeCLI ub.combine/. - $(LIPO.exe) $(foreach n,$(UB.archs),ub.$n/HandBrakeCLI) -create -output ub.combine/HandBrakeCLI - $(CP.exe) -R ub.$(UB.first)/HandBrake.app ub.combine/. - $(LIPO.exe) $(foreach n,$(UB.archs),ub.$n/$(1)) -create -output ub.combine/$(1) + $(CP.exe) ub.$(UB.first)/$(UB.products/)HandBrakeCLI ub.combine/. + $(LIPO.exe) $(foreach n,$(UB.xcconfigs),ub.$n/$(UB.products/)HandBrakeCLI) -create -output ub.combine/HandBrakeCLI + $(CP.exe) -R ub.$(UB.first)/$(UB.products/)HandBrake.app ub.combine/. + $(LIPO.exe) $(foreach n,$(UB.xcconfigs),ub.$n/$(UB.products/)$(1)) -create -output ub.combine/$(1) @lipo -info ub.combine/$(1) @sync @echo "" - @echo "$@: { $(UB.archs) } combined -> ub.combine/HandBrakeCLI" + @echo "$@: { $(UB.xcconfigs) } combined -> ub.combine/HandBrakeCLI" @echo "$@: UB executable size: `du -sh ub.combine/HandBrakeCLI | awk '{ print $$1 }'`" @echo "" - @echo "$@: { $(UB.archs) } combined -> ub.combine/HandBrake.app" + @echo "$@: { $(UB.xcconfigs) } combined -> ub.combine/HandBrake.app" @echo "$@: UB executable size: `du -sh ub.combine/$(1) | awk '{ print $$1 }'`" endef diff --git a/make/variant/darwin.rules b/make/variant/darwin.rules index d59a222b4..cd0d1ade9 100644 --- a/make/variant/darwin.rules +++ b/make/variant/darwin.rules @@ -1,14 +1,16 @@ .PHONY: ub.build ub.combine ub.clean +ub.build: ub.build.serial + ub.build.serial: @$(UB.BUILD.SERIAL) ub.build.parallel: @set -e; \ - for arch in $(UB.archs); do \ - $(call UB.BUILD.PARALLEL,$$arch) & \ + for xcconfig in $(UB.xcconfigs); do \ + $(call UB.BUILD.PARALLEL,$$xcconfig) & \ children="$$children $$!"; \ - echo "pid $$!: $(call UB.BUILD.PARALLEL,$$arch)"; \ + echo "pid $$!: $(call UB.BUILD.PARALLEL,$$xcconfig)"; \ done; \ echo "waiting for background jobs to complete:$$children"; \ wait @@ -16,5 +18,5 @@ ub.build.parallel: ub.combine: $(call UB.COMBINE,HandBrake.app/Contents/MacOS/HandBrake) -ub.clean: - $(RM.EXE) -fr $(foreach n,$(UB.archs.other),ub.$n) +#ub.clean: +# $(RM.exe) -fr $(foreach n,$(UB.archs.other),ub.$n) diff --git a/make/xcodemake b/make/xcodemake index 93c927c96..b4b6bad94 100755 --- a/make/xcodemake +++ b/make/xcodemake @@ -3,34 +3,95 @@ set -e -## This script is invoked by Xcode external targets. +## This script is initiated by either xcodebuild or Xcode.app. ## -## We must guarantee no jobserver is passed through since the file-descriptors -## have been clobbered by Xcode. If this is not done then make behaves as if -## it is allowed to run an infinite number of jobs. +## We must guarantee no jobserver is passed through since file-descriptors are +## clobbered by Xcode. If this is not done then make allows unlimited jobs. ## MAKEFLAGS= MFLAGS= -## sanity check - the build system only supports 1 arch at a time +## validate environment +case "$EXTERNAL_DRIVER" in +bootstrap) ;; ## bootstrapping from terminal +terminal) ;; ## building from terminal +xcode) ;; ## building from Xcode.app +*) + echo "ERROR: unexpected value for EXTERNAL_DRIVER: $EXTERNAL_DRIVER" + exit 1 + ;; +esac + +## validate environment +for name in EXTERNAL_BUILD EXTERNAL_JOBS EXTERNAL_SRC; do + eval v="\$$name" + if [ -z "$v" ]; then + echo "ERROR: missing value for $name" + exit 1 + fi +done + +## validate environment archcount=`echo $ARCHS | awk '{ print NF }'` if [ "$archcount" -ne 1 ]; then echo "*********************************************************************" echo "***" - echo "*** ERROR: invalid number of architectures: $ARCHS" - echo "*** This build system builds one (1) archtecture at a time." + echo "*** ERROR: multiple architectures: $ARCHS" + echo "***" + echo "*** This build system does not support more than one (1)" + echo "*** simultaneous architecture setting." echo "***" echo "*********************************************************************" exit 1 fi +exit_post_log=0 + +## compute goals; these correlate with TARGET_NAME and ACTION from Xcode +spec="$TARGET_NAME:$ACTION" +echo "target specification: $spec" +case "$spec" in + external:clean) + if [ "$EXTERNAL_DRIVER" == "xcode" ]; then + ## driving build from Xcode.app do pristine clean + if [ -z "$EXTERNAL_BUILD" ]; then + echo "ERROR: unsafe rm -fr would result because EXTERNAL_BUILD is not defined" + exit 1 + fi + if [ -d "$EXTERNAL_BUILD" ]; then + cmd="/bin/rm -fr $EXTERNAL_BUILD/*" + echo "$cmd" + $cmd + [ $? -ne 0 ] && exit 1 + exit_post_log=1 + else + echo "already clean" + fi + else + ## driving build from xcodebuild do xclean, preserving configuration + goals=xclean + fi + ;; + external:*) + if [ -z "$EXTERNAL_GOALS" ]; then + goals=build + else + goals="$EXTERNAL_GOALS" + fi + ;; + *) + echo "ERROR: unexpected env specification: $spec" + exit 1 + ;; +esac + ## compute if re/configure necessary -if [ $EXTERNAL_METHOD != 'xcode' ]; then - reconfigure="terminal -> Xcode" -elif [ ! -f $EXTERNAL_BUILD/GNUmakefile ]; then +if [ ! -f $EXTERNAL_BUILD/GNUmakefile ]; then reconfigure="no configuration present" elif [ $EXTERNAL_SRC/make/configure.py -nt $EXTERNAL_BUILD/GNUmakefile ]; then reconfigure="configure script was updated" +elif [ $EXTERNAL_DRIVER == "bootstrap" ]; then + reconfigure="driver bootstrap" else reconfigure= fi @@ -39,57 +100,60 @@ fi if [ -n "$reconfigure" ]; then echo "reconfiguring ($reconfigure)" + if [ "$EXTERNAL_DRIVER" == "bootstrap" ]; then + driver="--xcode-driver=terminal" + else + driver="--xcode-driver=$EXTERNAL_DRIVER" + fi + + case "$GCC_VERSION" in + com.apple.compilers.llvmgcc42) + gcc="--gcc=$DEVELOPER_BIN_DIR/llvm-gcc-4.2" + ;; + com.apple.compilers.llvm.clang.1_0) + gcc="--gcc=$DEVELOPER_BIN_DIR/clang" + ;; + *) + gcc= + ;; + esac + + if [ -n "$ARCHS" ]; then + arch="--arch=$ARCHS" + else + arch= + fi + case "$CONFIGURATION" in debug*) debug="--debug=max --optimize=none" ;; - standard*|*) + release*|*) debug= ;; esac - ## invoke configure with (hidden) option which indicates conf performed by xcode - (set -x; $EXTERNAL_SRC/configure --force $EXTERNAL_CONFARGS \ - --build=$EXTERNAL_BUILD --arch=$ARCHS $debug --conf-method=xcode PATH=$PATH ) -fi + if [ -n "$SDKROOT" ]; then + sysroot="--sysroot=$SDKROOT" + else + sysroot= + fi -## compute goals; these correlate with TARGET_NAME and ACTION from Xcode -spec="$TARGET_NAME:$ACTION" -echo "env specification: $spec" -case "$spec" in - contrib:clean) - goals=contrib.xclean - ;; - contrib:*) - goals=contrib.install - ;; - external:clean) - goals=clean - ;; - external:*) - if [ -z "$EXTERNAL_GOALS" ]; then - goals=build - else - goals="$EXTERNAL_GOALS" - fi - ;; - libhb:clean) - goals=libhb.clean - ;; - libhb:*) - goals=libhb.build - ;; - *) - echo "ERROR: invalid env specification: $spec" - exit 1 - ;; -esac + if [ -n "$MACOSX_DEPLOYMENT_TARGET" ]; then + minver="--minver=$MACOSX_DEPLOYMENT_TARGET" + else + minver= + fi -## safeguard against passing blank value which would result in unlimited jobs -if [ -z "$EXTERNAL_JOBS" ]; then - jobs= -else - jobs=--jobs=$EXTERNAL_JOBS + ## invoke configure with (hidden) option which indicates conf performed by xcode + (set -ex; $EXTERNAL_SRC/configure --force \ + $EXTERNAL_CONF_ARGS \ + --build="$EXTERNAL_BUILD" \ + $driver \ + --xcode-symroot="$SYMROOT" \ + --xcode-config="$EXTERNAL_XCCONFIG" \ + $gcc $arch $debug $sysroot $minver) + [ $? -ne 0 ] && exit 1 fi ## log environment as provided by Xcode @@ -99,7 +163,18 @@ if [ ! -d $logdir ]; then fi env | sort > $logdir/xcodemake.env.txt +[ $exit_post_log -ne 0 ] && exit 0 + +## safeguard against passing blank value which would result in unlimited jobs +if [ -z "$EXTERNAL_JOBS" ]; then + jobs= +elif [ "$EXTERNAL_JOBS" == "auto" ]; then + jobs=--jobs=`sysctl -n hw.activecpu` +else + jobs=--jobs=$EXTERNAL_JOBS +fi + ## pull the trigger -## must set BUILD.method != terminal to prevent inifinite recursion +## must set XCODE.driver to prevent inifinite recursion set -x -exec make -C $EXTERNAL_BUILD BUILD.method=xcode $jobs $goals $EXTERNAL_VARS +exec make -C $EXTERNAL_BUILD XCODE.driver=xcodemake $jobs $goals $EXTERNAL_VARS |