Skip to content

Commit

Permalink
[osx/ios] move interfaces, interfaces/http-api and interfaces/json-rp…
Browse files Browse the repository at this point in the history 
…c/json out of xcode_depends and into xcode project.
  • Loading branch information
@davilla
davilla committed Mar 29, 2011
1 parent 15dcb7b commit 490a3a1
Show file tree
Hide file tree
Showing 4 changed files with 346 additions and 31 deletions.
3 changes: 0 additions & 3 deletions Makefile.in
View file
Expand Up @@ -460,9 +460,6 @@ xcode_depends: \
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 \
lib/jsoncpp/src/lib_json/libjsoncpp.a

# platform independend objects
Expand Down
114 changes: 106 additions & 8 deletions XBMC-ATV2.xcodeproj/project.pbxproj
View file
Expand Up @@ -883,8 +883,6 @@
F56C7DE0131EF8D9000AD0F6 /* PltMediaServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7D6A131EF8D9000AD0F6 /* PltMediaServer.cpp */; };
F56C7DE1131EF8D9000AD0F6 /* PltSyncMediaBrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7D6C131EF8D9000AD0F6 /* PltSyncMediaBrowser.cpp */; };
F56C7DE2131EF8D9000AD0F6 /* PltLightSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7D72131EF8D9000AD0F6 /* PltLightSample.cpp */; };
F56C7EDD131F0942000AD0F6 /* http-api.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C7EDC131F0942000AD0F6 /* http-api.a */; };
F56C7EDF131F0959000AD0F6 /* json-rpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C7EDE131F0959000AD0F6 /* json-rpc.a */; };
F56C7EE1131F0965000AD0F6 /* libjsoncpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C7EE0131F0965000AD0F6 /* libjsoncpp.a */; };
F56C7F30131F0BB4000AD0F6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F56C7F2E131F0BB4000AD0F6 /* InfoPlist.strings */; };
F56C7FB0131F36BF000AD0F6 /* DVDVideoCodecVideoToolBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7FAE131F36BF000AD0F6 /* DVDVideoCodecVideoToolBox.cpp */; };
Expand Down Expand Up @@ -917,6 +915,20 @@
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 */; };
F5AE40EA134175160004BD79 /* HttpApi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE40E6134175160004BD79 /* HttpApi.cpp */; };
F5AE40EB134175160004BD79 /* XBMChttp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE40E8134175160004BD79 /* XBMChttp.cpp */; };
F5AE41081341751E0004BD79 /* AudioLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE40ED1341751E0004BD79 /* AudioLibrary.cpp */; };
F5AE41091341751E0004BD79 /* AVPlayerOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE40EF1341751E0004BD79 /* AVPlayerOperations.cpp */; };
F5AE410A1341751E0004BD79 /* AVPlaylistOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE40F11341751E0004BD79 /* AVPlaylistOperations.cpp */; };
F5AE410B1341751E0004BD79 /* FileItemHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE40F31341751E0004BD79 /* FileItemHandler.cpp */; };
F5AE410C1341751E0004BD79 /* FileOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE40F51341751E0004BD79 /* FileOperations.cpp */; };
F5AE410D1341751E0004BD79 /* JSONRPC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE40F91341751E0004BD79 /* JSONRPC.cpp */; };
F5AE410E1341751E0004BD79 /* PicturePlayerOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE40FC1341751E0004BD79 /* PicturePlayerOperations.cpp */; };
F5AE410F1341751E0004BD79 /* PlayerOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE40FE1341751E0004BD79 /* PlayerOperations.cpp */; };
F5AE41101341751E0004BD79 /* PlaylistOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE41001341751E0004BD79 /* PlaylistOperations.cpp */; };
F5AE41111341751E0004BD79 /* SystemOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE41021341751E0004BD79 /* SystemOperations.cpp */; };
F5AE41121341751E0004BD79 /* VideoLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE41041341751E0004BD79 /* VideoLibrary.cpp */; };
F5AE41131341751E0004BD79 /* XBMCOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE41061341751E0004BD79 /* XBMCOperations.cpp */; };
F5B13837133080CB0045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13835133080CA0045076D /* libmicrohttpd.dylib */; };
F5B13E0113344F310045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13E0013344F310045076D /* DarwinUtils.mm */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -2810,8 +2822,6 @@
F56C7D72131EF8D9000AD0F6 /* PltLightSample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PltLightSample.cpp; sourceTree = "<group>"; };
F56C7D73131EF8D9000AD0F6 /* PltLightSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PltLightSample.h; sourceTree = "<group>"; };
F56C7D78131EF8D9000AD0F6 /* SsdpProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SsdpProxy.h; sourceTree = "<group>"; };
F56C7EDC131F0942000AD0F6 /* http-api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "http-api.a"; path = "xbmc/interfaces/http-api/http-api.a"; sourceTree = "<group>"; };
F56C7EDE131F0959000AD0F6 /* json-rpc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "json-rpc.a"; path = "xbmc/interfaces/json-rpc/json-rpc.a"; sourceTree = "<group>"; };
F56C7EE0131F0965000AD0F6 /* libjsoncpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjsoncpp.a; path = lib/jsoncpp/src/lib_json/libjsoncpp.a; sourceTree = "<group>"; };
F56C7F2F131F0BB4000AD0F6 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
F56C7FAE131F36BF000AD0F6 /* DVDVideoCodecVideoToolBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDVideoCodecVideoToolBox.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2846,6 +2856,37 @@
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; };
F5AE40E6134175160004BD79 /* HttpApi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpApi.cpp; sourceTree = "<group>"; };
F5AE40E7134175160004BD79 /* HttpApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpApi.h; sourceTree = "<group>"; };
F5AE40E8134175160004BD79 /* XBMChttp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMChttp.cpp; sourceTree = "<group>"; };
F5AE40E9134175160004BD79 /* XBMChttp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMChttp.h; sourceTree = "<group>"; };
F5AE40ED1341751E0004BD79 /* AudioLibrary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioLibrary.cpp; sourceTree = "<group>"; };
F5AE40EE1341751E0004BD79 /* AudioLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioLibrary.h; sourceTree = "<group>"; };
F5AE40EF1341751E0004BD79 /* AVPlayerOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AVPlayerOperations.cpp; sourceTree = "<group>"; };
F5AE40F01341751E0004BD79 /* AVPlayerOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVPlayerOperations.h; sourceTree = "<group>"; };
F5AE40F11341751E0004BD79 /* AVPlaylistOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AVPlaylistOperations.cpp; sourceTree = "<group>"; };
F5AE40F21341751E0004BD79 /* AVPlaylistOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVPlaylistOperations.h; sourceTree = "<group>"; };
F5AE40F31341751E0004BD79 /* FileItemHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileItemHandler.cpp; sourceTree = "<group>"; };
F5AE40F41341751E0004BD79 /* FileItemHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileItemHandler.h; sourceTree = "<group>"; };
F5AE40F51341751E0004BD79 /* FileOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileOperations.cpp; sourceTree = "<group>"; };
F5AE40F61341751E0004BD79 /* FileOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileOperations.h; sourceTree = "<group>"; };
F5AE40F71341751E0004BD79 /* IClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IClient.h; sourceTree = "<group>"; };
F5AE40F81341751E0004BD79 /* ITransportLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ITransportLayer.h; sourceTree = "<group>"; };
F5AE40F91341751E0004BD79 /* JSONRPC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONRPC.cpp; sourceTree = "<group>"; };
F5AE40FA1341751E0004BD79 /* JSONRPC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONRPC.h; sourceTree = "<group>"; };
F5AE40FB1341751E0004BD79 /* JSONUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONUtils.h; sourceTree = "<group>"; };
F5AE40FC1341751E0004BD79 /* PicturePlayerOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PicturePlayerOperations.cpp; sourceTree = "<group>"; };
F5AE40FD1341751E0004BD79 /* PicturePlayerOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PicturePlayerOperations.h; sourceTree = "<group>"; };
F5AE40FE1341751E0004BD79 /* PlayerOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerOperations.cpp; sourceTree = "<group>"; };
F5AE40FF1341751E0004BD79 /* PlayerOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerOperations.h; sourceTree = "<group>"; };
F5AE41001341751E0004BD79 /* PlaylistOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlaylistOperations.cpp; sourceTree = "<group>"; };
F5AE41011341751E0004BD79 /* PlaylistOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlaylistOperations.h; sourceTree = "<group>"; };
F5AE41021341751E0004BD79 /* SystemOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemOperations.cpp; sourceTree = "<group>"; };
F5AE41031341751E0004BD79 /* SystemOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemOperations.h; sourceTree = "<group>"; };
F5AE41041341751E0004BD79 /* VideoLibrary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoLibrary.cpp; sourceTree = "<group>"; };
F5AE41051341751E0004BD79 /* VideoLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoLibrary.h; sourceTree = "<group>"; };
F5AE41061341751E0004BD79 /* XBMCOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMCOperations.cpp; sourceTree = "<group>"; };
F5AE41071341751E0004BD79 /* XBMCOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMCOperations.h; sourceTree = "<group>"; };
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>"; };
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>"; };
Expand Down Expand Up @@ -2892,8 +2933,6 @@
F56B15FF12CD695C009B4C96 /* CoreGraphics.framework in Frameworks */,
F56B161B12CD69DB009B4C96 /* ImageIO.framework in Frameworks */,
4D5D2E131301753F006ABC13 /* CFNetwork.framework in Frameworks */,
F56C7EDD131F0942000AD0F6 /* http-api.a in Frameworks */,
F56C7EDF131F0959000AD0F6 /* json-rpc.a in Frameworks */,
F56C7EE1131F0965000AD0F6 /* libjsoncpp.a in Frameworks */,
F5B13837133080CB0045076D /* libmicrohttpd.dylib in Frameworks */,
);
Expand Down Expand Up @@ -4435,7 +4474,9 @@
F56C75A4131EC152000AD0F6 /* AnnouncementManager.h */,
F56C75A5131EC153000AD0F6 /* Builtins.cpp */,
F56C75A6131EC153000AD0F6 /* Builtins.h */,
F5AE40E5134175160004BD79 /* http-api */,
F56C75A7131EC153000AD0F6 /* IAnnouncer.h */,
F5AE40EC1341751E0004BD79 /* json-rpc */,
);
path = interfaces;
sourceTree = "<group>";
Expand Down Expand Up @@ -5697,8 +5738,6 @@
isa = PBXGroup;
children = (
F589AE7012890B9E00D8079E /* libapetag.a */,
F56C7EDC131F0942000AD0F6 /* http-api.a */,
F56C7EDE131F0959000AD0F6 /* json-rpc.a */,
F56C7EE0131F0965000AD0F6 /* libjsoncpp.a */,
F589AE7D12890BEF00D8079E /* libsquish.a */,
F589AE7E12890BEF00D8079E /* librtv.a */,
Expand All @@ -5708,6 +5747,51 @@
name = "Internal Libs";
sourceTree = "<group>";
};
F5AE40E5134175160004BD79 /* http-api */ = {
isa = PBXGroup;
children = (
F5AE40E6134175160004BD79 /* HttpApi.cpp */,
F5AE40E7134175160004BD79 /* HttpApi.h */,
F5AE40E8134175160004BD79 /* XBMChttp.cpp */,
F5AE40E9134175160004BD79 /* XBMChttp.h */,
);
path = "http-api";
sourceTree = "<group>";
};
F5AE40EC1341751E0004BD79 /* json-rpc */ = {
isa = PBXGroup;
children = (
F5AE40ED1341751E0004BD79 /* AudioLibrary.cpp */,
F5AE40EE1341751E0004BD79 /* AudioLibrary.h */,
F5AE40EF1341751E0004BD79 /* AVPlayerOperations.cpp */,
F5AE40F01341751E0004BD79 /* AVPlayerOperations.h */,
F5AE40F11341751E0004BD79 /* AVPlaylistOperations.cpp */,
F5AE40F21341751E0004BD79 /* AVPlaylistOperations.h */,
F5AE40F31341751E0004BD79 /* FileItemHandler.cpp */,
F5AE40F41341751E0004BD79 /* FileItemHandler.h */,
F5AE40F51341751E0004BD79 /* FileOperations.cpp */,
F5AE40F61341751E0004BD79 /* FileOperations.h */,
F5AE40F71341751E0004BD79 /* IClient.h */,
F5AE40F81341751E0004BD79 /* ITransportLayer.h */,
F5AE40F91341751E0004BD79 /* JSONRPC.cpp */,
F5AE40FA1341751E0004BD79 /* JSONRPC.h */,
F5AE40FB1341751E0004BD79 /* JSONUtils.h */,
F5AE40FC1341751E0004BD79 /* PicturePlayerOperations.cpp */,
F5AE40FD1341751E0004BD79 /* PicturePlayerOperations.h */,
F5AE40FE1341751E0004BD79 /* PlayerOperations.cpp */,
F5AE40FF1341751E0004BD79 /* PlayerOperations.h */,
F5AE41001341751E0004BD79 /* PlaylistOperations.cpp */,
F5AE41011341751E0004BD79 /* PlaylistOperations.h */,
F5AE41021341751E0004BD79 /* SystemOperations.cpp */,
F5AE41031341751E0004BD79 /* SystemOperations.h */,
F5AE41041341751E0004BD79 /* VideoLibrary.cpp */,
F5AE41051341751E0004BD79 /* VideoLibrary.h */,
F5AE41061341751E0004BD79 /* XBMCOperations.cpp */,
F5AE41071341751E0004BD79 /* XBMCOperations.h */,
);
path = "json-rpc";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -6674,6 +6758,20 @@
F5B13E0113344F310045076D /* DarwinUtils.mm in Sources */,
7C99B73F133D372300FC2B16 /* CacheCircular.cpp in Sources */,
7C99B7AA134072CD00FC2B16 /* GUIDialogPlayEject.cpp in Sources */,
F5AE40EA134175160004BD79 /* HttpApi.cpp in Sources */,
F5AE40EB134175160004BD79 /* XBMChttp.cpp in Sources */,
F5AE41081341751E0004BD79 /* AudioLibrary.cpp in Sources */,
F5AE41091341751E0004BD79 /* AVPlayerOperations.cpp in Sources */,
F5AE410A1341751E0004BD79 /* AVPlaylistOperations.cpp in Sources */,
F5AE410B1341751E0004BD79 /* FileItemHandler.cpp in Sources */,
F5AE410C1341751E0004BD79 /* FileOperations.cpp in Sources */,
F5AE410D1341751E0004BD79 /* JSONRPC.cpp in Sources */,
F5AE410E1341751E0004BD79 /* PicturePlayerOperations.cpp in Sources */,
F5AE410F1341751E0004BD79 /* PlayerOperations.cpp in Sources */,
F5AE41101341751E0004BD79 /* PlaylistOperations.cpp in Sources */,
F5AE41111341751E0004BD79 /* SystemOperations.cpp in Sources */,
F5AE41121341751E0004BD79 /* VideoLibrary.cpp in Sources */,
F5AE41131341751E0004BD79 /* XBMCOperations.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down

0 comments on commit 490a3a1

Please sign in to comment.