aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--XBMC-ATV2.xcodeproj/project.pbxproj12
-rw-r--r--XBMC-IOS.xcodeproj/project.pbxproj12
-rw-r--r--XBMC.xcodeproj/project.pbxproj18
-rw-r--r--configure.in5
-rw-r--r--xbmc/DllPaths_generated.h.in1
-rw-r--r--xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h2
6 files changed, 6 insertions, 44 deletions
diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj
index 635914a2e8..d1f9d2c1e8 100644
--- a/XBMC-ATV2.xcodeproj/project.pbxproj
+++ b/XBMC-ATV2.xcodeproj/project.pbxproj
@@ -909,8 +909,6 @@
F589AE4D1288E0A300D8079E /* libm.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE4C1288E0A300D8079E /* libm.dylib */; };
F589AE531288E20900D8079E /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE521288E20900D8079E /* libsqlite3.dylib */; };
F589AE6A128909F000D8079E /* libfreetype.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE1E1288DE2700D8079E /* libfreetype.dylib */; };
- F589AE7512890B9E00D8079E /* libcmyth.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE6E12890B9E00D8079E /* libcmyth.a */; settings = {ATTRIBUTES = (Required, ); }; };
- F589AE7612890B9E00D8079E /* librefmem.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE6F12890B9E00D8079E /* librefmem.a */; };
F589AE7712890B9E00D8079E /* libapetag.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE7012890B9E00D8079E /* libapetag.a */; };
F589AE8212890BEF00D8079E /* libsquish-arm-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE7D12890BEF00D8079E /* libsquish-arm-osx.a */; };
F589AE8312890BEF00D8079E /* librtv-arm-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE7E12890BEF00D8079E /* librtv-arm-osx.a */; settings = {ATTRIBUTES = (Required, ); }; };
@@ -919,7 +917,6 @@
F5A29EC312A7221B003A610C /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A29EC212A7221B003A610C /* CoreMedia.framework */; };
F5A29F2712A72246003A610C /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A29F2612A72246003A610C /* VideoToolbox.framework */; };
F5B13837133080CB0045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13835133080CA0045076D /* libmicrohttpd.dylib */; };
- F5B13B021333248E0045076D /* libass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13B011333248E0045076D /* libass.dylib */; };
F5B13E0113344F310045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13E0013344F310045076D /* DarwinUtils.mm */; };
/* End PBXBuildFile section */
@@ -2839,8 +2836,6 @@
F589AE4A1288E09200D8079E /* libncurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.dylib; path = usr/lib/libncurses.dylib; sourceTree = SDKROOT; };
F589AE4C1288E0A300D8079E /* libm.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libm.dylib; path = usr/lib/libm.dylib; sourceTree = SDKROOT; };
F589AE521288E20900D8079E /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libsqlite3.dylib"; sourceTree = "<absolute>"; };
- F589AE6E12890B9E00D8079E /* libcmyth.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcmyth.a; path = lib/cmyth/libcmyth/libcmyth.a; sourceTree = "<group>"; };
- F589AE6F12890B9E00D8079E /* librefmem.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librefmem.a; path = lib/cmyth/librefmem/librefmem.a; sourceTree = "<group>"; };
F589AE7012890B9E00D8079E /* libapetag.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libapetag.a; path = lib/libapetag/.libs/libapetag.a; sourceTree = "<group>"; };
F589AE7D12890BEF00D8079E /* libsquish-arm-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsquish-arm-osx.a"; path = "lib/libsquish/libsquish-arm-osx.a"; sourceTree = "<group>"; };
F589AE7E12890BEF00D8079E /* librtv-arm-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "librtv-arm-osx.a"; path = "lib/libRTV/librtv-arm-osx.a"; sourceTree = "<group>"; };
@@ -2849,7 +2844,6 @@
F5A29EC212A7221B003A610C /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
F5A29F2612A72246003A610C /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/PrivateFrameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
F5B13835133080CA0045076D /* libmicrohttpd.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmicrohttpd.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libmicrohttpd.dylib"; sourceTree = "<absolute>"; };
- F5B13B011333248E0045076D /* libass.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libass.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libass.dylib"; sourceTree = "<absolute>"; };
F5B13DFF13344F2A0045076D /* DarwinUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DarwinUtils.h; sourceTree = "<group>"; };
F5B13E0013344F310045076D /* DarwinUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DarwinUtils.mm; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -2879,8 +2873,6 @@
F589AE4D1288E0A300D8079E /* libm.dylib in Frameworks */,
F589AE531288E20900D8079E /* libsqlite3.dylib in Frameworks */,
F589AE6A128909F000D8079E /* libfreetype.dylib in Frameworks */,
- F589AE7512890B9E00D8079E /* libcmyth.a in Frameworks */,
- F589AE7612890B9E00D8079E /* librefmem.a in Frameworks */,
F589AE7712890B9E00D8079E /* libapetag.a in Frameworks */,
F589AE8212890BEF00D8079E /* libsquish-arm-osx.a in Frameworks */,
F589AE8312890BEF00D8079E /* librtv-arm-osx.a in Frameworks */,
@@ -2901,7 +2893,6 @@
F56C7EDF131F0959000AD0F6 /* json-rpc.a in Frameworks */,
F56C7EE1131F0965000AD0F6 /* libjsoncpp.a in Frameworks */,
F5B13837133080CB0045076D /* libmicrohttpd.dylib in Frameworks */,
- F5B13B021333248E0045076D /* libass.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5683,7 +5674,6 @@
F589AE341288DEF900D8079E /* liblzo2.dylib */,
F589AE301288DEE000D8079E /* libpcre.dylib */,
F589AE321288DEE900D8079E /* libpcrecpp.dylib */,
- F5B13B011333248E0045076D /* libass.dylib */,
F589AE201288DE6400D8079E /* libfribidi.dylib */,
F589AE1C1288DE1B00D8079E /* libcdio.dylib */,
F589AE1A1288DE0800D8079E /* libsamplerate.dylib */,
@@ -5701,8 +5691,6 @@
F589AE6D12890B6700D8079E /* Internal Libs */ = {
isa = PBXGroup;
children = (
- F589AE6E12890B9E00D8079E /* libcmyth.a */,
- F589AE6F12890B9E00D8079E /* librefmem.a */,
F589AE7012890B9E00D8079E /* libapetag.a */,
F56C7EDC131F0942000AD0F6 /* http-api.a */,
F56C7EDE131F0959000AD0F6 /* json-rpc.a */,
diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj
index 09a08d8589..3b39d5c688 100644
--- a/XBMC-IOS.xcodeproj/project.pbxproj
+++ b/XBMC-IOS.xcodeproj/project.pbxproj
@@ -895,8 +895,6 @@
F56C8BFE131F4797000AD0F6 /* libmysqlclient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8BE5131F4796000AD0F6 /* libmysqlclient.dylib */; };
F56C8BFF131F4797000AD0F6 /* libpython2.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8BE6131F4796000AD0F6 /* libpython2.6.dylib */; };
F56C8C00131F4797000AD0F6 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8BE7131F4796000AD0F6 /* libsqlite3.dylib */; };
- F56C8C07131F47EA000AD0F6 /* libcmyth.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C01131F47EA000AD0F6 /* libcmyth.a */; };
- F56C8C08131F47EA000AD0F6 /* librefmem.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C02131F47EA000AD0F6 /* librefmem.a */; };
F56C8C09131F47EA000AD0F6 /* libapetag.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C03131F47EA000AD0F6 /* libapetag.a */; };
F56C8C0A131F47EA000AD0F6 /* http-api.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C04131F47EA000AD0F6 /* http-api.a */; };
F56C8C0B131F47EA000AD0F6 /* json-rpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C05131F47EA000AD0F6 /* json-rpc.a */; };
@@ -919,7 +917,6 @@
F5A29EC312A7221B003A610C /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A29EC212A7221B003A610C /* CoreMedia.framework */; };
F5A29F2712A72246003A610C /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A29F2612A72246003A610C /* VideoToolbox.framework */; };
F5B1380D13306B890045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B1380C13306B890045076D /* libmicrohttpd.dylib */; };
- F5B13AFE1333247D0045076D /* libass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13AFD1333247D0045076D /* libass.dylib */; };
F5B13DCF1334490D0045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13DCE1334490D0045076D /* DarwinUtils.mm */; };
/* End PBXBuildFile section */
@@ -2824,8 +2821,6 @@
F56C8BE5131F4796000AD0F6 /* libmysqlclient.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmysqlclient.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/mysql/libmysqlclient.dylib"; sourceTree = "<absolute>"; };
F56C8BE6131F4796000AD0F6 /* libpython2.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpython2.6.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libpython2.6.dylib"; sourceTree = "<absolute>"; };
F56C8BE7131F4796000AD0F6 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libsqlite3.dylib"; sourceTree = "<absolute>"; };
- F56C8C01131F47EA000AD0F6 /* libcmyth.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcmyth.a; path = lib/cmyth/libcmyth/libcmyth.a; sourceTree = "<group>"; };
- F56C8C02131F47EA000AD0F6 /* librefmem.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librefmem.a; path = lib/cmyth/librefmem/librefmem.a; sourceTree = "<group>"; };
F56C8C03131F47EA000AD0F6 /* libapetag.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libapetag.a; path = lib/libapetag/.libs/libapetag.a; sourceTree = "<group>"; };
F56C8C04131F47EA000AD0F6 /* http-api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "http-api.a"; path = "xbmc/interfaces/http-api/http-api.a"; sourceTree = "<group>"; };
F56C8C05131F47EA000AD0F6 /* json-rpc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "json-rpc.a"; path = "xbmc/interfaces/json-rpc/json-rpc.a"; sourceTree = "<group>"; };
@@ -2849,7 +2844,6 @@
F5A29EC212A7221B003A610C /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
F5A29F2612A72246003A610C /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/PrivateFrameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
F5B1380C13306B890045076D /* libmicrohttpd.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmicrohttpd.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libmicrohttpd.dylib"; sourceTree = "<absolute>"; };
- F5B13AFD1333247D0045076D /* libass.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libass.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libass.dylib"; sourceTree = "<absolute>"; };
F5B13DCD1334490D0045076D /* DarwinUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DarwinUtils.h; sourceTree = "<group>"; };
F5B13DCE1334490D0045076D /* DarwinUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DarwinUtils.mm; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -2890,8 +2884,6 @@
F56C8BFE131F4797000AD0F6 /* libmysqlclient.dylib in Frameworks */,
F56C8BFF131F4797000AD0F6 /* libpython2.6.dylib in Frameworks */,
F56C8C00131F4797000AD0F6 /* libsqlite3.dylib in Frameworks */,
- F56C8C07131F47EA000AD0F6 /* libcmyth.a in Frameworks */,
- F56C8C08131F47EA000AD0F6 /* librefmem.a in Frameworks */,
F56C8C09131F47EA000AD0F6 /* libapetag.a in Frameworks */,
F56C8C0A131F47EA000AD0F6 /* http-api.a in Frameworks */,
F56C8C0B131F47EA000AD0F6 /* json-rpc.a in Frameworks */,
@@ -2901,7 +2893,6 @@
F56C8C13131F4811000AD0F6 /* libxbms-arm-osx.a in Frameworks */,
F56C8C14131F4811000AD0F6 /* libxdaap-arm-osx.a in Frameworks */,
F5B1380D13306B890045076D /* libmicrohttpd.dylib in Frameworks */,
- F5B13AFE1333247D0045076D /* libass.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5683,7 +5674,6 @@
F56C8BD0131F4795000AD0F6 /* liblzo2.dylib */,
F56C8BD1131F4795000AD0F6 /* libpcre.dylib */,
F56C8BD2131F4795000AD0F6 /* libpcrecpp.dylib */,
- F5B13AFD1333247D0045076D /* libass.dylib */,
F56C8BDC131F4796000AD0F6 /* libfribidi.dylib */,
F56C8BDD131F4796000AD0F6 /* libcdio.dylib */,
F56C8BDE131F4796000AD0F6 /* libsamplerate.dylib */,
@@ -5701,8 +5691,6 @@
F589AE6D12890B6700D8079E /* Internal Libs */ = {
isa = PBXGroup;
children = (
- F56C8C01131F47EA000AD0F6 /* libcmyth.a */,
- F56C8C02131F47EA000AD0F6 /* librefmem.a */,
F56C8C03131F47EA000AD0F6 /* libapetag.a */,
F56C8C04131F47EA000AD0F6 /* http-api.a */,
F56C8C05131F47EA000AD0F6 /* json-rpc.a */,
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index ed90f3a5ff..ce4e270a0a 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -484,8 +484,6 @@
43BF09A31080D1E900E25290 /* RenderingControlSCPD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BF099F1080D1E900E25290 /* RenderingControlSCPD.cpp */; };
43BF09AA1080D2ED00E25290 /* RdrConnectionManagerSCPD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BF09A81080D2ED00E25290 /* RdrConnectionManagerSCPD.cpp */; };
43BF09AB1080D2ED00E25290 /* RdrConnectionManagerSCPD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BF09A81080D2ED00E25290 /* RdrConnectionManagerSCPD.cpp */; };
- 60CF88BF10CB49F3000921B6 /* libcmyth.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 60CF88BE10CB49F3000921B6 /* libcmyth.a */; };
- 60CF88C110CB4A16000921B6 /* librefmem.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 60CF88C010CB4A16000921B6 /* librefmem.a */; };
7C2D6AE40F35453E00DD2E85 /* SpecialProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C2D6AE20F35453E00DD2E85 /* SpecialProtocol.cpp */; };
7C45DBE910F325C400D4BBF3 /* DAVDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C45DBE710F325C400D4BBF3 /* DAVDirectory.cpp */; };
7C45DBEA10F325C400D4BBF3 /* DAVDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C45DBE710F325C400D4BBF3 /* DAVDirectory.cpp */; };
@@ -1788,8 +1786,6 @@
F5AACA970FB3E2B800DBB77C /* GUIDialogSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AACA950FB3E2B800DBB77C /* GUIDialogSlider.cpp */; };
F5AACA980FB3E2B800DBB77C /* GUIDialogSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AACA950FB3E2B800DBB77C /* GUIDialogSlider.cpp */; };
F5AD1EA80F488A1A0065EB5D /* GUIWindowKaraokeLyrics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AD1EA70F488A1A0065EB5D /* GUIWindowKaraokeLyrics.cpp */; };
- F5B13AD1133319310045076D /* libass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13AD0133319310045076D /* libass.dylib */; };
- F5B13AD2133319310045076D /* libass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13AD0133319310045076D /* libass.dylib */; };
F5B13C8D1334056B0045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13C8C1334056B0045076D /* DarwinUtils.mm */; };
F5B13C8E1334056B0045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13C8C1334056B0045076D /* DarwinUtils.mm */; };
F5B5CFF0133AF993007A4B4C /* libmysqlclient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3F131F5E85000AD0F6 /* libmysqlclient.dylib */; };
@@ -1865,8 +1861,6 @@
F5FAB0710EFABAC800BAD4AE /* VTPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5FAB0700EFABAC800BAD4AE /* VTPFile.cpp */; };
F5FAB0760EFABE2C00BAD4AE /* VTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5FAB0750EFABE2C00BAD4AE /* VTPDirectory.cpp */; };
F5FAB07A0EFABE4A00BAD4AE /* VTPSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5FAB0790EFABE4A00BAD4AE /* VTPSession.cpp */; };
- F5FDE83510CC706F006A3E83 /* libcmyth.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 60CF88BE10CB49F3000921B6 /* libcmyth.a */; };
- F5FDE83610CC7076006A3E83 /* librefmem.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 60CF88C010CB4A16000921B6 /* librefmem.a */; };
F5FDF51D0E7218950005B0A6 /* AsyncFileCopy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5FDF51C0E7218950005B0A6 /* AsyncFileCopy.cpp */; };
/* End PBXBuildFile section */
@@ -2366,8 +2360,6 @@
43BF09A91080D2ED00E25290 /* RenderingControlSCPD_Full.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = RenderingControlSCPD_Full.xml; sourceTree = "<group>"; };
43BF09DD1080D39300E25290 /* fastmemcpy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fastmemcpy.h; sourceTree = "<group>"; };
43FAC87112D6349400F67914 /* IStorageProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IStorageProvider.h; sourceTree = "<group>"; };
- 60CF88BE10CB49F3000921B6 /* libcmyth.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcmyth.a; path = lib/cmyth/libcmyth/libcmyth.a; sourceTree = "<group>"; };
- 60CF88C010CB4A16000921B6 /* librefmem.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librefmem.a; path = lib/cmyth/librefmem/librefmem.a; sourceTree = "<group>"; };
6E2FACD20E26E92800DF79EA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6E97BDBF0DA2B620003A2A89 /* EventClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventClient.h; sourceTree = "<group>"; };
6E97BDC00DA2B620003A2A89 /* EventPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventPacket.h; sourceTree = "<group>"; };
@@ -3745,7 +3737,6 @@
F5AD1EA60F488A1A0065EB5D /* GUIWindowKaraokeLyrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowKaraokeLyrics.h; sourceTree = "<group>"; };
F5AD1EA70F488A1A0065EB5D /* GUIWindowKaraokeLyrics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowKaraokeLyrics.cpp; sourceTree = "<group>"; };
F5B138641330811D0045076D /* libmicrohttpd.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmicrohttpd.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libmicrohttpd.dylib"; sourceTree = "<absolute>"; };
- F5B13AD0133319310045076D /* libass.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libass.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libass.dylib"; sourceTree = "<absolute>"; };
F5B13C8B1334056B0045076D /* DarwinUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DarwinUtils.h; sourceTree = "<group>"; };
F5B13C8C1334056B0045076D /* DarwinUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DarwinUtils.mm; sourceTree = "<group>"; };
F5B413131065900C0035D105 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
@@ -3847,8 +3838,6 @@
88ECB6590DE013C4003396A7 /* DiskArbitration.framework in Frameworks */,
F59879080FBAA0C3008EF4FB /* QuartzCore.framework in Frameworks */,
43352CEE1071634600706B8A /* libsquish-x86-osx.a in Frameworks */,
- 60CF88BF10CB49F3000921B6 /* libcmyth.a in Frameworks */,
- 60CF88C110CB4A16000921B6 /* librefmem.a in Frameworks */,
F5DC8817110A4B8900EE1B15 /* libxbms-x86-osx.a in Frameworks */,
F5DC888B110A654000EE1B15 /* libapetag.a in Frameworks */,
F5A7A6F1112893330059D6AA /* libjsoncpp.a in Frameworks */,
@@ -3872,7 +3861,6 @@
F56C8D59131F5E85000AD0F6 /* libsqlite3.dylib in Frameworks */,
F57A1E3A132AAB0E00498CC7 /* libSDL.dylib in Frameworks */,
F57A1E3D132AAB1A00498CC7 /* libSDL_mixer.dylib in Frameworks */,
- F5B13AD1133319310045076D /* libass.dylib in Frameworks */,
F5B5CFF0133AF993007A4B4C /* libmysqlclient.dylib in Frameworks */,
F5B5D008133AFA95007A4B4C /* libfribidi.dylib in Frameworks */,
F5B5D00C133AFAC6007A4B4C /* libcdio.dylib in Frameworks */,
@@ -3904,8 +3892,6 @@
F5A1CC080F6B209400A96ABD /* libxdaap-powerpc-osx.a in Frameworks */,
F59879090FBAA0C3008EF4FB /* QuartzCore.framework in Frameworks */,
43352CF01071639400706B8A /* libsquish-powerpc-osx.a in Frameworks */,
- F5FDE83510CC706F006A3E83 /* libcmyth.a in Frameworks */,
- F5FDE83610CC7076006A3E83 /* librefmem.a in Frameworks */,
F5DC888C110A654000EE1B15 /* libapetag.a in Frameworks */,
F5A7A6F2112893330059D6AA /* libjsoncpp.a in Frameworks */,
F5A7A6F5112893440059D6AA /* json-rpc.a in Frameworks */,
@@ -3928,7 +3914,6 @@
F56C8D71131F5E86000AD0F6 /* libsqlite3.dylib in Frameworks */,
F57A1E3B132AAB0E00498CC7 /* libSDL.dylib in Frameworks */,
F57A1E3E132AAB1A00498CC7 /* libSDL_mixer.dylib in Frameworks */,
- F5B13AD2133319310045076D /* libass.dylib in Frameworks */,
F5B5CFF1133AF994007A4B4C /* libmysqlclient.dylib in Frameworks */,
F5B5D009133AFA96007A4B4C /* libfribidi.dylib in Frameworks */,
F5B5D00D133AFAC7007A4B4C /* libcdio.dylib in Frameworks */,
@@ -6848,7 +6833,6 @@
F56C8D2A131F5E84000AD0F6 /* liblzo2.dylib */,
F56C8D2B131F5E84000AD0F6 /* libpcre.dylib */,
F56C8D2C131F5E84000AD0F6 /* libpcrecpp.dylib */,
- F5B13AD0133319310045076D /* libass.dylib */,
F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */,
F56C8D37131F5E85000AD0F6 /* libcdio.dylib */,
F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */,
@@ -6869,8 +6853,6 @@
F57E1ED20E36E8FD00700C9D /* internal libs */ = {
isa = PBXGroup;
children = (
- 60CF88BE10CB49F3000921B6 /* libcmyth.a */,
- 60CF88C010CB4A16000921B6 /* librefmem.a */,
F5DC888A110A654000EE1B15 /* libapetag.a */,
F5A7A6F61128934C0059D6AA /* http-api.a */,
F5A7A6F3112893440059D6AA /* json-rpc.a */,
diff --git a/configure.in b/configure.in
index 2b0c384837..0b9404dc4b 100644
--- a/configure.in
+++ b/configure.in
@@ -552,7 +552,6 @@ AC_CHECK_HEADER([vorbis/vorbisenc.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([libmodplug/modplug.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([wavpack/wavpack.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library))
-AC_CHECK_LIB([ass], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([bz2], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([jpeg], [main],, AC_MSG_ERROR($missing_library)) # check for cximage
AC_CHECK_LIB([tiff], [main],, AC_MSG_ERROR($missing_library))
@@ -620,6 +619,7 @@ AS_CASE([x$use_libbluray],
# platform dependent libraries
if test "$host_vendor" = "apple" ; then
+ AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_HEADER([mpeg2dec/mpeg2convert.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([iconv], [main],, AC_MSG_ERROR($missing_library))
@@ -628,6 +628,7 @@ if test "$host_vendor" = "apple" ; then
AC_CHECK_LIB([SDL], [main],, AC_MSG_ERROR($missing_library))
fi
else
+ AC_CHECK_LIB([ass], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([dl], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([resolv], [main],, AC_MSG_ERROR($missing_library))
@@ -689,6 +690,7 @@ XB_FIND_SONAME([VORBISENC], [vorbisenc])
XB_FIND_SONAME([VORBISFILE], [vorbisfile])
XB_FIND_SONAME([MODPLUG], [modplug])
if test "$host_vendor" = "apple"; then
+ XB_FIND_SONAME([ASS], [ass])
XB_FIND_SONAME([MPEG2], [mpeg2])
XB_FIND_SONAME([WAVPACK], [wavpack])
fi
@@ -1442,6 +1444,7 @@ AC_SUBST(LIBOGG_BASENAME)
AC_SUBST(LIBVORBISENC_BASENAME)
AC_SUBST(LIBVORBIS_BASENAME)
AC_SUBST(LIBWAVPACK_BASENAME)
+AC_SUBST(LIBASS_BASENAME)
AC_SUBST(LIBMEPG2_BASENAME)
AC_SUBST_FILE(XBMC_STANDALONE_SH_PULSE)
AC_SUBST(USE_OPENGL)
diff --git a/xbmc/DllPaths_generated.h.in b/xbmc/DllPaths_generated.h.in
index 39fa7f5002..d7e80126fb 100644
--- a/xbmc/DllPaths_generated.h.in
+++ b/xbmc/DllPaths_generated.h.in
@@ -63,6 +63,7 @@
#define DLL_PATH_OGG_CODEC "@VORBISFILE_SONAME@"
/* dvdplayer */
+#define DLL_PATH_LIBASS "@ASS_SONAME@"
#define DLL_PATH_LIBDVDNAV "special://xbmcbin/system/players/dvdplayer/libdvdnav-@ARCH@.so"
#define DLL_PATH_LIBMPEG2 "@MPEG2_SONAME@"
#define DLL_PATH_LIBMAD "@MAD_SONAME@"
diff --git a/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h b/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
index 69ecc4ba8c..f1c55cfa69 100644
--- a/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
+++ b/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
@@ -70,7 +70,7 @@ public:
, void *data)=0;
};
-#if !defined(WIN32)
+#if !(defined(WIN32) || defined(__APPLE__))
class DllLibass : public DllDynamic, DllLibassInterface
{
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-21 08:41:20 +0000