diff options
| author | Rodeo <[email protected]> | 2013-11-08 21:21:02 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-11-08 21:21:02 +0000 |
| commit | 43f0bc9d538c86ea75a5cd627a81452e9d76b825 (patch) | |
| tree | a6bde5c2174543e4ea282ab26b6a2c76829105eb /macosx | |
| parent | d0a2953efbce340e34a971b9481024a51ae52383 (diff) | |
OpenCL: use the new library loading architecture for all OpenCL code.
An OpenCL SDK is no longer needed to build OpenCL support.
Note: as a result, the --enable-opencl configure option is removed.
Also, libOpenCL is no longer needed to run the application (it is still necessary to use OpenCL features, of course).
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5886 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 6 | ||||
| -rw-r--r-- | macosx/module.defs | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 147e4100f..94cb1ca21 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -9,8 +9,6 @@ /* Begin PBXBuildFile section */ 226268E01572CC7300477B4E /* libavresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226268DF1572CC7300477B4E /* libavresample.a */; }; 226268E11572CC7300477B4E /* libavresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226268DF1572CC7300477B4E /* libavresample.a */; }; - 22D1C457170B2EB0002A7BD4 /* OpenCL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1C456170B2EB0002A7BD4 /* OpenCL.framework */; }; - 22D1C458170B2EBD002A7BD4 /* OpenCL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1C456170B2EB0002A7BD4 /* OpenCL.framework */; }; 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 */; }; @@ -198,7 +196,6 @@ /* Begin PBXFileReference section */ 226268DF1572CC7300477B4E /* libavresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavresample.a; path = external/contrib/lib/libavresample.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 22D1C456170B2EB0002A7BD4 /* OpenCL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenCL.framework; path = System/Library/Frameworks/OpenCL.framework; sourceTree = SDKROOT; }; 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; }; @@ -356,7 +353,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22D1C457170B2EB0002A7BD4 /* OpenCL.framework in Frameworks */, 273F203014ADB9790021BE6D /* AudioToolbox.framework in Frameworks */, 273F202314ADB8650021BE6D /* IOKit.framework in Frameworks */, 273F203314ADB9F00021BE6D /* CoreServices.framework in Frameworks */, @@ -393,7 +389,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 22D1C458170B2EBD002A7BD4 /* OpenCL.framework in Frameworks */, A9E1467B16BC2ABD00C307BC /* QuartzCore.framework in Frameworks */, 273F21C114ADE7A20021BE6D /* Growl.framework in Frameworks */, 273F21C214ADE7BC0021BE6D /* Sparkle.framework in Frameworks */, @@ -474,7 +469,6 @@ 273F1FDE14AD9DA40021BE6D = { isa = PBXGroup; children = ( - 22D1C456170B2EB0002A7BD4 /* OpenCL.framework */, 273F204114ADBC210021BE6D /* HandBrake */, 273F200214ADAE950021BE6D /* HandBrakeCLI */, 273F200014ADAE950021BE6D /* Products */, diff --git a/macosx/module.defs b/macosx/module.defs index e9cbc8636..9c7850901 100644 --- a/macosx/module.defs +++ b/macosx/module.defs @@ -27,10 +27,6 @@ MACOSX.map.g.min = debug MACOSX.map.g.std = debug MACOSX.map.g.max = debug -ifeq (1,$(FEATURE.opencl)) - MACOSX.extra_cflags = OTHER_CFLAGS='-DUSE_OPENCL' -endif - ## 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)) |