aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.in30
-rw-r--r--XBMC-ATV2.xcodeproj/project.pbxproj40
-rw-r--r--XBMC-IOS.xcodeproj/project.pbxproj40
-rw-r--r--XBMC.xcodeproj/project.pbxproj80
-rw-r--r--lib/libRTV/Makefile.in2
-rw-r--r--lib/libUPnP/Makefile.in2
-rw-r--r--lib/libXBMS/Makefile.in2
-rw-r--r--lib/libXDAAP/Makefile.in2
-rw-r--r--lib/libsquish/Makefile.in2
-rw-r--r--tools/TexturePacker/Makefile.in4
10 files changed, 86 insertions, 118 deletions
diff --git a/Makefile.in b/Makefile.in
index 048ef90394..73d127ec55 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -325,13 +325,13 @@ xbmc/interfaces/python/xbmcmodule/xbmcmodule.a: force
$(MAKE) -C xbmc/interfaces/python/xbmcmodule
xbmc/network/libscrobbler/scrobbler.a: force
$(MAKE) -C xbmc/network/libscrobbler
-lib/libRTV/librtv-@ARCH@.a: force
+lib/libRTV/librtv.a: force
$(MAKE) -C lib/libRTV
-lib/libUPnP/libupnp-@ARCH@.a: force
+lib/libUPnP/libupnp.a: force
$(MAKE) -C lib/libUPnP
-lib/libXBMS/libxbms-@ARCH@.a: force
+lib/libXBMS/libxbms.a: force
$(MAKE) -C lib/libXBMS
-lib/libXDAAP/libxdaap-@ARCH@.a: force
+lib/libXDAAP/libxdaap.a: force
$(MAKE) -C lib/libXDAAP
lib/jsoncpp/src/lib_json/libjsoncpp.a: force
$(MAKE) -C lib/jsoncpp/src/lib_json
@@ -343,7 +343,7 @@ xbmc/dbwrappers/dbwrappers.a: force
$(MAKE) -C xbmc/dbwrappers
lib/UnrarXLib/UnrarXLib.a: force
$(MAKE) -C lib/UnrarXLib
-lib/libsquish/libsquish-@ARCH@.a: force
+lib/libsquish/libsquish.a: force
$(MAKE) -C lib/libsquish
xbmc/linux/linux.a: force
$(MAKE) -C xbmc/linux
@@ -455,11 +455,11 @@ externals: codecs libs python visualizations screensavers
xcode_depends: \
codecs libs python visualizations screensavers eventclients skins \
- lib/libsquish/libsquish-@ARCH@.a \
+ lib/libsquish/libsquish.a \
lib/libapetag/.libs/libapetag.a \
- lib/libXBMS/libxbms-@ARCH@.a \
- lib/libRTV/librtv-@ARCH@.a \
- lib/libXDAAP/libxdaap-@ARCH@.a \
+ lib/libXBMS/libxbms.a \
+ lib/libRTV/librtv.a \
+ lib/libXDAAP/libxdaap.a \
xbmc/interfaces/interfaces.a \
xbmc/interfaces/http-api/http-api.a \
xbmc/interfaces/json-rpc/json-rpc.a \
@@ -508,16 +508,16 @@ OBJSXBMC= \
xbmc/windows/windows.a \
xbmc/interfaces/python/xbmcmodule/xbmcmodule.a \
xbmc/network/libscrobbler/scrobbler.a \
- lib/libRTV/librtv-@ARCH@.a \
- lib/libUPnP/libupnp-@ARCH@.a \
- lib/libXDAAP/libxdaap-@ARCH@.a \
+ lib/libRTV/librtv.a \
+ lib/libUPnP/libupnp.a \
+ lib/libXDAAP/libxdaap.a \
xbmc/interfaces/interfaces.a \
xbmc/cdrip/cdrip.a \
xbmc/interfaces/json-rpc/json-rpc.a \
lib/jsoncpp/src/lib_json/libjsoncpp.a \
xbmc/interfaces/http-api/http-api.a \
xbmc/dbwrappers/dbwrappers.a \
- lib/libsquish/libsquish-@ARCH@.a \
+ lib/libsquish/libsquish.a \
lib/libapetag/.libs/libapetag.a \
lib/xbmc-dll-symbols/dll-symbols.a \
xbmc/rendering/rendering.a \
@@ -535,7 +535,7 @@ endif
ifeq (@HAVE_XBMC_NONFREE@,1)
OBJSXBMC+= \
- lib/libXBMS/libxbms-@ARCH@.a \
+ lib/libXBMS/libxbms.a \
lib/UnrarXLib/UnrarXLib.a
endif
@@ -606,7 +606,7 @@ else
$(MAKE) -C tools/XBMCTex/
endif
-tools/TexturePacker/TexturePacker: xbmc/guilib/guilib.a lib/libsquish/libsquish-@ARCH@.a
+tools/TexturePacker/TexturePacker: xbmc/guilib/guilib.a lib/libsquish/libsquish.a
$(MAKE) -C tools/TexturePacker/
diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj
index d1f9d2c1e8..ee96d197db 100644
--- a/XBMC-ATV2.xcodeproj/project.pbxproj
+++ b/XBMC-ATV2.xcodeproj/project.pbxproj
@@ -910,10 +910,10 @@
F589AE531288E20900D8079E /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE521288E20900D8079E /* libsqlite3.dylib */; };
F589AE6A128909F000D8079E /* libfreetype.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE1E1288DE2700D8079E /* libfreetype.dylib */; };
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, ); }; };
- F589AE8412890BEF00D8079E /* libxbms-arm-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE7F12890BEF00D8079E /* libxbms-arm-osx.a */; settings = {ATTRIBUTES = (Required, ); }; };
- F589AE8512890BEF00D8079E /* libxdaap-arm-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE8012890BEF00D8079E /* libxdaap-arm-osx.a */; settings = {ATTRIBUTES = (Required, ); }; };
+ F589AE8212890BEF00D8079E /* libsquish.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE7D12890BEF00D8079E /* libsquish.a */; };
+ F589AE8312890BEF00D8079E /* librtv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE7E12890BEF00D8079E /* librtv.a */; settings = {ATTRIBUTES = (Required, ); }; };
+ F589AE8412890BEF00D8079E /* libxbms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE7F12890BEF00D8079E /* libxbms.a */; settings = {ATTRIBUTES = (Required, ); }; };
+ F589AE8512890BEF00D8079E /* libxdaap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE8012890BEF00D8079E /* libxdaap.a */; settings = {ATTRIBUTES = (Required, ); }; };
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 */; };
@@ -2837,10 +2837,10 @@
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>"; };
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>"; };
- F589AE7F12890BEF00D8079E /* libxbms-arm-osx.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = "libxbms-arm-osx.a"; path = "lib/libXBMS/libxbms-arm-osx.a"; sourceTree = "<group>"; };
- F589AE8012890BEF00D8079E /* libxdaap-arm-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libxdaap-arm-osx.a"; path = "lib/libXDAAP/libxdaap-arm-osx.a"; sourceTree = "<group>"; };
+ F589AE7D12890BEF00D8079E /* libsquish.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsquish.a; path = lib/libsquish/libsquish.a; sourceTree = "<group>"; };
+ F589AE7E12890BEF00D8079E /* librtv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librtv.a; path = lib/libRTV/librtv.a; sourceTree = "<group>"; };
+ F589AE7F12890BEF00D8079E /* libxbms.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libxbms.a; path = lib/libXBMS/libxbms.a; sourceTree = "<group>"; };
+ F589AE8012890BEF00D8079E /* libxdaap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxdaap.a; path = lib/libXDAAP/libxdaap.a; sourceTree = "<group>"; };
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>"; };
@@ -2874,10 +2874,10 @@
F589AE531288E20900D8079E /* libsqlite3.dylib in Frameworks */,
F589AE6A128909F000D8079E /* libfreetype.dylib in Frameworks */,
F589AE7712890B9E00D8079E /* libapetag.a in Frameworks */,
- F589AE8212890BEF00D8079E /* libsquish-arm-osx.a in Frameworks */,
- F589AE8312890BEF00D8079E /* librtv-arm-osx.a in Frameworks */,
- F589AE8412890BEF00D8079E /* libxbms-arm-osx.a in Frameworks */,
- F589AE8512890BEF00D8079E /* libxdaap-arm-osx.a in Frameworks */,
+ F589AE8212890BEF00D8079E /* libsquish.a in Frameworks */,
+ F589AE8312890BEF00D8079E /* librtv.a in Frameworks */,
+ F589AE8412890BEF00D8079E /* libxbms.a in Frameworks */,
+ F589AE8512890BEF00D8079E /* libxdaap.a in Frameworks */,
F5A29EC312A7221B003A610C /* CoreMedia.framework in Frameworks */,
F5A29F2712A72246003A610C /* VideoToolbox.framework in Frameworks */,
F54D9E0712B65FFF006870F9 /* libc.dylib in Frameworks */,
@@ -5695,22 +5695,14 @@
F56C7EDC131F0942000AD0F6 /* http-api.a */,
F56C7EDE131F0959000AD0F6 /* json-rpc.a */,
F56C7EE0131F0965000AD0F6 /* libjsoncpp.a */,
- F589AE7C12890BDA00D8079E /* arm */,
+ F589AE7D12890BEF00D8079E /* libsquish.a */,
+ F589AE7E12890BEF00D8079E /* librtv.a */,
+ F589AE7F12890BEF00D8079E /* libxbms.a */,
+ F589AE8012890BEF00D8079E /* libxdaap.a */,
);
name = "Internal Libs";
sourceTree = "<group>";
};
- F589AE7C12890BDA00D8079E /* arm */ = {
- isa = PBXGroup;
- children = (
- F589AE7D12890BEF00D8079E /* libsquish-arm-osx.a */,
- F589AE7E12890BEF00D8079E /* librtv-arm-osx.a */,
- F589AE7F12890BEF00D8079E /* libxbms-arm-osx.a */,
- F589AE8012890BEF00D8079E /* libxdaap-arm-osx.a */,
- );
- name = arm;
- sourceTree = "<group>";
- };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj
index 3b39d5c688..340af3cf84 100644
--- a/XBMC-IOS.xcodeproj/project.pbxproj
+++ b/XBMC-IOS.xcodeproj/project.pbxproj
@@ -899,10 +899,10 @@
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 */; };
F56C8C0C131F47EA000AD0F6 /* libjsoncpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C06131F47EA000AD0F6 /* libjsoncpp.a */; };
- F56C8C11131F4811000AD0F6 /* libsquish-arm-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C0D131F4811000AD0F6 /* libsquish-arm-osx.a */; };
- F56C8C12131F4811000AD0F6 /* librtv-arm-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C0E131F4811000AD0F6 /* librtv-arm-osx.a */; };
- F56C8C13131F4811000AD0F6 /* libxbms-arm-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C0F131F4811000AD0F6 /* libxbms-arm-osx.a */; };
- F56C8C14131F4811000AD0F6 /* libxdaap-arm-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C10131F4811000AD0F6 /* libxdaap-arm-osx.a */; };
+ F56C8C11131F4811000AD0F6 /* libsquish.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C0D131F4811000AD0F6 /* libsquish.a */; };
+ F56C8C12131F4811000AD0F6 /* librtv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C0E131F4811000AD0F6 /* librtv.a */; };
+ F56C8C13131F4811000AD0F6 /* libxbms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C0F131F4811000AD0F6 /* libxbms.a */; };
+ F56C8C14131F4811000AD0F6 /* libxdaap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C10131F4811000AD0F6 /* libxdaap.a */; };
F57A1DB81329FAF700498CC7 /* SourcesDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F57A1DB61329FAF700498CC7 /* SourcesDirectory.cpp */; };
F5899DCE1287212700D8079E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5899DCA1287212700D8079E /* QuartzCore.framework */; };
F5899DCF1287212700D8079E /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5899DCB1287212700D8079E /* OpenGLES.framework */; };
@@ -2825,10 +2825,10 @@
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>"; };
F56C8C06131F47EA000AD0F6 /* libjsoncpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjsoncpp.a; path = lib/jsoncpp/src/lib_json/libjsoncpp.a; sourceTree = "<group>"; };
- F56C8C0D131F4811000AD0F6 /* libsquish-arm-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsquish-arm-osx.a"; path = "lib/libsquish/libsquish-arm-osx.a"; sourceTree = "<group>"; };
- F56C8C0E131F4811000AD0F6 /* librtv-arm-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "librtv-arm-osx.a"; path = "lib/libRTV/librtv-arm-osx.a"; sourceTree = "<group>"; };
- F56C8C0F131F4811000AD0F6 /* libxbms-arm-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libxbms-arm-osx.a"; path = "lib/libXBMS/libxbms-arm-osx.a"; sourceTree = "<group>"; };
- F56C8C10131F4811000AD0F6 /* libxdaap-arm-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libxdaap-arm-osx.a"; path = "lib/libXDAAP/libxdaap-arm-osx.a"; sourceTree = "<group>"; };
+ F56C8C0D131F4811000AD0F6 /* libsquish.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsquish.a; path = lib/libsquish/libsquish.a; sourceTree = "<group>"; };
+ F56C8C0E131F4811000AD0F6 /* librtv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librtv.a; path = lib/libRTV/librtv.a; sourceTree = "<group>"; };
+ F56C8C0F131F4811000AD0F6 /* libxbms.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxbms.a; path = lib/libXBMS/libxbms.a; sourceTree = "<group>"; };
+ F56C8C10131F4811000AD0F6 /* libxdaap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxdaap.a; path = lib/libXDAAP/libxdaap.a; sourceTree = "<group>"; };
F57A1DB61329FAF700498CC7 /* SourcesDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SourcesDirectory.cpp; sourceTree = "<group>"; };
F57A1DB71329FAF700498CC7 /* SourcesDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourcesDirectory.h; sourceTree = "<group>"; };
F5899DCA1287212700D8079E /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
@@ -2888,10 +2888,10 @@
F56C8C0A131F47EA000AD0F6 /* http-api.a in Frameworks */,
F56C8C0B131F47EA000AD0F6 /* json-rpc.a in Frameworks */,
F56C8C0C131F47EA000AD0F6 /* libjsoncpp.a in Frameworks */,
- F56C8C11131F4811000AD0F6 /* libsquish-arm-osx.a in Frameworks */,
- F56C8C12131F4811000AD0F6 /* librtv-arm-osx.a in Frameworks */,
- F56C8C13131F4811000AD0F6 /* libxbms-arm-osx.a in Frameworks */,
- F56C8C14131F4811000AD0F6 /* libxdaap-arm-osx.a in Frameworks */,
+ F56C8C11131F4811000AD0F6 /* libsquish.a in Frameworks */,
+ F56C8C12131F4811000AD0F6 /* librtv.a in Frameworks */,
+ F56C8C13131F4811000AD0F6 /* libxbms.a in Frameworks */,
+ F56C8C14131F4811000AD0F6 /* libxdaap.a in Frameworks */,
F5B1380D13306B890045076D /* libmicrohttpd.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -5695,22 +5695,14 @@
F56C8C04131F47EA000AD0F6 /* http-api.a */,
F56C8C05131F47EA000AD0F6 /* json-rpc.a */,
F56C8C06131F47EA000AD0F6 /* libjsoncpp.a */,
- F589AE7C12890BDA00D8079E /* arm */,
+ F56C8C0D131F4811000AD0F6 /* libsquish.a */,
+ F56C8C0E131F4811000AD0F6 /* librtv.a */,
+ F56C8C0F131F4811000AD0F6 /* libxbms.a */,
+ F56C8C10131F4811000AD0F6 /* libxdaap.a */,
);
name = "Internal Libs";
sourceTree = "<group>";
};
- F589AE7C12890BDA00D8079E /* arm */ = {
- isa = PBXGroup;
- children = (
- F56C8C0D131F4811000AD0F6 /* libsquish-arm-osx.a */,
- F56C8C0E131F4811000AD0F6 /* librtv-arm-osx.a */,
- F56C8C0F131F4811000AD0F6 /* libxbms-arm-osx.a */,
- F56C8C10131F4811000AD0F6 /* libxdaap-arm-osx.a */,
- );
- name = arm;
- sourceTree = "<group>";
- };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index ce4e270a0a..ab2231d500 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -384,8 +384,7 @@
43348AAD1077486D00F859CF /* PlayerSelectionRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43348AAA1077486D00F859CF /* PlayerSelectionRule.cpp */; };
43348AAE1077486D00F859CF /* PlayerCoreFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43348AA81077486D00F859CF /* PlayerCoreFactory.cpp */; };
43348AAF1077486D00F859CF /* PlayerSelectionRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43348AAA1077486D00F859CF /* PlayerSelectionRule.cpp */; };
- 43352CEE1071634600706B8A /* libsquish-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352CED1071634600706B8A /* libsquish-x86-osx.a */; };
- 43352CF01071639400706B8A /* libsquish-powerpc-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352CEF1071639400706B8A /* libsquish-powerpc-osx.a */; };
+ 43352CEE1071634600706B8A /* libsquish.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352CED1071634600706B8A /* libsquish.a */; };
43BF08EB1080C6BA00E25290 /* Neptune.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BF08A41080C6B900E25290 /* Neptune.cpp */; };
43BF08EC1080C6BA00E25290 /* NptBase64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BF08A71080C6B900E25290 /* NptBase64.cpp */; };
43BF08ED1080C6BA00E25290 /* NptBufferedStreams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BF08A91080C6B900E25290 /* NptBufferedStreams.cpp */; };
@@ -1027,8 +1026,8 @@
E38E23980D2626E600618676 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E23910D2626E600618676 /* OpenGL.framework */; };
E38E25350D26365C00618676 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E25330D26365C00618676 /* AppKit.framework */; };
E38E25360D26365C00618676 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E25340D26365C00618676 /* ApplicationServices.framework */; };
- E38E25690D2639F100618676 /* libxdaap-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E25680D2639F100618676 /* libxdaap-x86-osx.a */; };
- E38E256D0D263A1C00618676 /* librtv-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E256C0D263A1C00618676 /* librtv-x86-osx.a */; };
+ E38E25690D2639F100618676 /* libxdaap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E25680D2639F100618676 /* libxdaap.a */; };
+ E38E256D0D263A1C00618676 /* librtv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E256C0D263A1C00618676 /* librtv.a */; };
E38E25780D263BF600618676 /* unpack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25770D263BF600618676 /* unpack.cpp */; };
E38E257C0D263C4400618676 /* rar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257B0D263C4400618676 /* rar.cpp */; };
E38E259D0D263CE000618676 /* action.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E257E0D263CE000618676 /* action.cpp */; };
@@ -1756,9 +1755,6 @@
F5A1CBB40F6B06CF00A96ABD /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E35EF2540D380C3D00DB5CD5 /* QuickTime.framework */; };
F5A1CBB50F6B06CF00A96ABD /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E35EF3230D380E1E00DB5CD5 /* Carbon.framework */; };
F5A1CBBB0F6B06CF00A96ABD /* DiskArbitration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88ECB6580DE013C4003396A7 /* DiskArbitration.framework */; };
- F5A1CC020F6B1FB600A96ABD /* librtv-powerpc-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A1CC010F6B1FB600A96ABD /* librtv-powerpc-osx.a */; };
- F5A1CC060F6B203100A96ABD /* libxbms-powerpc-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A1CC050F6B203100A96ABD /* libxbms-powerpc-osx.a */; };
- F5A1CC080F6B209400A96ABD /* libxdaap-powerpc-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A1CC070F6B209400A96ABD /* libxdaap-powerpc-osx.a */; };
F5A2BD0E0F7AD9140006ABA0 /* ZeroconfOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E46F7C2C0F77219700C25D29 /* ZeroconfOSX.cpp */; };
F5A2BD0F0F7AD92C0006ABA0 /* Zeroconf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E46F7C280F77217400C25D29 /* Zeroconf.cpp */; };
F5A7A6211127980A0059D6AA /* posix-realtime-stub.c in Sources */ = {isa = PBXBuildFile; fileRef = F5A7A61F1127980A0059D6AA /* posix-realtime-stub.c */; };
@@ -1798,6 +1794,10 @@
F5B5D011133AFB03007A4B4C /* libGLEW.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E24250D26317D00618676 /* libGLEW.dylib */; };
F5B5D014133AFB2D007A4B4C /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138641330811D0045076D /* libmicrohttpd.dylib */; };
F5B5D015133AFB2E007A4B4C /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138641330811D0045076D /* libmicrohttpd.dylib */; };
+ F5B5D64D133FC2C1007A4B4C /* libsquish.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352CED1071634600706B8A /* libsquish.a */; };
+ F5B5D64E133FC2E7007A4B4C /* librtv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E256C0D263A1C00618676 /* librtv.a */; };
+ F5B5D64F133FC2EF007A4B4C /* libxbms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5DC8816110A4B8900EE1B15 /* libxbms.a */; };
+ F5B5D650133FC312007A4B4C /* libxdaap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E25680D2639F100618676 /* libxdaap.a */; };
F5BDB80C120202F400F0B710 /* DVDSubtitleTagSami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */; };
F5BDB80D120202F400F0B710 /* DVDSubtitleTagSami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */; };
F5BDB81A1202032400F0B710 /* DVDSubtitleTagMicroDVD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB8191202032400F0B710 /* DVDSubtitleTagMicroDVD.cpp */; };
@@ -1818,7 +1818,7 @@
F5DC8810110A4A0B00EE1B15 /* FileXBMSP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DC880E110A4A0B00EE1B15 /* FileXBMSP.cpp */; };
F5DC8813110A4A2400EE1B15 /* XBMSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DC8812110A4A2400EE1B15 /* XBMSDirectory.cpp */; };
F5DC8814110A4A2400EE1B15 /* XBMSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5DC8812110A4A2400EE1B15 /* XBMSDirectory.cpp */; };
- F5DC8817110A4B8900EE1B15 /* libxbms-x86-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5DC8816110A4B8900EE1B15 /* libxbms-x86-osx.a */; };
+ F5DC8817110A4B8900EE1B15 /* libxbms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5DC8816110A4B8900EE1B15 /* libxbms.a */; };
F5DC888B110A654000EE1B15 /* libapetag.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5DC888A110A654000EE1B15 /* libapetag.a */; };
F5DC888C110A654000EE1B15 /* libapetag.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5DC888A110A654000EE1B15 /* libapetag.a */; };
F5E55B5D10741272006E788A /* DVDPlayerTeletext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E55B5B10741272006E788A /* DVDPlayerTeletext.cpp */; };
@@ -2252,8 +2252,7 @@
43348AAA1077486D00F859CF /* PlayerSelectionRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PlayerSelectionRule.cpp; path = playercorefactory/PlayerSelectionRule.cpp; sourceTree = "<group>"; };
43348AAB1077486D00F859CF /* PlayerSelectionRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlayerSelectionRule.h; path = playercorefactory/PlayerSelectionRule.h; sourceTree = "<group>"; };
43352CE61071545C00706B8A /* squish.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = squish.h; path = libsquish/squish.h; sourceTree = "<group>"; };
- 43352CED1071634600706B8A /* libsquish-x86-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsquish-x86-osx.a"; path = "lib/libsquish/libsquish-x86-osx.a"; sourceTree = "<group>"; };
- 43352CEF1071639400706B8A /* libsquish-powerpc-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsquish-powerpc-osx.a"; path = "lib/libsquish/libsquish-powerpc-osx.a"; sourceTree = "<group>"; };
+ 43352CED1071634600706B8A /* libsquish.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsquish.a; path = lib/libsquish/libsquish.a; sourceTree = "<group>"; };
4367218F12D6691F002508E6 /* ISemaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISemaphore.h; sourceTree = "<group>"; };
436721A612D66A09002508E6 /* IAnnouncer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IAnnouncer.h; sourceTree = "<group>"; };
436B38F3106628850049AB3B /* EndianSwap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EndianSwap.h; sourceTree = "<group>"; };
@@ -3514,8 +3513,8 @@
E38E24250D26317D00618676 /* libGLEW.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libGLEW.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libGLEW.dylib"; sourceTree = "<absolute>"; };
E38E25330D26365C00618676 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
E38E25340D26365C00618676 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
- E38E25680D2639F100618676 /* libxdaap-x86-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libxdaap-x86-osx.a"; path = "lib/libXDAAP/libxdaap-x86-osx.a"; sourceTree = "<group>"; };
- E38E256C0D263A1C00618676 /* librtv-x86-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "librtv-x86-osx.a"; path = "lib/libRTV/librtv-x86-osx.a"; sourceTree = "<group>"; };
+ E38E25680D2639F100618676 /* libxdaap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxdaap.a; path = lib/libXDAAP/libxdaap.a; sourceTree = "<group>"; };
+ E38E256C0D263A1C00618676 /* librtv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librtv.a; path = lib/libRTV/librtv.a; sourceTree = "<group>"; };
E38E25770D263BF600618676 /* unpack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unpack.cpp; sourceTree = "<group>"; };
E38E257B0D263C4400618676 /* rar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rar.cpp; sourceTree = "<group>"; };
E38E257E0D263CE000618676 /* action.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = action.cpp; sourceTree = "<group>"; };
@@ -3709,9 +3708,6 @@
F5A00B240EFDE44100CD59F3 /* NullDirectSound.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NullDirectSound.cpp; path = xbmc/cores/AudioRenderers/NullDirectSound.cpp; sourceTree = SOURCE_ROOT; };
F5A00B250EFDE44100CD59F3 /* NullDirectSound.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NullDirectSound.h; path = xbmc/cores/AudioRenderers/NullDirectSound.h; sourceTree = SOURCE_ROOT; };
F5A1CBD20F6B06CF00A96ABD /* XBMC */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XBMC; sourceTree = BUILT_PRODUCTS_DIR; };
- F5A1CC010F6B1FB600A96ABD /* librtv-powerpc-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "librtv-powerpc-osx.a"; path = "lib/libRTV/librtv-powerpc-osx.a"; sourceTree = "<group>"; };
- F5A1CC050F6B203100A96ABD /* libxbms-powerpc-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libxbms-powerpc-osx.a"; path = "lib/libXBMS/libxbms-powerpc-osx.a"; sourceTree = "<group>"; };
- F5A1CC070F6B209400A96ABD /* libxdaap-powerpc-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libxdaap-powerpc-osx.a"; path = "lib/libXDAAP/libxdaap-powerpc-osx.a"; sourceTree = "<group>"; };
F5A7A61F1127980A0059D6AA /* posix-realtime-stub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "posix-realtime-stub.c"; sourceTree = "<group>"; };
F5A7A6201127980A0059D6AA /* posix-realtime-stub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "posix-realtime-stub.h"; sourceTree = "<group>"; };
F5A7A6F0112893330059D6AA /* libjsoncpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjsoncpp.a; path = lib/jsoncpp/src/lib_json/libjsoncpp.a; sourceTree = "<group>"; };
@@ -3760,7 +3756,7 @@
F5DC880E110A4A0B00EE1B15 /* FileXBMSP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileXBMSP.cpp; sourceTree = "<group>"; };
F5DC8811110A4A2400EE1B15 /* XBMSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMSDirectory.h; sourceTree = "<group>"; };
F5DC8812110A4A2400EE1B15 /* XBMSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMSDirectory.cpp; sourceTree = "<group>"; };
- F5DC8816110A4B8900EE1B15 /* libxbms-x86-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libxbms-x86-osx.a"; path = "lib/libXBMS/libxbms-x86-osx.a"; sourceTree = "<group>"; };
+ F5DC8816110A4B8900EE1B15 /* libxbms.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxbms.a; path = lib/libXBMS/libxbms.a; sourceTree = "<group>"; };
F5DC888A110A654000EE1B15 /* libapetag.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libapetag.a; path = lib/libapetag/.libs/libapetag.a; sourceTree = "<group>"; };
F5E55B5B10741272006E788A /* DVDPlayerTeletext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDPlayerTeletext.cpp; sourceTree = "<group>"; };
F5E55B5C10741272006E788A /* DVDPlayerTeletext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDPlayerTeletext.h; sourceTree = "<group>"; };
@@ -3830,15 +3826,15 @@
E38E23980D2626E600618676 /* OpenGL.framework in Frameworks */,
E38E25350D26365C00618676 /* AppKit.framework in Frameworks */,
E38E25360D26365C00618676 /* ApplicationServices.framework in Frameworks */,
- E38E25690D2639F100618676 /* libxdaap-x86-osx.a in Frameworks */,
- E38E256D0D263A1C00618676 /* librtv-x86-osx.a in Frameworks */,
+ E38E25690D2639F100618676 /* libxdaap.a in Frameworks */,
+ E38E256D0D263A1C00618676 /* librtv.a in Frameworks */,
E33466A60D2E5103005A65EC /* IOKit.framework in Frameworks */,
E35EF2550D380C3D00DB5CD5 /* QuickTime.framework in Frameworks */,
E35EF3240D380E1E00DB5CD5 /* Carbon.framework in Frameworks */,
88ECB6590DE013C4003396A7 /* DiskArbitration.framework in Frameworks */,
F59879080FBAA0C3008EF4FB /* QuartzCore.framework in Frameworks */,
- 43352CEE1071634600706B8A /* libsquish-x86-osx.a in Frameworks */,
- F5DC8817110A4B8900EE1B15 /* libxbms-x86-osx.a in Frameworks */,
+ 43352CEE1071634600706B8A /* libsquish.a in Frameworks */,
+ F5DC8817110A4B8900EE1B15 /* libxbms.a in Frameworks */,
F5DC888B110A654000EE1B15 /* libapetag.a in Frameworks */,
F5A7A6F1112893330059D6AA /* libjsoncpp.a in Frameworks */,
F5A7A6F4112893440059D6AA /* json-rpc.a in Frameworks */,
@@ -3887,11 +3883,7 @@
F5A1CBB40F6B06CF00A96ABD /* QuickTime.framework in Frameworks */,
F5A1CBB50F6B06CF00A96ABD /* Carbon.framework in Frameworks */,
F5A1CBBB0F6B06CF00A96ABD /* DiskArbitration.framework in Frameworks */,
- F5A1CC020F6B1FB600A96ABD /* librtv-powerpc-osx.a in Frameworks */,
- F5A1CC060F6B203100A96ABD /* libxbms-powerpc-osx.a in Frameworks */,
- F5A1CC080F6B209400A96ABD /* libxdaap-powerpc-osx.a in Frameworks */,
F59879090FBAA0C3008EF4FB /* QuartzCore.framework in Frameworks */,
- 43352CF01071639400706B8A /* libsquish-powerpc-osx.a in Frameworks */,
F5DC888C110A654000EE1B15 /* libapetag.a in Frameworks */,
F5A7A6F2112893330059D6AA /* libjsoncpp.a in Frameworks */,
F5A7A6F5112893440059D6AA /* json-rpc.a in Frameworks */,
@@ -3919,6 +3911,10 @@
F5B5D00D133AFAC7007A4B4C /* libcdio.dylib in Frameworks */,
F5B5D011133AFB03007A4B4C /* libGLEW.dylib in Frameworks */,
F5B5D015133AFB2E007A4B4C /* libmicrohttpd.dylib in Frameworks */,
+ F5B5D64D133FC2C1007A4B4C /* libsquish.a in Frameworks */,
+ F5B5D64E133FC2E7007A4B4C /* librtv.a in Frameworks */,
+ F5B5D64F133FC2EF007A4B4C /* libxbms.a in Frameworks */,
+ F5B5D650133FC312007A4B4C /* libxdaap.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -6857,8 +6853,10 @@
F5A7A6F61128934C0059D6AA /* http-api.a */,
F5A7A6F3112893440059D6AA /* json-rpc.a */,
F5A7A6F0112893330059D6AA /* libjsoncpp.a */,
- F5A1C86A0F6B048000A96ABD /* x86 */,
- F5A1C8690F6B047D00A96ABD /* ppc */,
+ 43352CED1071634600706B8A /* libsquish.a */,
+ E38E256C0D263A1C00618676 /* librtv.a */,
+ F5DC8816110A4B8900EE1B15 /* libxbms.a */,
+ E38E25680D2639F100618676 /* libxdaap.a */,
);
name = "internal libs";
sourceTree = "<group>";
@@ -6877,28 +6875,6 @@
name = AudioRenderers;
sourceTree = "<group>";
};
- F5A1C8690F6B047D00A96ABD /* ppc */ = {
- isa = PBXGroup;
- children = (
- 43352CEF1071639400706B8A /* libsquish-powerpc-osx.a */,
- F5A1CC010F6B1FB600A96ABD /* librtv-powerpc-osx.a */,
- F5A1CC050F6B203100A96ABD /* libxbms-powerpc-osx.a */,
- F5A1CC070F6B209400A96ABD /* libxdaap-powerpc-osx.a */,
- );
- name = ppc;
- sourceTree = "<group>";
- };
- F5A1C86A0F6B048000A96ABD /* x86 */ = {
- isa = PBXGroup;
- children = (
- 43352CED1071634600706B8A /* libsquish-x86-osx.a */,
- E38E256C0D263A1C00618676 /* librtv-x86-osx.a */,
- F5DC8816110A4B8900EE1B15 /* libxbms-x86-osx.a */,
- E38E25680D2639F100618676 /* libxdaap-x86-osx.a */,
- );
- name = x86;
- sourceTree = "<group>";
- };
F5E55E601076B34F006E788A /* libsquish */ = {
isa = PBXGroup;
children = (
@@ -9234,6 +9210,10 @@
"\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"",
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib/mysql\"",
+ "\"$(SRCROOT)/lib/libsquish\"",
+ "\"$(SRCROOT)/lib/libRTV\"",
+ "\"$(SRCROOT)/lib/libXBMS\"",
+ "\"$(SRCROOT)/lib/libXDAAP\"",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib/mysql\"";
@@ -9317,6 +9297,10 @@
"\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"",
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib/mysql\"",
+ "\"$(SRCROOT)/lib/libsquish\"",
+ "\"$(SRCROOT)/lib/libRTV\"",
+ "\"$(SRCROOT)/lib/libXBMS\"",
+ "\"$(SRCROOT)/lib/libXDAAP\"",
);
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib\"";
LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib/mysql\"";
diff --git a/lib/libRTV/Makefile.in b/lib/libRTV/Makefile.in
index 697573b1b8..ebd7448758 100644
--- a/lib/libRTV/Makefile.in
+++ b/lib/libRTV/Makefile.in
@@ -3,7 +3,7 @@ SRCS=crypt.c guideclient.c GuideParser.c httpclient.c httpfsclient.c interface.c
CFLAGS += -D_LINUX
CXXFLAGS += -D_LINUX
-LIB= librtv-@ARCH@.a
+LIB= librtv.a
include ../../Makefile.include
diff --git a/lib/libUPnP/Makefile.in b/lib/libUPnP/Makefile.in
index 924cb87a12..2037059525 100644
--- a/lib/libUPnP/Makefile.in
+++ b/lib/libUPnP/Makefile.in
@@ -76,7 +76,7 @@ SRCS= Platinum/Source/Core/PltAction.cpp \
INCLUDES=-I./Neptune/Source/Core -I./Platinum/Source/Core -I./Platinum/Source/Platinum -I./Platinum/Source/Devices/MediaServer -I./Neptune/Source/System/Posix
-LIB=libupnp-@ARCH@.a
+LIB=libupnp.a
include ../../Makefile.include
-include $(filter %.P, $(OBJS:.o=.P))
diff --git a/lib/libXBMS/Makefile.in b/lib/libXBMS/Makefile.in
index 75d21ddbe3..74b756a65d 100644
--- a/lib/libXBMS/Makefile.in
+++ b/lib/libXBMS/Makefile.in
@@ -1,6 +1,6 @@
CFLAGS += -D_LINUX
-LIB=libxbms-@ARCH@.a
+LIB=libxbms.a
SRCS=ccbuffer.c ccutil.c ccxclient.c ccxclientconnxbox.c ccxdiscover.c ccxencode.c ccxmltrans.c
diff --git a/lib/libXDAAP/Makefile.in b/lib/libXDAAP/Makefile.in
index aa1b8a45f5..126043ecc8 100644
--- a/lib/libXDAAP/Makefile.in
+++ b/lib/libXDAAP/Makefile.in
@@ -1,6 +1,6 @@
SRCS= daap.c debug.c dmap_generics.c global.c httpClient.c ioloop.c libXDAAP.c threadpool.c Authentication/hasher.c Authentication/md5.c
-LIB=libxdaap-@ARCH@.a
+LIB=libxdaap.a
include ../../Makefile.include
diff --git a/lib/libsquish/Makefile.in b/lib/libsquish/Makefile.in
index c562c83366..60a6b2ecbb 100644
--- a/lib/libsquish/Makefile.in
+++ b/lib/libsquish/Makefile.in
@@ -11,7 +11,7 @@ else
CXXFLAGS+=-I. -DSQUISH_USE_SSE=2 -msse2
endif
endif
-LIB=libsquish-@ARCH@.a
+LIB=libsquish.a
include ../../Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in
index e69f78275f..2d0dfe5bf3 100644
--- a/tools/TexturePacker/Makefile.in
+++ b/tools/TexturePacker/Makefile.in
@@ -1,9 +1,9 @@
ARCH=@ARCH@
DEFINES =
ifeq ($(findstring osx,$(ARCH)),osx)
-LIBS = @abs_top_srcdir@/lib/libsquish/libsquish-@ARCH@.a -L/Users/Shared/xbmc-depends/osx-10.4_i386/lib -lSDL_image -lSDL -llzo2
+LIBS = @abs_top_srcdir@/lib/libsquish/libsquish.a -L/Users/Shared/xbmc-depends/osx-10.4_i386/lib -lSDL_image -lSDL -llzo2
else
-LIBS = @abs_top_srcdir@/lib/libsquish/libsquish-@ARCH@.a -lSDL_image -lSDL -llzo2
+LIBS = @abs_top_srcdir@/lib/libsquish/libsquish.a -lSDL_image -lSDL -llzo2
endif
OBJS = \
generated by cgit v1.2.3 (git 2.26.2) at 2025-02-03 04:38:16 +0000