From 24187b84139266102e2815db737d4df7a2abfc70 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 13 Sep 2015 20:54:25 +0200 Subject: [PATCH] Enable usage of iOS resources from both xcode and theos makefile. Creates iOS package. --- .travis.yml | 2 +- .../{ => iOS/Resources}/Default-568h@2x.png | Bin .../{ => iOS/Resources}/Default-Landscape.png | Bin .../Resources}/Default-Landscape~ipad.png | Bin .../{ => iOS/Resources}/Default-Portrait.png | Bin .../Resources}/Default-Portrait~ipad.png | Bin projects/mtg/{ => iOS/Resources}/Default.png | Bin .../mtg/{ => iOS/Resources}/Default@2x.png | Bin .../mtg/iOS/Resources/EAGLViewController.xib | 333 +++++++++++++ projects/mtg/iOS/Resources/Info.plist | Bin 0 -> 1377 bytes projects/mtg/iOS/Resources/MainWindow.xib | 465 ++++++++++++++++++ .../mtg/iOS/Resources/ResourceRules.plist | 25 + projects/mtg/iOS/Resources/wagic-64x64.png | Bin 0 -> 4415 bytes projects/mtg/wagic.xcodeproj/project.pbxproj | 68 ++- 14 files changed, 852 insertions(+), 41 deletions(-) rename projects/mtg/{ => iOS/Resources}/Default-568h@2x.png (100%) rename projects/mtg/{ => iOS/Resources}/Default-Landscape.png (100%) rename projects/mtg/{ => iOS/Resources}/Default-Landscape~ipad.png (100%) rename projects/mtg/{ => iOS/Resources}/Default-Portrait.png (100%) rename projects/mtg/{ => iOS/Resources}/Default-Portrait~ipad.png (100%) rename projects/mtg/{ => iOS/Resources}/Default.png (100%) rename projects/mtg/{ => iOS/Resources}/Default@2x.png (100%) create mode 100755 projects/mtg/iOS/Resources/EAGLViewController.xib create mode 100644 projects/mtg/iOS/Resources/Info.plist create mode 100755 projects/mtg/iOS/Resources/MainWindow.xib create mode 100644 projects/mtg/iOS/Resources/ResourceRules.plist create mode 100644 projects/mtg/iOS/Resources/wagic-64x64.png diff --git a/.travis.yml b/.travis.yml index eea629472..d416f94ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ script: - /usr/local/opt/qt5/bin/qmake projects/mtg/wagic-qt.pro CONFIG+=graphics - make -j 4 dmg - cd projects/mtg/iOS -- make -j 4 +- make -j 4 package after_success: - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l wagic.dmg -r Wagic-macosx.dmg -b $TRAVIS_BRANCH diff --git a/projects/mtg/Default-568h@2x.png b/projects/mtg/iOS/Resources/Default-568h@2x.png similarity index 100% rename from projects/mtg/Default-568h@2x.png rename to projects/mtg/iOS/Resources/Default-568h@2x.png diff --git a/projects/mtg/Default-Landscape.png b/projects/mtg/iOS/Resources/Default-Landscape.png similarity index 100% rename from projects/mtg/Default-Landscape.png rename to projects/mtg/iOS/Resources/Default-Landscape.png diff --git a/projects/mtg/Default-Landscape~ipad.png b/projects/mtg/iOS/Resources/Default-Landscape~ipad.png similarity index 100% rename from projects/mtg/Default-Landscape~ipad.png rename to projects/mtg/iOS/Resources/Default-Landscape~ipad.png diff --git a/projects/mtg/Default-Portrait.png b/projects/mtg/iOS/Resources/Default-Portrait.png similarity index 100% rename from projects/mtg/Default-Portrait.png rename to projects/mtg/iOS/Resources/Default-Portrait.png diff --git a/projects/mtg/Default-Portrait~ipad.png b/projects/mtg/iOS/Resources/Default-Portrait~ipad.png similarity index 100% rename from projects/mtg/Default-Portrait~ipad.png rename to projects/mtg/iOS/Resources/Default-Portrait~ipad.png diff --git a/projects/mtg/Default.png b/projects/mtg/iOS/Resources/Default.png similarity index 100% rename from projects/mtg/Default.png rename to projects/mtg/iOS/Resources/Default.png diff --git a/projects/mtg/Default@2x.png b/projects/mtg/iOS/Resources/Default@2x.png similarity index 100% rename from projects/mtg/Default@2x.png rename to projects/mtg/iOS/Resources/Default@2x.png diff --git a/projects/mtg/iOS/Resources/EAGLViewController.xib b/projects/mtg/iOS/Resources/EAGLViewController.xib new file mode 100755 index 000000000..81b2d2bac --- /dev/null +++ b/projects/mtg/iOS/Resources/EAGLViewController.xib @@ -0,0 +1,333 @@ + + + + 800 + 10D573 + 762 + 1038.29 + 460.00 + + YES + + YES + + + YES + + + + YES + + + + YES + + + YES + + + + YES + + IBFilesOwner + IBIPadFramework + + + IBFirstResponder + IBIPadFramework + + + + + YES + + + + YES + + 0 + + + + + + -1 + + + EAGL View Controller + + + -2 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + + + YES + EAGLViewController + UIResponder + + + + YES + + + YES + + + + + YES + + + YES + + + + 3 + + + + YES + + EAGLViewController + UIViewController + + IBProjectSource + Classes/EAGLViewController.h + + + + + YES + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSNetServices.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPort.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSStream.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSXMLParser.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CAAnimation.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CALayer.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIAccessibility.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UINibLoading.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIResponder + NSObject + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITextField.h + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UINavigationController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UIPopoverController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UISplitViewController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h + + + + + 0 + IBIPadFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + wagic.xcodeproj + 3 + 87 + + diff --git a/projects/mtg/iOS/Resources/Info.plist b/projects/mtg/iOS/Resources/Info.plist new file mode 100644 index 0000000000000000000000000000000000000000..b8ab0609cbf969b504dccbf09b8836052a22dcc2 GIT binary patch literal 1377 zcmah}J8;}Y7?!kahy%fECl17U5Ic$UBC_s$xe!7KIqQr?&h~M-%bDOL^X#6{z0WfCErUZ1}@ckRsuwZ8b)lJ>TN(86LZW|l)btwwv>C!v9k7F!zYdnz>}>ML6-GhwXLf+GT1~zZ;?AO4M?ap2OcAc;M>p2uu-G)_xRvWQ*k zY~Nndmoa54w3p~N&_qF@@$iWDDG9nc%M*w7En>z|Vv-L^5usC?arS_0JT6bx#oJhz$72JhyA=lYyJ*wL%9@?iG#nX?8u(b0CB&jw~zXkwor$)})N z)E;oyvE5-!J~08N9B}6U0UbZ27E!%TreBmxyc3()rsjoeWvg0|eP(yk@16IkpUkrt za?ohL*STCPU8?FOS-E#{jpp-yfA(~@R8q@|Qp(Op+t-`TMz_vvenkv+ZdU62tURh$ zWaa+#8WNFoE9q00GRxcCU?h@LM%nZN(pD<-<&3R;jX!IJ3O;~E#appMLOH#E3^ZeU zu8e)(Av`{-d?-84U03EmEVH>mMc5;(3O(UN;d9}k@SX6J@JJjHr$j|u5_QoRKM}ta zzY%{B|CC0gY3U8ADczRtNFPa`O82C%q=(Y?(r?l~;2@X=Ghh~+2k(F_@EQ0Td<%XA zzkpxC@8A#c7x)`I0{=o0?uGl{Bs>g{z-f3Eo`WS=hE;eOUV&HP670ft*n>9o;m1Py PNMg1MH}W-K;1~Y^=XS!T literal 0 HcmV?d00001 diff --git a/projects/mtg/iOS/Resources/MainWindow.xib b/projects/mtg/iOS/Resources/MainWindow.xib new file mode 100755 index 000000000..32b0a474d --- /dev/null +++ b/projects/mtg/iOS/Resources/MainWindow.xib @@ -0,0 +1,465 @@ + + + + 1056 + 10H574 + 823 + 1038.35 + 461.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 132 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + IBIPadFramework + + + IBFirstResponder + IBIPadFramework + + + IBIPadFramework + + + + 2 + + + 1 + + IBIPadFramework + NO + + + + 292 + {768, 1024} + + 1 + MSAxIDEAA + + NO + NO + IBIPadFramework + YES + YES + + + + + YES + + + window + + + + 7 + + + + delegate + + + + 8 + + + + glViewController + + + + 12 + + + + + YES + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + YES + + + + + 6 + + + + + 11 + + + EAGL View Controller + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 11.CustomClassName + 11.IBEditorWindowLastContentRect + 11.IBPluginDependency + 2.IBEditorWindowLastContentRect + 2.IBPluginDependency + 2.IBViewBoundsToFrameTransform + 6.CustomClassName + 6.IBPluginDependency + + + YES + UIApplication + UIResponder + EAGLViewController + {{-4, -150}, {500, 698}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{0, 4}, {783, 852}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAAAAAAAAxH+AAA + + wagicAppDelegate + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 12 + + + + YES + + EAGLViewController + UIViewController + + IBProjectSource + Classes/EAGLViewController.h + + + + wagicAppDelegate + NSObject + + YES + + YES + glViewController + window + + + YES + EAGLViewController + UIWindow + + + + YES + + YES + glViewController + window + + + YES + + glViewController + EAGLViewController + + + window + UIWindow + + + + + IBProjectSource + Classes/wagicAppDelegate.h + + + + wagicAppDelegate + NSObject + + IBUserSource + + + + + + YES + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CAAnimation.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CALayer.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIAccessibility.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UINibLoading.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIApplication + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIApplication.h + + + + UIResponder + NSObject + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIPrintFormatter.h + + + + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITextField.h + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UINavigationController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UIPopoverController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UISplitViewController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h + + + + UIWindow + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIWindow.h + + + + + 0 + IBIPadFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + wagic.xcodeproj + 3 + 132 + + diff --git a/projects/mtg/iOS/Resources/ResourceRules.plist b/projects/mtg/iOS/Resources/ResourceRules.plist new file mode 100644 index 000000000..e7ec329dc --- /dev/null +++ b/projects/mtg/iOS/Resources/ResourceRules.plist @@ -0,0 +1,25 @@ + + + + + rules + + .* + + Info.plist + + omit + + weight + 10 + + ResourceRules.plist + + omit + + weight + 100 + + + + diff --git a/projects/mtg/iOS/Resources/wagic-64x64.png b/projects/mtg/iOS/Resources/wagic-64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..b54e9a716a7fdfd996d58a2fa5a68a48ce54fb1c GIT binary patch literal 4415 zcmV-F5y0+=P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FZT01FZU(%pXi00007bV*G`2igf5 z4IeqzLRF>!01&@PL_t(|+U=Tqa9nqF$3N$H@7~?jN~@J@S$@UuM{LIr67q%+JmJxX zk`^eGL}msu^dA_8S7~K3Fr9{kX`vlR8K9Ft2r*My$OIA~Hk}ykn8Y}CY;4PpW5-V9 zhb-AzX{CML=jk8!uA~G^Y{$XVsm{zD%}Uze@0{=NobP%3E=A0{!4gG~v2|ozX^njtwLvmKI(ckB^ffkD1ranc)Ph0OrmrKXhO*%q%}TCBjYD3 zf8gXM0+0b5z>aN0(AV@$RR{%KpaPUp+~k|dfsBRKxjZN&{(cQ8169B)c6UW2hP{@U zpaoBz){5_BAhZ=Dc$o-|yvkX@;JF_Bg7Q!p`cap znhcR|q2W2!5zsI&nX1$31R|n!K`MZ>-}kT-*RRv_1waI>NKI;a>iOyGXMOuqH(h15 zr7WyMHZv2`{7MB(3lSM^c;fw^I5LtiiQv~X6W;55>pR;wf93dFxBh0`wX1scy46jR zZ=Xp-YaFT?#nEE2XmD2jV5I)nPk;2Dy~ESaTB2@3g0`)`{pslsuX#smW7oCw+&LXH zTEUu;s4!8FELd4S`|NFBeCWu$T_Dz2$Rtim1y%5aF zQ*!;}^LZjo$B|*$Q6fD&+_L+wU;p`|S;wmbBk>yIHi+G;oe-e}3?WoO0w=0Dy=~XOeASu9-W3L# zdj1%^*z2--!5LENcCgw(ERI*FJb&B9J0HqAehnz9>Y#{}Q0j<;h=_ydY@hkjU(f9M z;k$PAL{5q#b7y4{yA##A8Zq+E2d;bYU^#ypWC$1nDvEmbCm)TNkW2qqCRPDoV-_v} z!-$l3%>LN+LDRW!w2VBu8NT<(2%-^48YIP*(;X)zPCs>E6r>0Y0woozvT?zezNk?g zTm5I@rBfiOsURuT3=8u0gcu}Lw2{U}P)edvZ6LR-zhbu@H3szqIMNH)IWR4V$xFZ6I%1K6mRknr+WdLZ=MW1o4aO*Xel!05t0H zAW@h>mRB8}Zdd8N$vQV9(V+1Oi5LgwVj7ZszT)!{7>=^-xB6#6t z;-yU%OqQ0EI7z$Es3{^KLL?Bu8>csrt zNPiauKmtOPY+41%s+5JOwq^e3{yhxA3t(qYNUWQ%w6!)<$4g<8Z0sdDxvGe}dH&x$ zA&oE?1b5^Nm^3OWy?I7u#gJ!52?1MxrQ_*cR8`UVbDLFa&7@)Z0!XDYh$vs)chk4s z&}z7TS<#xJexm@oU;q*c6C)}jltr~R(7f!-sNHtNGU(HL03Ak2aa~9C8da=D^_LhC zhl5f>)OGEAZNzRp2H*$Kd;BzDA&9JKtF57$QdCoo5?aQ=G$LXn*b1gY`e)lVy!~2G zY0{I`_QT&ic+CMLT1!HuB8r=MA{Pxn5(<7&T2@q~>I9YGcy7(FEJ02VKzXPa#b_ZN zOv~9(!}z3PLj?&CTtVDs@2qvIdDRvXunhDbKO1wV2!)J4?W$R&sfeT}l+mepJ+T{~ z>(V5xIyko_2l*)rRS4v#Cl+sN&s0N2%1QZLM+hhO02k{4Omt;|DkAk?E&7KigCPE6 z>Fhy7L~Khkt?3{GjT6*V;ssITF@!qMeC10@XytPUpN4<6ODNRP_rX17|hMz3h2&# zbwrD#Oq9N|P%lI(iNcbO8zHq4APgYYrkSHNI-tE3f)EH!fGUdN#?H#kW#3qd@lBvj zi8o|`tRhZV?Q3hZDYdU#lS5VY%X@G7W}$t+B)U}+UA5TVMP)m%j16HxStMbP>y$hCN zcUP$3gSbg3xW`+r?p4rY30{7&53qRCl*%nxJ4$P#m4+OU2bw{%c_}rmGQYbc?Lb>T z&ICVrtO&IoF~MuZ58i&{Za1gg z1j)0n)#_gCC@Gkb)@mhZ#^`8v){cw=FB~})&n<}f*wTSTf@YF-x;1{ZB~p|9y!pqw zn{#l(YSCNgGiT4H zxEBvqyV%_oydeN2Vc;ijR!>E>;F+m+Jz{_ZM?k`3D8lV?hF8@C z`9LS2r5@ea$OR2VzxEo`Gm| z2PnK{MtNz(<#_}z=LoYjV$hY)2Y8q@_D+dIrBmD{W~&g%&ggS ziLj!@KmFJ@nrz=3=zQ;L@L0cq4n!V{v-e}Hmes8qz-t83Tt-|#VxK^-j5INhnY+6_~E52t4A zQAL0GG>D!-Rr%62r~c-K?9PrWOy8=d^HU;rmS3D&^hn9iRFmeaB2eqkEkEst5{kg# zUZA=)X52{l!s-(rxVz>1pI){AoZMV__RQ2ReYM;O@u0I(?Cv^zIRFTgn!p9>PFRWh zb4zy%$o?Zx8$N5NQu-gg#%ef|6^V8MdHLpBsB%WWN zKCur}MZzJocvjG|`l{(*3i9~Lg+JOk*m;JyV{6RoMlAKcZSy|$ND!jNz~=2C!RT)x zs*7qM9kW(roN01!xbSS=aYK=@p=<530FdxNBOSV`_&x3KJ{Ba`KO3L&Fu^mRWt`?U znDkurBD;R~_ILfP)p7k~Qajx609324ov+qR%LyZBr3TMD^Bg8PgoJ}2Er?ir>e;vb zw{5g>`jyKDz=UiN0ImqG9eGi)Y5o=?@cc2@wPQE<13-k4NOlg+*y2Z~o}B(@@{~c# zB2qOPdMBDz{7OK=5T4!(1TR5U19jOsIP=%r24)YSjIsa45a1;SKpSD;rNgqmkiTVX za=}Tt()d$|8*1(5O?N#c<9Bss&}w{wQUk3a;%-{}Pe1qlq%VvB4M7|*P2AUW?c;6f zy05}0@qo0R9KdA*Kotoaa{{BG-`{j)pNa$kQ`?;6O2Ou*Cs+KaEnN*n;^At1g5r)< zl<^3=mJZ9&ne2ismO;}_a?7JW{Wa&MCr-{gDMCE(h&jOjL(`r=834uZE|vI#E=h-Y zmDH3UO?1YE3y}8Klr63O@gK@J$b7?Z6w4d#S{e+I8W0 zcPVv+3L^D=Gd{3C2q2$}_ZX_DP8}X;9WuOf)ID^Or+-NS5G2xZ9&kmY;AHDHTk<)` zHzU6W~B*eU(n-@fy!ZfI3dX|R4Jc~K#J^}tm`>p;Z`tNt^y zKfW=D@XKzt@9($0^EV<|L!^>4KHkNW-z5j&ReeESz!i!7LPt~Ii`6ANo;bC**EU)q zzUduJ(pLC~FJGjdOm(WB-CVJ=nZZqcbDt;_28G6`J7NCU`@)pXrIiTq6s-wTwj(z? z(6)NxqMzThsoffML57pEw~FEy*T3?XX2Ru5ee9JOB(q&_*|78ATlN{zGDyRFT=ez1 z{~G{+Mj(Fj7Dh?H{>tE|A8EG+NfaMS*xx0I{c|-}5*s-zqSnK~-J9%^uO{}MQbK;` z0`RhN0LAWg3IvMQK!<@d8RHFroCXGxa<{5Tkc`*Qky7y!f-8XxIO6vk;dC^axCZ$o^uELg;~!W;U^?4(S}q)f`BOv?X5`CmTWXc!FHdawWh002ovPDHLk FV1l|JToM2P literal 0 HcmV?d00001 diff --git a/projects/mtg/wagic.xcodeproj/project.pbxproj b/projects/mtg/wagic.xcodeproj/project.pbxproj index ccf864056..d65919aff 100755 --- a/projects/mtg/wagic.xcodeproj/project.pbxproj +++ b/projects/mtg/wagic.xcodeproj/project.pbxproj @@ -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 = ""; }; 12211EC81494360C00641703 /* WagicDownloadProgressViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WagicDownloadProgressViewController.m; path = UI/WagicDownloadProgressViewController.m; sourceTree = ""; }; - 12211ECA1494811D00641703 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ../Default.png; sourceTree = ""; }; - 12211ECC149481B600641703 /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape~ipad.png"; path = "../Default-Landscape~ipad.png"; sourceTree = ""; }; - 12211ECE149481C300641703 /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait~ipad.png"; path = "../Default-Portrait~ipad.png"; sourceTree = ""; }; - 12211ED01494823E00641703 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "../Default@2x.png"; sourceTree = ""; }; - 12211ED21494916D00641703 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape.png"; path = "../Default-Landscape.png"; sourceTree = ""; }; - 12211ED31494916D00641703 /* Default-Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait.png"; path = "../Default-Portrait.png"; sourceTree = ""; }; 12272FC114CD558C00192DC7 /* SimpleButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleButton.h; sourceTree = ""; }; 12272FC314CD57CF00192DC7 /* SimpleButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleButton.cpp; sourceTree = ""; }; 12272FC614CD68FB00192DC7 /* InteractiveButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InteractiveButton.h; sourceTree = ""; }; @@ -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 = ""; }; + 180633421BA5F82D003FB092 /* Default-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape.png"; path = "Resources/Default-Landscape.png"; sourceTree = ""; }; + 180633431BA5F82D003FB092 /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape~ipad.png"; path = "Resources/Default-Landscape~ipad.png"; sourceTree = ""; }; + 180633441BA5F82D003FB092 /* Default-Portrait.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait.png"; path = "Resources/Default-Portrait.png"; sourceTree = ""; }; + 180633451BA5F82D003FB092 /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait~ipad.png"; path = "Resources/Default-Portrait~ipad.png"; sourceTree = ""; }; + 180633461BA5F82D003FB092 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/Default.png; sourceTree = ""; }; + 180633471BA5F82D003FB092 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Resources/Default@2x.png"; sourceTree = ""; }; 188B71C31B9B9F9400D5522B /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crypt.h; path = unzip/crypt.h; sourceTree = ""; }; 188B71C41B9B9F9400D5522B /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = unzip/ioapi.c; sourceTree = ""; }; 188B71C51B9B9F9400D5522B /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unzip.c; path = unzip/unzip.c; sourceTree = ""; }; @@ -578,7 +573,6 @@ 751E1F1218FAE53E001B1E16 /* CarouselDeckView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CarouselDeckView.cpp; sourceTree = ""; }; 751E1F1318FAE53E001B1E16 /* DeckView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeckView.cpp; sourceTree = ""; }; 751E1F1418FAE53E001B1E16 /* GridDeckView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GridDeckView.cpp; sourceTree = ""; }; - 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 = ""; }; CE8B8A231299C22900A3CDEF /* DebugRoutines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugRoutines.h; sourceTree = ""; }; @@ -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 = ""; @@ -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; };