Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable usage of iOS resources from both xcode and theos makefile. Creates iOS package.

Browse Source
This commit is contained in:
xawotihs
2015-09-13 20:54:25 +02:00
parent acfd0bf104
commit 24187b8413
14 changed files with 852 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
projects/mtg/wagic.xcodeproj/project.pbxproj
View File

@@ -19,12 +19,6 @@
12059D7214980B7200DAC43B /* zfs.vcxproj.filters in Resources */ = {isa = PBXBuildFile; fileRef = 12B8122C1404B9E10092E303 /* zfs.vcxproj.filters */; };
12059D7314980B7200DAC43B /* modrules.xml in Resources */ = {isa = PBXBuildFile; fileRef = 129654D5148AA2390031100B /* modrules.xml */; };
12059D7414980B7200DAC43B /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 128ED37A148BAE7B00C58E83 /* README.txt */; };
12059D7914980B7200DAC43B /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 12211ECA1494811D00641703 /* Default.png */; };
12059D7A14980B7200DAC43B /* Default-Landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 12211ECC149481B600641703 /* Default-Landscape~ipad.png */; };
12059D7B14980B7200DAC43B /* Default-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 12211ECE149481C300641703 /* Default-Portrait~ipad.png */; };
12059D7C14980B7200DAC43B /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 12211ED01494823E00641703 /* Default@2x.png */; };
12059D7D14980B7200DAC43B /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 12211ED21494916D00641703 /* Default-Landscape.png */; };
12059D7E14980B7200DAC43B /* Default-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = 12211ED31494916D00641703 /* Default-Portrait.png */; };
12059D8014980B7200DAC43B /* Encoding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEE232B1128A01F400C34032 /* Encoding.cpp */; };
12059D8114980B7200DAC43B /* hgecolor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEE232B4128A01F400C34032 /* hgecolor.cpp */; };
12059D8214980B7200DAC43B /* hgedistort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEE232B5128A01F400C34032 /* hgedistort.cpp */; };
@@ -223,12 +217,6 @@
12211EB914934A1900641703 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12211EB814934A1800641703 /* MobileCoreServices.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
12211EBB14934A2C00641703 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12211EBA14934A2C00641703 /* CFNetwork.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
12211EC91494360C00641703 /* WagicDownloadProgressViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 12211EC81494360C00641703 /* WagicDownloadProgressViewController.m */; };
12211ECB1494811D00641703 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 12211ECA1494811D00641703 /* Default.png */; };
12211ECD149481B600641703 /* Default-Landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 12211ECC149481B600641703 /* Default-Landscape~ipad.png */; };
12211ECF149481C400641703 /* Default-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 12211ECE149481C300641703 /* Default-Portrait~ipad.png */; };
12211ED11494823F00641703 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 12211ED01494823E00641703 /* Default@2x.png */; };
12211ED41494916D00641703 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 12211ED21494916D00641703 /* Default-Landscape.png */; };
12211ED51494916D00641703 /* Default-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = 12211ED31494916D00641703 /* Default-Portrait.png */; };
12272FC414CD57CF00192DC7 /* SimpleButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12272FC314CD57CF00192DC7 /* SimpleButton.cpp */; };
12272FC514CD57CF00192DC7 /* SimpleButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12272FC314CD57CF00192DC7 /* SimpleButton.cpp */; };
12272FC814CD6A3900192DC7 /* InteractiveButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12272FC714CD6A3900192DC7 /* InteractiveButton.cpp */; };
@@ -269,6 +257,13 @@
12DCD02E14DBE1F90023B966 /* JSfx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 12DCD02C14DBE1F90023B966 /* JSfx.cpp */; };
12DCD03414DBECC50023B966 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12DCD03114DBECC50023B966 /* CoreAudio.framework */; };
12DCD03514DBECC50023B966 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12DCD03214DBECC50023B966 /* OpenAL.framework */; };
180633481BA5F82D003FB092 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 180633411BA5F82D003FB092 /* Default-568h@2x.png */; };
180633491BA5F82D003FB092 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 180633421BA5F82D003FB092 /* Default-Landscape.png */; };
1806334A1BA5F82D003FB092 /* Default-Landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 180633431BA5F82D003FB092 /* Default-Landscape~ipad.png */; };
1806334B1BA5F82D003FB092 /* Default-Portrait.png in Resources */ = {isa = PBXBuildFile; fileRef = 180633441BA5F82D003FB092 /* Default-Portrait.png */; };
1806334C1BA5F82D003FB092 /* Default-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 180633451BA5F82D003FB092 /* Default-Portrait~ipad.png */; };
1806334D1BA5F82D003FB092 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 180633461BA5F82D003FB092 /* Default.png */; };
1806334E1BA5F82D003FB092 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 180633471BA5F82D003FB092 /* Default@2x.png */; };
188B71D01B9B9F9400D5522B /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 188B71C41B9B9F9400D5522B /* ioapi.c */; };
188B71D11B9B9F9400D5522B /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 188B71C51B9B9F9400D5522B /* unzip.c */; };
188B71D21B9B9F9400D5522B /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 188B71C61B9B9F9400D5522B /* zip.c */; };
@@ -280,7 +275,6 @@
751E1F1518FAE53E001B1E16 /* CarouselDeckView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 751E1F1218FAE53E001B1E16 /* CarouselDeckView.cpp */; };
751E1F1618FAE53E001B1E16 /* DeckView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 751E1F1318FAE53E001B1E16 /* DeckView.cpp */; };
751E1F1718FAE53E001B1E16 /* GridDeckView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 751E1F1418FAE53E001B1E16 /* GridDeckView.cpp */; };
75D209D3181D54FD009916AC /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 75D209D1181D54FD009916AC /* Default-568h@2x.png */; };
75D209D4181D54FD009916AC /* wagic-80x80.png in Resources */ = {isa = PBXBuildFile; fileRef = 75D209D2181D54FD009916AC /* wagic-80x80.png */; };
CE97CD1E1295AB4300FDFD3B /* SimplePopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE97CD1D1295AB4300FDFD3B /* SimplePopup.cpp */; };
CE9A478512B514BA00C9F38A /* EAGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9A477612B514BA00C9F38A /* EAGLView.m */; };
@@ -477,12 +471,6 @@
12211EBA14934A2C00641703 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
12211EC71494360C00641703 /* WagicDownloadProgressViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WagicDownloadProgressViewController.h; path = UI/WagicDownloadProgressViewController.h; sourceTree = "<group>"; };
12211EC81494360C00641703 /* WagicDownloadProgressViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WagicDownloadProgressViewController.m; path = UI/WagicDownloadProgressViewController.m; sourceTree = "<group>"; };
12211ECA1494811D00641703 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ../Default.png; sourceTree = "<group>"; };
12211ECC149481B600641703 /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape~ipad.png"; path = "../Default-Landscape~ipad.png"; sourceTree = "<group>"; };
12211ECE149481C300641703 /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait~ipad.png"; path = "../Default-Portrait~ipad.png"; sourceTree = "<group>"; };
12211ED01494823E00641703 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "../Default@2x.png"; sourceTree = "<group>"; };
12211ED21494916D00641703 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape.png"; path = "../Default-Landscape.png"; sourceTree = "<group>"; };
12211ED31494916D00641703 /* Default-Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait.png"; path = "../Default-Portrait.png"; sourceTree = "<group>"; };
12272FC114CD558C00192DC7 /* SimpleButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleButton.h; sourceTree = "<group>"; };
12272FC314CD57CF00192DC7 /* SimpleButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleButton.cpp; sourceTree = "<group>"; };
12272FC614CD68FB00192DC7 /* InteractiveButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InteractiveButton.h; sourceTree = "<group>"; };
@@ -557,6 +545,13 @@
12DCD03014DBECC40023B966 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
12DCD03114DBECC50023B966 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
12DCD03214DBECC50023B966 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
180633411BA5F82D003FB092 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "Resources/Default-568h@2x.png"; sourceTree = "<group>"; };
180633421BA5F82D003FB092 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape.png"; path = "Resources/Default-Landscape.png"; sourceTree = "<group>"; };
180633431BA5F82D003FB092 /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape~ipad.png"; path = "Resources/Default-Landscape~ipad.png"; sourceTree = "<group>"; };
180633441BA5F82D003FB092 /* Default-Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait.png"; path = "Resources/Default-Portrait.png"; sourceTree = "<group>"; };
180633451BA5F82D003FB092 /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait~ipad.png"; path = "Resources/Default-Portrait~ipad.png"; sourceTree = "<group>"; };
180633461BA5F82D003FB092 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/Default.png; sourceTree = "<group>"; };
180633471BA5F82D003FB092 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Resources/Default@2x.png"; sourceTree = "<group>"; };
188B71C31B9B9F9400D5522B /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crypt.h; path = unzip/crypt.h; sourceTree = "<group>"; };
188B71C41B9B9F9400D5522B /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = unzip/ioapi.c; sourceTree = "<group>"; };
188B71C51B9B9F9400D5522B /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unzip.c; path = unzip/unzip.c; sourceTree = "<group>"; };
@@ -578,7 +573,6 @@
751E1F1218FAE53E001B1E16 /* CarouselDeckView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CarouselDeckView.cpp; sourceTree = "<group>"; };
751E1F1318FAE53E001B1E16 /* DeckView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeckView.cpp; sourceTree = "<group>"; };
751E1F1418FAE53E001B1E16 /* GridDeckView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GridDeckView.cpp; sourceTree = "<group>"; };
75D209D1181D54FD009916AC /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
75D209D2181D54FD009916AC /* wagic-80x80.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wagic-80x80.png"; sourceTree = SOURCE_ROOT; };
8D1107310486CEB800E47090 /* wagic-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "wagic-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
CE8B8A231299C22900A3CDEF /* DebugRoutines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugRoutines.h; sourceTree = "<group>"; };
@@ -1057,14 +1051,14 @@
128FB96A149537A600ED4EE6 /* Images */ = {
isa = PBXGroup;
children = (
75D209D1181D54FD009916AC /* Default-568h@2x.png */,
180633411BA5F82D003FB092 /* Default-568h@2x.png */,
180633421BA5F82D003FB092 /* Default-Landscape.png */,
180633431BA5F82D003FB092 /* Default-Landscape~ipad.png */,
180633441BA5F82D003FB092 /* Default-Portrait.png */,
180633451BA5F82D003FB092 /* Default-Portrait~ipad.png */,
180633461BA5F82D003FB092 /* Default.png */,
180633471BA5F82D003FB092 /* Default@2x.png */,
75D209D2181D54FD009916AC /* wagic-80x80.png */,
12211ED21494916D00641703 /* Default-Landscape.png */,
12211ED31494916D00641703 /* Default-Portrait.png */,
12211ED01494823E00641703 /* Default@2x.png */,
12211ECE149481C300641703 /* Default-Portrait~ipad.png */,
12211ECC149481B600641703 /* Default-Landscape~ipad.png */,
12211ECA1494811D00641703 /* Default.png */,
);
name = Images;
sourceTree = "<group>";
@@ -1739,12 +1733,6 @@
12059D7214980B7200DAC43B /* zfs.vcxproj.filters in Resources */,
12059D7314980B7200DAC43B /* modrules.xml in Resources */,
12059D7414980B7200DAC43B /* README.txt in Resources */,
12059D7914980B7200DAC43B /* Default.png in Resources */,
12059D7A14980B7200DAC43B /* Default-Landscape~ipad.png in Resources */,
12059D7B14980B7200DAC43B /* Default-Portrait~ipad.png in Resources */,
12059D7C14980B7200DAC43B /* Default@2x.png in Resources */,
12059D7D14980B7200DAC43B /* Default-Landscape.png in Resources */,
12059D7E14980B7200DAC43B /* Default-Portrait.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1753,25 +1741,25 @@
buildActionMask = 2147483647;
files = (
F233DC3812A111EB008594F2 /* wagic-64x64.png in Resources */,
1806334B1BA5F82D003FB092 /* Default-Portrait.png in Resources */,
F2CDD5E312A6F7A2007B35AF /* EAGLViewController.xib in Resources */,
CECB67E112B517C000321D5A /* MainWindow.xib in Resources */,
127D4C6F1376B33200109AB4 /* mtg.txt in Resources */,
1806334C1BA5F82D003FB092 /* Default-Portrait~ipad.png in Resources */,
12B812341404B9E20092E303 /* !Pak0.cpk in Resources */,
180633481BA5F82D003FB092 /* Default-568h@2x.png in Resources */,
1806334A1BA5F82D003FB092 /* Default-Landscape~ipad.png in Resources */,
12B812351404B9E20092E303 /* !Pak1.cpk in Resources */,
12B812391404B9E20092E303 /* zfs.sln in Resources */,
1806334D1BA5F82D003FB092 /* Default.png in Resources */,
1806334E1BA5F82D003FB092 /* Default@2x.png in Resources */,
180633491BA5F82D003FB092 /* Default-Landscape.png in Resources */,
12B8123A1404B9E20092E303 /* zfs.vcproj in Resources */,
12B8123B1404B9E20092E303 /* zfs.vcxproj in Resources */,
12B8123C1404B9E20092E303 /* zfs.vcxproj.filters in Resources */,
129654D6148AA23A0031100B /* modrules.xml in Resources */,
128ED37C148BAE7B00C58E83 /* README.txt in Resources */,
75D209D3181D54FD009916AC /* Default-568h@2x.png in Resources */,
12211ECB1494811D00641703 /* Default.png in Resources */,
75D209D4181D54FD009916AC /* wagic-80x80.png in Resources */,
12211ECD149481B600641703 /* Default-Landscape~ipad.png in Resources */,
12211ECF149481C400641703 /* Default-Portrait~ipad.png in Resources */,
12211ED11494823F00641703 /* Default@2x.png in Resources */,
12211ED41494916D00641703 /* Default-Landscape.png in Resources */,
12211ED51494916D00641703 /* Default-Portrait.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};