Skip to content
This repository
Browse code

[ios/atv2] - fix build by syncing xcode projects

  • Loading branch information...
commit 203fbf9fdf18350141ebe915b88c189af400ffaf 1 parent 17cf5e4
Memphiz authored October 07, 2012
16  XBMC-ATV2.xcodeproj/project.pbxproj
@@ -100,6 +100,7 @@
100 100
 		DF23461115FA671900A934F6 /* UPnPInternal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF23460915FA671900A934F6 /* UPnPInternal.cpp */; };
101 101
 		DF23461215FA671900A934F6 /* UPnPRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF23460B15FA671900A934F6 /* UPnPRenderer.cpp */; };
102 102
 		DF23461315FA671900A934F6 /* UPnPServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF23460D15FA671900A934F6 /* UPnPServer.cpp */; };
  103
+		DF24EAC71621E58D00034265 /* DVDDemuxBXA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF24EAC51621E58D00034265 /* DVDDemuxBXA.cpp */; };
103 104
 		DF33C2A415509C1B0046CDCB /* XbmcContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF33C2A215509C1B0046CDCB /* XbmcContext.cpp */; };
104 105
 		DF33C2AE15509C5A0046CDCB /* ilog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF33C2AB15509C5A0046CDCB /* ilog.cpp */; };
105 106
 		DF34890913FD96390026A711 /* GUIAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF34890713FD96390026A711 /* GUIAction.cpp */; };
@@ -648,7 +649,6 @@
648 649
 		F56C7A92131EC155000AD0F6 /* karaokelyricstextlrc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75ED131EC153000AD0F6 /* karaokelyricstextlrc.cpp */; };
649 650
 		F56C7A93131EC155000AD0F6 /* karaokelyricstextustar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75EF131EC153000AD0F6 /* karaokelyricstextustar.cpp */; };
650 651
 		F56C7A94131EC155000AD0F6 /* karaokewindowbackground.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75F1131EC153000AD0F6 /* karaokewindowbackground.cpp */; };
651  
-		F56C7A97131EC155000AD0F6 /* Id3Tag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75FA131EC153000AD0F6 /* Id3Tag.cpp */; };
652 652
 		F56C7A98131EC155000AD0F6 /* MusicInfoTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75FE131EC153000AD0F6 /* MusicInfoTag.cpp */; };
653 653
 		F56C7A9B131EC155000AD0F6 /* MusicInfoTagLoaderASAP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7604131EC153000AD0F6 /* MusicInfoTagLoaderASAP.cpp */; };
654 654
 		F56C7A9C131EC155000AD0F6 /* MusicInfoTagLoaderCDDA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7606131EC153000AD0F6 /* MusicInfoTagLoaderCDDA.cpp */; };
@@ -1251,6 +1251,8 @@
1251 1251
 		DF23460C15FA671900A934F6 /* UPnPRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPRenderer.h; sourceTree = "<group>"; };
1252 1252
 		DF23460D15FA671900A934F6 /* UPnPServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UPnPServer.cpp; sourceTree = "<group>"; };
1253 1253
 		DF23460E15FA671900A934F6 /* UPnPServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPServer.h; sourceTree = "<group>"; };
  1254
+		DF24EAC51621E58D00034265 /* DVDDemuxBXA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDDemuxBXA.cpp; sourceTree = "<group>"; };
  1255
+		DF24EAC61621E58D00034265 /* DVDDemuxBXA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDDemuxBXA.h; sourceTree = "<group>"; };
1254 1256
 		DF33C2A215509C1B0046CDCB /* XbmcContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XbmcContext.cpp; sourceTree = "<group>"; };
1255 1257
 		DF33C2A315509C1B0046CDCB /* XbmcContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XbmcContext.h; sourceTree = "<group>"; };
1256 1258
 		DF33C2AB15509C5A0046CDCB /* ilog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ilog.cpp; sourceTree = "<group>"; };
@@ -2482,10 +2484,6 @@
2482 2484
 		F56C75F0131EC153000AD0F6 /* karaokelyricstextustar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = karaokelyricstextustar.h; sourceTree = "<group>"; };
2483 2485
 		F56C75F1131EC153000AD0F6 /* karaokewindowbackground.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = karaokewindowbackground.cpp; sourceTree = "<group>"; };
2484 2486
 		F56C75F2131EC153000AD0F6 /* karaokewindowbackground.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = karaokewindowbackground.h; sourceTree = "<group>"; };
2485  
-		F56C75F7131EC153000AD0F6 /* DllLibid3tag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibid3tag.h; sourceTree = "<group>"; };
2486  
-		F56C75FA131EC153000AD0F6 /* Id3Tag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Id3Tag.cpp; sourceTree = "<group>"; };
2487  
-		F56C75FB131EC153000AD0F6 /* Id3Tag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Id3Tag.h; sourceTree = "<group>"; };
2488  
-		F56C75FC131EC153000AD0F6 /* id3v1genre.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = id3v1genre.h; sourceTree = "<group>"; };
2489 2487
 		F56C75FD131EC153000AD0F6 /* ImusicInfoTagLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImusicInfoTagLoader.h; sourceTree = "<group>"; };
2490 2488
 		F56C75FE131EC153000AD0F6 /* MusicInfoTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicInfoTag.cpp; sourceTree = "<group>"; };
2491 2489
 		F56C75FF131EC153000AD0F6 /* MusicInfoTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicInfoTag.h; sourceTree = "<group>"; };
@@ -4367,6 +4365,8 @@
4367 4365
 			children = (
4368 4366
 				F56C7298131EC151000AD0F6 /* DVDDemux.cpp */,
4369 4367
 				F56C7299131EC151000AD0F6 /* DVDDemux.h */,
  4368
+				DF24EAC51621E58D00034265 /* DVDDemuxBXA.cpp */,
  4369
+				DF24EAC61621E58D00034265 /* DVDDemuxBXA.h */,
4370 4370
 				F56C7294131EC151000AD0F6 /* DVDDemuxFFmpeg.cpp */,
4371 4371
 				F56C7295131EC151000AD0F6 /* DVDDemuxFFmpeg.h */,
4372 4372
 				F56C7296131EC151000AD0F6 /* DVDDemuxHTSP.cpp */,
@@ -5316,10 +5316,6 @@
5316 5316
 		F56C75F3131EC153000AD0F6 /* tags */ = {
5317 5317
 			isa = PBXGroup;
5318 5318
 			children = (
5319  
-				F56C75F7131EC153000AD0F6 /* DllLibid3tag.h */,
5320  
-				F56C75FA131EC153000AD0F6 /* Id3Tag.cpp */,
5321  
-				F56C75FB131EC153000AD0F6 /* Id3Tag.h */,
5322  
-				F56C75FC131EC153000AD0F6 /* id3v1genre.h */,
5323 5319
 				F56C75FD131EC153000AD0F6 /* ImusicInfoTagLoader.h */,
5324 5320
 				F56C75FE131EC153000AD0F6 /* MusicInfoTag.cpp */,
5325 5321
 				F56C75FF131EC153000AD0F6 /* MusicInfoTag.h */,
@@ -7068,7 +7064,6 @@
7068 7064
 				F56C7A92131EC155000AD0F6 /* karaokelyricstextlrc.cpp in Sources */,
7069 7065
 				F56C7A93131EC155000AD0F6 /* karaokelyricstextustar.cpp in Sources */,
7070 7066
 				F56C7A94131EC155000AD0F6 /* karaokewindowbackground.cpp in Sources */,
7071  
-				F56C7A97131EC155000AD0F6 /* Id3Tag.cpp in Sources */,
7072 7067
 				F56C7A98131EC155000AD0F6 /* MusicInfoTag.cpp in Sources */,
7073 7068
 				F56C7A9B131EC155000AD0F6 /* MusicInfoTagLoaderASAP.cpp in Sources */,
7074 7069
 				F56C7A9C131EC155000AD0F6 /* MusicInfoTagLoaderCDDA.cpp in Sources */,
@@ -7584,6 +7579,7 @@
7584 7579
 				DF91D899161B759B004E6637 /* AddonsOperations.cpp in Sources */,
7585 7580
 				7C4458DB161E209100A905F6 /* Screenshot.cpp in Sources */,
7586 7581
 				1D638118161E20AC003603ED /* PeripheralImon.cpp in Sources */,
  7582
+				DF24EAC71621E58D00034265 /* DVDDemuxBXA.cpp in Sources */,
7587 7583
 			);
7588 7584
 			runOnlyForDeploymentPostprocessing = 0;
7589 7585
 		};
16  XBMC-IOS.xcodeproj/project.pbxproj
@@ -101,6 +101,7 @@
101 101
 		DF23462315FA675200A934F6 /* UPnPInternal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF23461B15FA675200A934F6 /* UPnPInternal.cpp */; };
102 102
 		DF23462415FA675200A934F6 /* UPnPRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF23461D15FA675200A934F6 /* UPnPRenderer.cpp */; };
103 103
 		DF23462515FA675200A934F6 /* UPnPServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF23461F15FA675200A934F6 /* UPnPServer.cpp */; };
  104
+		DF24EADE1621E67200034265 /* DVDDemuxBXA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF24EADC1621E67200034265 /* DVDDemuxBXA.cpp */; };
104 105
 		DF2E329415509B2C000F5772 /* XbmcContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF2E329215509B2C000F5772 /* XbmcContext.cpp */; };
105 106
 		DF33C29415509BF50046CDCB /* ilog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF33C29115509BF50046CDCB /* ilog.cpp */; };
106 107
 		DF3488F813FD961A0026A711 /* GUIAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF3488F613FD961A0026A711 /* GUIAction.cpp */; };
@@ -733,7 +734,6 @@
733 734
 		F56C8A7C131F42ED000AD0F6 /* karaokelyricstextlrc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85D0131F42EA000AD0F6 /* karaokelyricstextlrc.cpp */; };
734 735
 		F56C8A7D131F42ED000AD0F6 /* karaokelyricstextustar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85D2131F42EA000AD0F6 /* karaokelyricstextustar.cpp */; };
735 736
 		F56C8A7E131F42ED000AD0F6 /* karaokewindowbackground.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85D4131F42EA000AD0F6 /* karaokewindowbackground.cpp */; };
736  
-		F56C8A81131F42ED000AD0F6 /* Id3Tag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85DD131F42EA000AD0F6 /* Id3Tag.cpp */; };
737 737
 		F56C8A82131F42ED000AD0F6 /* MusicInfoTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85E1131F42EA000AD0F6 /* MusicInfoTag.cpp */; };
738 738
 		F56C8A85131F42ED000AD0F6 /* MusicInfoTagLoaderASAP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85E7131F42EA000AD0F6 /* MusicInfoTagLoaderASAP.cpp */; };
739 739
 		F56C8A86131F42ED000AD0F6 /* MusicInfoTagLoaderCDDA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C85E9131F42EA000AD0F6 /* MusicInfoTagLoaderCDDA.cpp */; };
@@ -1257,6 +1257,8 @@
1257 1257
 		DF23461E15FA675200A934F6 /* UPnPRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPRenderer.h; sourceTree = "<group>"; };
1258 1258
 		DF23461F15FA675200A934F6 /* UPnPServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UPnPServer.cpp; sourceTree = "<group>"; };
1259 1259
 		DF23462015FA675200A934F6 /* UPnPServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPServer.h; sourceTree = "<group>"; };
  1260
+		DF24EADC1621E67200034265 /* DVDDemuxBXA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDDemuxBXA.cpp; sourceTree = "<group>"; };
  1261
+		DF24EADD1621E67200034265 /* DVDDemuxBXA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDDemuxBXA.h; sourceTree = "<group>"; };
1260 1262
 		DF2E329215509B2C000F5772 /* XbmcContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XbmcContext.cpp; sourceTree = "<group>"; };
1261 1263
 		DF2E329315509B2C000F5772 /* XbmcContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XbmcContext.h; sourceTree = "<group>"; };
1262 1264
 		DF33C29115509BF50046CDCB /* ilog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ilog.cpp; sourceTree = "<group>"; };
@@ -2669,10 +2671,6 @@
2669 2671
 		F56C85D3131F42EA000AD0F6 /* karaokelyricstextustar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = karaokelyricstextustar.h; sourceTree = "<group>"; };
2670 2672
 		F56C85D4131F42EA000AD0F6 /* karaokewindowbackground.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = karaokewindowbackground.cpp; sourceTree = "<group>"; };
2671 2673
 		F56C85D5131F42EA000AD0F6 /* karaokewindowbackground.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = karaokewindowbackground.h; sourceTree = "<group>"; };
2672  
-		F56C85DA131F42EA000AD0F6 /* DllLibid3tag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibid3tag.h; sourceTree = "<group>"; };
2673  
-		F56C85DD131F42EA000AD0F6 /* Id3Tag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Id3Tag.cpp; sourceTree = "<group>"; };
2674  
-		F56C85DE131F42EA000AD0F6 /* Id3Tag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Id3Tag.h; sourceTree = "<group>"; };
2675  
-		F56C85DF131F42EA000AD0F6 /* id3v1genre.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = id3v1genre.h; sourceTree = "<group>"; };
2676 2674
 		F56C85E0131F42EA000AD0F6 /* ImusicInfoTagLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImusicInfoTagLoader.h; sourceTree = "<group>"; };
2677 2675
 		F56C85E1131F42EA000AD0F6 /* MusicInfoTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicInfoTag.cpp; sourceTree = "<group>"; };
2678 2676
 		F56C85E2131F42EA000AD0F6 /* MusicInfoTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicInfoTag.h; sourceTree = "<group>"; };
@@ -4716,6 +4714,8 @@
4716 4714
 			children = (
4717 4715
 				F56C827E131F42E7000AD0F6 /* DVDDemux.cpp */,
4718 4716
 				F56C827F131F42E7000AD0F6 /* DVDDemux.h */,
  4717
+				DF24EADC1621E67200034265 /* DVDDemuxBXA.cpp */,
  4718
+				DF24EADD1621E67200034265 /* DVDDemuxBXA.h */,
4719 4719
 				F56C827A131F42E7000AD0F6 /* DVDDemuxFFmpeg.cpp */,
4720 4720
 				F56C827B131F42E7000AD0F6 /* DVDDemuxFFmpeg.h */,
4721 4721
 				F56C827C131F42E7000AD0F6 /* DVDDemuxHTSP.cpp */,
@@ -5678,10 +5678,6 @@
5678 5678
 		F56C85D6131F42EA000AD0F6 /* tags */ = {
5679 5679
 			isa = PBXGroup;
5680 5680
 			children = (
5681  
-				F56C85DA131F42EA000AD0F6 /* DllLibid3tag.h */,
5682  
-				F56C85DD131F42EA000AD0F6 /* Id3Tag.cpp */,
5683  
-				F56C85DE131F42EA000AD0F6 /* Id3Tag.h */,
5684  
-				F56C85DF131F42EA000AD0F6 /* id3v1genre.h */,
5685 5681
 				F56C85E0131F42EA000AD0F6 /* ImusicInfoTagLoader.h */,
5686 5682
 				F56C85E1131F42EA000AD0F6 /* MusicInfoTag.cpp */,
5687 5683
 				F56C85E2131F42EA000AD0F6 /* MusicInfoTag.h */,
@@ -7180,7 +7176,6 @@
7180 7176
 				F56C8A7C131F42ED000AD0F6 /* karaokelyricstextlrc.cpp in Sources */,
7181 7177
 				F56C8A7D131F42ED000AD0F6 /* karaokelyricstextustar.cpp in Sources */,
7182 7178
 				F56C8A7E131F42ED000AD0F6 /* karaokewindowbackground.cpp in Sources */,
7183  
-				F56C8A81131F42ED000AD0F6 /* Id3Tag.cpp in Sources */,
7184 7179
 				F56C8A82131F42ED000AD0F6 /* MusicInfoTag.cpp in Sources */,
7185 7180
 				F56C8A85131F42ED000AD0F6 /* MusicInfoTagLoaderASAP.cpp in Sources */,
7186 7181
 				F56C8A86131F42ED000AD0F6 /* MusicInfoTagLoaderCDDA.cpp in Sources */,
@@ -7619,6 +7614,7 @@
7619 7614
 				DF91D88A161B7581004E6637 /* AddonsOperations.cpp in Sources */,
7620 7615
 				7C4458C8161E206100A905F6 /* Screenshot.cpp in Sources */,
7621 7616
 				1D638120161E20F2003603ED /* PeripheralImon.cpp in Sources */,
  7617
+				DF24EADE1621E67200034265 /* DVDDemuxBXA.cpp in Sources */,
7622 7618
 			);
7623 7619
 			runOnlyForDeploymentPostprocessing = 0;
7624 7620
 		};
2  addons/skin.touched
... ...
@@ -1 +1 @@
1  
-Subproject commit 6e29c2ebb85c75a44418b13b06e5bc0583905be4
  1
+Subproject commit 1d03746646111f97e28b807a290bd762c7db547c

0 notes on commit 203fbf9

Please sign in to comment.
Something went wrong with that request. Please try again.