diff options
author | jstebbins <[email protected]> | 2014-02-09 18:44:12 +0000 |
---|---|---|
committer | jstebbins <[email protected]> | 2014-02-09 18:44:12 +0000 |
commit | 09ba1f5a16a4aa5bd663498a2b75c30efc22897d (patch) | |
tree | 0d4bb6402370b4f2fcbea20e2dfb8803aca7eae9 /macosx/HandBrake.xcodeproj | |
parent | 903357b41263285e03bc83d41f9224d91ab4fb1a (diff) |
libhb: change libhb.a to libhandbrake.a
On linux, there is a problem with some distros that dynamically link
harfbuzz (libhb) to libass. The name conflicts with our libhb. So this
changes the library name to resolve the conflict.
It only changes libhb.a. It does not affect the windows libraries
hb.lib and hb.dll
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6020 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/HandBrake.xcodeproj')
-rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 0c5a98ba6..4c1987b33 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -74,8 +74,8 @@ 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 */; }; + 27D6C72514B1019100B785E4 /* libhandbrake.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhandbrake.a */; }; + 27D6C72614B1019100B785E4 /* libhandbrake.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhandbrake.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 */; }; @@ -287,7 +287,7 @@ 277EFE9017ED72A1001D4A6A /* libmkv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmkv.a; path = external/contrib/lib/libmkv.a; sourceTree = BUILT_PRODUCTS_DIR; }; 277EFE9117ED7749001D4A6A /* libfaac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfaac.a; path = external/contrib/lib/libfaac.a; sourceTree = BUILT_PRODUCTS_DIR; }; 277EFE9217ED799E001D4A6A /* libfdk-aac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libfdk-aac.a"; path = "../../../../Users/mike/Library/Developer/Xcode/DerivedData/HandBrake-anpxrfhxsejsxehiwuiaexjoygra/Build/Products/debug/external/contrib/lib/libfdk-aac.a"; sourceTree = "<group>"; }; - 27D6C72414B1019100B785E4 /* libhb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhb.a; path = external/libhb/libhb.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 27D6C72414B1019100B785E4 /* libhandbrake.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhandbrake.a; path = external/libhb/libhandbrake.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; }; @@ -358,7 +358,7 @@ 273F202A14ADB8D60021BE6D /* libiconv.dylib in Frameworks */, 273F202814ADB8BE0021BE6D /* libbz2.dylib in Frameworks */, 273F202614ADB8A40021BE6D /* libz.dylib in Frameworks */, - 27D6C72614B1019100B785E4 /* libhb.a in Frameworks */, + 27D6C72614B1019100B785E4 /* libhandbrake.a in Frameworks */, 27D6C74214B102DA00B785E4 /* liba52.a in Frameworks */, 27D6C74414B102DA00B785E4 /* libass.a in Frameworks */, 27D6C74614B102DA00B785E4 /* libavcodec.a in Frameworks */, @@ -397,7 +397,7 @@ 273F20C314ADC4AE0021BE6D /* libiconv.dylib in Frameworks */, 273F20C414ADC4B60021BE6D /* libbz2.dylib in Frameworks */, 273F20C514ADC4BD0021BE6D /* libz.dylib in Frameworks */, - 27D6C72514B1019100B785E4 /* libhb.a in Frameworks */, + 27D6C72514B1019100B785E4 /* libhandbrake.a in Frameworks */, 27D6C74114B102DA00B785E4 /* liba52.a in Frameworks */, 27D6C74314B102DA00B785E4 /* libass.a in Frameworks */, 27D6C74514B102DA00B785E4 /* libavcodec.a in Frameworks */, @@ -428,7 +428,7 @@ 271BA4C714B1236D00BC1D2C /* Static Libraries */ = { isa = PBXGroup; children = ( - 27D6C72414B1019100B785E4 /* libhb.a */, + 27D6C72414B1019100B785E4 /* libhandbrake.a */, 27D6C72714B102DA00B785E4 /* liba52.a */, 27D6C72814B102DA00B785E4 /* libass.a */, 27D6C72914B102DA00B785E4 /* libavcodec.a */, @@ -727,7 +727,7 @@ ); name = external; passBuildSettingsInEnvironment = 1; - productName = libhb; + productName = libhandbrake; }; /* End PBXLegacyTarget section */ |