From 03c577136f6f3b76d9b986919e0dc2bd588b261f Mon Sep 17 00:00:00 2001 From: pelya Date: Tue, 26 Oct 2010 10:53:02 +0300 Subject: [PATCH] Added ScummVM project files --- project/AndroidManifest.xml | 6 ++-- project/jni/Android.mk | 12 +++---- project/jni/Application.mk | 2 +- project/jni/application/Android.mk | 3 +- .../scummvm/AndroidAppSettings.cfg | 30 ++++++++++++++++++ project/jni/application/scummvm/icon.png | Bin 0 -> 17263 bytes project/jni/application/scummvm/readme.txt | 8 +++++ project/jni/application/scummvm/scummvm | 1 + project/jni/mad/Android.mk | 2 +- project/jni/mad/{ => include}/mad.h | 0 project/res/values/strings.xml | 2 +- project/src/Accelerometer.java | 2 +- project/src/Audio.java | 2 +- project/src/DataDownloader.java | 2 +- project/src/GLSurfaceView_SDL.java | 2 +- project/src/Globals.java | 10 +++--- project/src/MainActivity.java | 2 +- project/src/Settings.java | 2 +- project/src/Video.java | 2 +- 19 files changed, 65 insertions(+), 25 deletions(-) create mode 100644 project/jni/application/scummvm/AndroidAppSettings.cfg create mode 100644 project/jni/application/scummvm/icon.png create mode 100644 project/jni/application/scummvm/readme.txt create mode 120000 project/jni/application/scummvm/scummvm rename project/jni/mad/{ => include}/mad.h (100%) diff --git a/project/AndroidManifest.xml b/project/AndroidManifest.xml index 9067c22e2..8b4557fcf 100644 --- a/project/AndroidManifest.xml +++ b/project/AndroidManifest.xml @@ -1,8 +1,8 @@ a3-nScz z`K)EiT)tNv`&M$B?|4K|#I`5XGIOVBOkA|1NyVc{p=<%em1$FNSHIUwue(znzfX%X zlr@A=;kS|8<_V!wr~W**^ZC4|*7p_vm~Z;`#s9y^{6A0B3$MqPyGBmq%~;F6cI)fT zj43nS8FFa+-i3a{@zJLc)UB_19;+TwyXee6#d!}ZwVVb&N?v`uo zlAk#$c`>-G4bwjLdCndKNd|sCzF8`sCdS!m=Q=X{I1G6oOc8kG%aHF9STdud?|7lj z*1EsH&Vg+E{d@oa-#^Zz+ZAukKf3DrZ8t`_iU*7~KOQvyxHNs=lrpQizQ<R=O` zJ1s~~$mxx^la2n;8ePvxlda3%WSGwO{daBqzS6Dv7gg78-@&+xo-n*aPg=y+{i=SE;m$tG2O7=hrO`#dDsT z{2rS7C0#F?KeD*Dzwq&~n_;Vu`rH5ga&_Na@A_w}|FW%my|7*Gkg&f^>nvMJS|Np9U`paqk{WV+jzc#6^|0ccT z{l4D?kB)Hm^!Mk#FWYTD`}xoPXFva0xJcty_acXR&rf`oaSfcZ`(M%fZ&TMjC}vq5 z5*m=!w{~lEk0HNQvYb{|632ljU$4j8Z?F4XHE+(GJ-71Z4}^v_*j9f#5GBpe!?VZy z{O9`l&wr|SFOmrN3Jm>m@XY?H*OO8&M71yWluB0XG31ZPzCZQ3C8I^%yE{9-?frhQ zTUgyM=IZy_P>}}<+vS?JiWSQAr$v6d?6va#tFqnYqOOWlgE$UdkBYxKyLhFxhVzDq zf0mhR?k}@%fy!p{;GNMc;NW&HBjf zzvpM4eHPGhd1}zpcRQy{T_V`#o+WYrLjOnJ+8bL^8JZ7s{$fj7V#+DW$-r}3Y}JJm z#=T{$9kT6?KUry(w!HX^Z+ga=XD4>CU0ZkV6U%YKzGM~8CXFruSHVdtmh)6j*85%l z^1tfe&*%MrF7W>qkgNamQCqi9do{!MyJga8X=wrLujltHdSSjv=Xb{Ht6jVA>TS7p z;`5(Hb9bxsZm4{1khd$9Y5TpMlICyc9=Mk6X0U5vUx|Z*8jmxZ0vodelLXIcwg$!< z)25#??J8?5Q$9R%vaU>RvK)K-%)_gHrx*TsV6*Ie+J#@2M4CF99<26S@W`TWPuS|e z?f?G$Td%eB)AYEimtI{@PH7(4SNpr*$A`q8-rl#Klb)1!E&6fb%$c4Oo7RZ@@haat zh3R&A-@||G>yJ9W-!E7FE%(rkV|4*eCvGa4i=C3tSiK;Z@vKxsDHns&1_mDHHr511 z4gnSqrj`vJD$3Iwj__R7Gbr8E8a{viq09aA4;tT}d+egKtjN!!?n+J_MxP~=+D&}@ zRXjhdHddOyZzzr`?~L4C!Tg`9GF{vuhTgFTtY%ZLV2Lb|HckG18ZyV zw`IG1&aX>Zx|O5+&Q@9bU;g>Wo8@=Nz2462%;^@LnX;^5lhiS*g;5d`VFq&!A7bDU z;9Sqp(8{>E>^}4F*@}PSi~ftLD0nIe^{5!FaOXNyW>~+iar*vpzWYCRYufzmt@N1} z@}T=dYXa{h3%&I!o|{a3_fJ{&@;whff4%)_qiWS6_UW;V@Am(%^YQaj@|?6ba$4=S z%P;?wM^5W3+r2kQUB6HD-L7(WyPwA2A2xo!-%zrpZQ7+5S+O^tO7e*4WE<#6+|qVn zJisKNAoNaobFe_$H+Mz{6~_rnn*>-oR9e1I)-};dXDAgst@mp()5^dZR+An^*Iz$S z|M#`!o_|5&QEUHnObF5oV_J9pwf@n@-ufSF?r+SNwfkHA{+PR6opn}n=^1gUnb$7lEU;|f zC@Hdi;ZE*mrfIx4=6>3+CSl>jvXUEr#l)&EzMC%4q2Tc=+DXB~!^>d;!oYTx z@&t?K#L!<%V#hSuo6aXB1Rf|5XOqo%cW4pAW;Wr28(i{~woGAoC0O?U^0+*57lX;{Wga{m$)tduv4!?(eI$D0;%N zWD5V2%76RQBe$u}`FVQn!--aP55w1Zy!@dkaoErqG^Ro+8M};WA;0 zgA$|jB7;RCEz$2K4;+3k?=mYw#xg?TwO&52Q`PK_1yh=~nytJ3db?C|SdpLTm38&YFFS6(9s8|Z-Hi8aAPay`7bxpFQuBwKl6gE?d54rBI9*tAw1~u?G(luH=~2 zYn}h>|FlwW`|Y=>d;gw|ZvS|@{)3>+AOE~#Q;c3{ZGSCV9#A0MI@kT+XN?_=O?S`f zzp*i~`nN`%gG2ny;VQ>${Qz$6=OR((4t`iRUni!6VaMkAf8HOSS*5W+q>jl`Q$=XP zcS(&OVo&tdBp70IFPgBLy=9WCnsQ-!)}D`Dj{DBYad;`TaA>9~F5Po3YIj{p$(NI9 zn{V!UIxV{3$%%>EmoeR``~5a!YgB;O+poLpy)~ZcY&~}U`{V6(|D7uyxR*VSS$2AJ z+-*LQ?Ry@~*2od=n*A<&Ui(8m9T5%|M?)4>g(7+F86~H8*_<}rp19-f`Tuw1`R$w? zo;W*x+8^C;^T5e)CxvwuU2pok81$c9`pI)@`fa9OCFbi~cm6Io*lR9)&*s1k%iTt* z3X2L%IFxoZc6435cv1cK+ih{HlP=BDKCr9wwSk4jj4ij{&OiP6kFslEN5IM57gl{g z`s3>T8hyJT=f5Yd5~<@mnp=J?TD{a$ieXa55u`VkFU2F z|JFiIG3U>$m$58*^7VH9epz+@c{SOZ2W-FJY5w`M zGGlH2$I~H&MMWcy3nofZ zDvKIBJ3H5lxn8uZE|Ux{S}K}wcUS3+J(Zj1%$)gCymDT>kEZIh)vxaU?DPF$zW;li z2(#g=R_^y*Mtf#AKVqA5|8Lvv4JQuf{F$g-%cRcaSoQhLzct^Rw)Eua&CYHno2Z|9ySGPx|_uy^NP*TbqhSwzbYlpLjd+i4FHrU-8Y#->vsg-^Kdi zZ29{?TLTPUINhAa&Fjk+Y*4~?gK2}*hI`LHuVcEw6c)MSkVC0%$-xV(ho#t}znxTl zE9=gB_|(k0)d@Kd_1*{X&{)i{`P2U7133q-9m-g6qOq*|Vixo5ZNkTnbGGvve9FmG zUEy&4l~czz`#*>6Z43;^V`SbH~Ht8{33Zy_$OGzX}Qbn{}$+Eh%OSYwhj6=Ec}!cw=8} zwTY$W&j!P^EnQuf_oZa~K75>iuh)ikS1#}2Tl3e?^!}z${JchW>*)=7=7pw-!ENst z7*4ZYlZrUIclNx+CjYOsNWVH`|3LI$#Zd+Y6@_F67ds^t2M&iL4pVl$Z~XH<;=AeZ zwJLvRD?WV0Y>;rq>EZ6~z%7ksi5q{q9a=0e{^QVmiIV8&`}c<)5j5_13*5qefRQ2n zo)Fi9DNc(oN?eb+FY7SpSd4{e)%)FMN#|`JTg=wfD2v;kHb47&qU=HM1L}EeLeCj* zzttXp)%r>PB**tbejiTVFNyuqB2#B~fboFFM*BQkagEDtJ|$5}wk0 zGFmil$%Jc~^UgIa;(em4kZstt&YEvcl23NR^SndH*0vm8uQ%T`<(ZT*KjRFB0>0H7 zn6ei!e7{>Re{POtvqo3hFTJ^{g*8S>HorE?UNCK3votZX`eAv(gvOgy%li(jNjxz- zP-Me42KK#+3Y_O8to_RL&HC08zaNpp8n<}XY90F4X}|4B>w89JCWV6nR}W8Q&}`ID zopC6VQPA>WFw1hC?yw(!U;RE2?QpNeI{s&J+s(ax6E9D4XJ}xR_5F9RkI{oMW|R63 zHLeSJ+YPO)yEks!7~Ny|dU|j}t~J|+_jey>h;X&(nuwSfiI){JHYh3_6xfimw_(oD z_c#B{`*1i?HtUn4qR+$f`q>k=-~GwYrov(B>EWv1m_9RsQG;7#R-%M~*oHF-4_Tx{ zc^1!6>Np|GYQ&cF<`2V4M!&gBADr0RAM_(vA>a5D-vXoWpRX}(RN%SJp>Lm8`0Pn* z`Ts@Brk;tK&HRErVE-$wgr0-G=66NrT9v*M%g)^;llTAIZg;~?n#WE$9X#;ON&VYQ zbB1*_*?V`E1&NC=Pnx65_I|?81q~b;A7u*8OFk`|b!zYD<&CohBzhXYSw46mec+CW zwd0ZlA2bq6m?WayJ$^B$Hm+kUVwJdT9anO2>4(FGihJu5Oa(I2C2v?&X_%0ddszU>%P5+4PbmH=_n|f z63ct|T6=|J&a1agmtHa}XndMk$9BRhy+5W$mvwr&)s4Fe&0WRM&(_5XwRL=WlPu<6 zdpD_0jC)g|i$fH1+i{NB+l0&BspZ^M-HBR`=-K{ygF|1pe_gn=SR>6qI^xN{RmXlXZcVmvQT{e>dN&74W<=k?OFurGX0~0! z79D<-n@>_uz&k-j(dPS%qv8LL%`;~{&XW?WV13e}c+$s5!G4nKZu;J+Wly}kmB~XQ zm-orBpCT^rDhxXLxp^I*F`S5AaE3E3{T%1kI7wy3o+}*dZO>Lbz4^3N-Zk(9v&q(L z>!qG28qZl5Z_8To;UIhAmluI9fhLJPk>R;#?e0fyS3Gv?tx)XT!<)2kNQCjt3T1lD zvG)+y??-+bhawoH5;z^19Nu^xxMy#$m6GAo$Jjl=NIdRXLU`C)LY9F-O#(4Llu+w5|ocQpskxnefhN8 zUZG>L#;GYm_w%;j=G`HCk#)k_Cx7G3ST|gI^ycQ~8{2YkAMuho@KspI=xTsvqu|s~ z3n!MqUEg`U#g1H34?8it^6F`>P3?iLT(aT`s}r3jx>qefqn_1tyx#D|-Oswo4UgL; zmiI}#*)i`!-*>K@+rBT1E?ncueeg}~_l7G~_J>bLavk!RTkym6!O`W@>Wvv~-<1FF z-n@D9d4u8|fyJvs88*&}XPZ-5^=9MogtfBUueqIWv~xSosUzC6{)EMGy>BOG-H2xR zwv%B>1NZc=!E)!`_DlBv+gfmFecH1W9v4%EmCTv)2RJt*N-wO>*gF4)ZgPz2`_J_` zA8y1OeKAS25%q9P2sQj^>&&W@pukwdT=B`b6xu|8+gPN8c+pr|jGT~!0E60l1Z(B>BdT-vfX5G$LbG{v& z=@r|s^UT}!yKYPZoxw~qnc5mQu5GznzUHL6Uid`j^YzCct^ar8(Sh;?K}U%`&P|(M zA715oC_v@I6?-E;`RJK1zdzf*;o85yZ{EDoj!R=n5Ib-s>;C^$@7u0PZQi_@MS<_U zZYc|gAeY+06~bkO424xD`5L2ERWs)KlNb!-(qfScZv1fS5$r~^GtA&SSi@I|5U}h&Z#s1nfNk4KXAF% z?Q!<886Uc(4hXKf^oKcn0mCtglt{L?#OnUk=SO$XeRIK7O73mH|I8~@%<{`0kd zlSL^*M0oMJbeEQcEe(7RKk7%OoPP3l)v|c6pJ~f4|BTswn|IlKhB@D^ue!cURG}~V z&F$^yg)VkoniwU?KjnnY1f|d6+lzKS<9?kOYMaoO{UTw#&AZoeS^*wTBHk*6T`KF8 z`;<@YVE#EjD@f#Q#HtN^^JS`z9S=oN=SK?Yz-B8Xw z&)g2}wUE`0B6hs#B_zWoOyvbC5(8Ql4eW*N5}v^$i2-gw{d8=nm8MO;^0&GMME zB;ncqnRDm<-DMxt{P;W9wT$n~*#c}v#%%2DjL#>EMW~tAKAX~b&bT2)o^P}EI_n1a z8y_oOf7ms|>HJ}JXo$0(-rOO`@c7bc)o#ptHryBdp#INZj_)=)AE(zZ z_;{;s_bY>qyL#B-YA!vRnqG4-Yvy$^rV!Ii_FpXfZ?IWA;0zz2jGJ zV~{q>;jnz=d+k=gL~>T6_Vb$6`3x0LjyL$FOnmuZQ}uqNgR3Fe>;(dvW%mOQAMU?q5Fl<*d1TSum}o1hZ1K7_ z?zJYqfvc}7EUj64`Q@L;?YHN;o&PeQ`Ge5410Pqf3)Mbwb91_(nHigA>i(cti;vBi zxU`R9TMK)AghOBEmXH@uzD{%y*mu?TV7OVm#@%`4Ki|#Uq#YqWz52VrhD}RmGZ?9P zOmqt1y{4A2TI6GZ?DxIt4DYM_W!G>n@5_2}bLwMNu4VRpkBz-n+Gm^1R=n%Y5XBJJ z;QeRK%P3)=2RCj=vb&C8>or-}+S ziH9(>ofeBKi(t6R+!w|}o17bqpFc$Un2{@&!+oqZy5 z6LbysP2BLkuJNXxb2M8t_qJ<`3uLpzU%dU%a9_Fc-aLn=g4}Cef2M1DC>HQvQ%!!@ zD*s)|YeIwI!o@09VF`!NN!|OsF!4^6yKJvyud%x5nN_dy#N#q&DftF#Fa49X`Q{(% zw`Kko-}xCUm{*_q5u34gCaXokg9bTS*}IuNKNXXEBD#JamUyu5J7>wk6Q%rfv$YQ? z^=~cyxYzo=?BVwEPfji|v0E+#8923`vsG6rXX)^0IPvw{PPg+nN`)(#I1e+)>Q3n9 zxLtPr!wG)=hi!K`&-rTk_`VXI`&?VBVamZT@?lF9sfpSeOZTjbN+@9)X!TjmW3zW`C>fvg&8=LW8d%Z>$jFwTdz&bMUmn@?H8osk3a`>F&psh?s$fdM z&AYd~J);d+e?&g8z^m;4&`js?IYJ zCZZGiTq~X{*Y5azkEK_$H~9FMt`9ZOqwoEme>JLJ`ShmB|6imT?j4aj_FFtEdl{%O z01a#RF4EX|%`U5FW%x`Z@%3fG5^{<$^{X9>%a57Qxfu8=ujla#&KZpxynFK{ejb!z zYzUfW+v0bWpW&3##9*fSD?&eQnsg?6F5%@7t4dZk@6C zwCmWPH%CvO{>&!k^5t*dc5CJZjOFjvbG_VrX=@snfvKrzU*j~xXR&AY7)La6|2wBr z@Y|Z@5u?KPy?t{Uwy6qnuWId?@c;eNR`DlnJD7ycMW1hy5^B?vznT0;?Yx4T&6l2z zJr|tkD*n-ZZX=|Wp|(YIafj}=JW-dCC& zI>PqgL0$7V*ByC*BA%M5^&+nN&no{Z37%d5XM6beYaxtgd3QQCr=NH7vOIt0{nl%J z`lUP!2c8rjTlbpvTE1FJTP)v!*>5&f_kL?yb7-~L(iZPObC3ULpSxO)_1d?9J$&j1 zp1xbYiT{keA;%FxrY0s?AJcDd9t!d@=N>(w`tVz|(w)-&BO9C9CaZ_J@jd<7;yzhr zp^5K)I|BoQx1Edb#esspb>l|EC7D*sx86H(=6y=qMiKi4t%jAsJ<;DePe`1wX}Tt| zZtiUn(S^U*{6fxuzp(Ii{k_eHzMa`qaM9uA^PkUCH!#`lVrbu{9V}<4=N^zM%jxbM z!J<{)A0Xl6&Yg2d^5NZnjxEbf`SzYVEjGhOT|n^SHI1%Wfg-jum#xg(emh^El|jbc zVcv5$j>2g(<&&QAE)0L*l>KZ@_JSLG-4_Hnn19y2>$-IL{rJ#_(NFiSuf4tfYn7N$ zUEmvqhbq-S8y}>*Y?Nnvs?4L#d0y(+6UhUw*6s0GdHe6e)g}d8m8u2)mhn!}jcErx z+H~%H?P%Q4b3N{X>gfZbY7-(j3XKKl%1B97t&Ce=yty*+GDG%yhIw*)TcdKLG_SHh zxO+xM*PXHcmB!-zemAyFzVOnhYtG()mCsLv+SIJBwzmKBhuN;jCw6tXh_{ENqZgxO z;rdo>HkT(J^G|sk@LZ%ads0ZVi|iz!F99bHS{3;7YgxWnpfXMJtdrwOncw#`4X(IX zJk8v#BJA;E`GlZv+=_V@qvS1We|?#4UHd+CEg_CzaUa0fR;Hy#XozH?^yTo6zNT1ppIA_Z4@BkJemPtH{ zG6hTAnYlw=pW<8k#)5%UD4|VP(xFSJRYc}WLCS{rZk%s(+KNj;8uJd`sNQ|xgTjYT zm-nm@VrZCBG*{r!t%(ySF5jeMy*>FjpO5cassEKvMG~^IxDFpaoUt|PtVQ2>#tM!D z7m93|S26U-GnwU=UD3SD#Fzg5^5LLK_S>s7A1AzLVu< z9xh!z-HnyC&q48sn39y|0pc@D?`K2pOrm*eNJALSE6QfDBe4H z=3~+4`cLb^o7Vbq8r^@X+7ix?zqXZM^0C!~Z_JtYik?9(i}*TcrE?4K`>NBv(Q=L1 zx<@CjZS06Re)sSOJ;5XE99tt8=H=XqaQBGivY+5qm=SbQ)ce9=?I?e@v(o}IroY|u zw5+j%lYQPp)r*b?HKzo{>9@>Se>KZr)HPAM_ZTSd7F^9z^bO{IP^z@cjib<*!RT~~ z*Dl!yH>3}=@wW8NW+~ASWH&qS_1r(G+}ge?CRBgU^EZ+1J#QUW%V=#@4GiHBU;9e5 ztE1*3=e}oWJ}kS-y)DPXaOydg;E&vE{?}Qst=VoNcBbK4!=;wJ+qq1ZH#o14sSs}A zRa)B9`NA!&&M&(*B`1d`do9cK+KeghvvQ-e`8_qi3tcQrJ67a1p|nAHy`h^s$L($0 z5@p95*ZyEWw7GakkM3cq*u;0I5=$7TO0HP<`1wj9SJnj?7H%yfc2|V$zTWx#Y2}ou zpB--UFV)bE^zde$x}`89Vr#12B8@q9_x89y_;9+X*xSL{xlW;LQKFL6#GtyfQMcn> zuXwOY+hN}BDP@~)+DukCIa8zSox-B8+LHewo*bCH-Y|*r&5f6CJH#yaNU|RYF>0J4 zV_NC*>L)_|=!*@pC!;``52|FJHet9Hn(oR8o5RR=2fb z&b#m0g{{77<CZG zNO>{sE46894f;08DRt_F$vhS3@BJ!KVRxIP@FytAv4C%4POrB{tIHJAa~I#1H1-NJ zO?tS4aoP^nI;~6}7vZSa`9c>+9>YZO-5Kxx8im%=au4)}-X{ z7#IAKc>F~$;j`MIU8PKJmXo8@8bx#uFzB5St|&A3WPOj(sphMp$o!V`A2%2LtP^{x z$IryOd%lLr+EcDO8RA!M;|jCB?B881-nuzw6~nr{VGqv!?RmM`yS9w)55wzLf#v7t z+5Ud=;DG}B>0jFd85mxaSl!r~9UdlfG*M~S)S2sd&se#jSMs^d)ue>iW{i$crYL-Q zPy19JCVn(t!po4)glX7*afP=jsx!WRFmrloRxPJNuH zWL5I(%S-VkQ_6IYy^Jel1$lf&q4Fe^#HCl;SqG-+GEG!@ zacZ5u?cYrnPj2o}+W%R&{wRy)B%|Nz3XX4d9XMERkG5OO*-Wy~;3!Ug{{6)(FS$bx zCcp49$j;K?L*Gl#6`ShU(IE1=QBtv zy9<|E0{U#vddyH!bLKtR_I~%Jw@KUqa^Bq?N?xlUh^GEFYrH-$`OKW%AJTc1UoFham0kqcBsmnY9L#*`5@)H|tD3oywx0Wq4r*Yg~Qj#aYQYw_GG-6(!Up9ufHl5U;HsOZS&8SWxMCb>7AH- z@xYTpaU(CKoSRA$maS9PJa9^5Lv?h;h0Fwb?m5nE$6igUvlFRwD)h*HI>&df#ubsh z9Lim)OFR@?yCo#nm2dP(s;qa^PS`Ntpma{bho#*4FAj)HxC+kr*=lpXKVfRG^7L3n zyDtm*AO3tk-+gaf{Qa!0b$c(rtl6c}^~;ORV_jKlY`DKg#3m){q=tyS3K%eH?Xp@va`4U|GIMC z|1CkQrak|uYF#V7dqynN%iie{Z`n4aawn#=EU4AlcYtGJbCdDxO)FAvh6vSOljRg$ ze{Z*_>J=S7p(8~Mg1i=0(QWBg!RHp~2<_2}37eoZVG=jHK8w`K32t7RPdAqBu4Oo& z62tycb?xb84D!Ek9N$p?ziv(R_Pm_5v}e~p+5De!ZP&cio13N{IK8o_?Bx^Z^*iny zyq3!p$fD72t|4pkXx;+v_kk9B`s>$SiG5{R86>nw!&QY{ptDXu$sk%H+F|2t?G)bW z*7i?yoU~>$@O%~gW`8szcEO`)PmVwl*UOdj_Gk21_J&?K8Xv|zLFMFwoyE`VEYE*F zud(#kCY@;E{(95Zx7qGh%rq?T+xS?jvGnnion04R>#Y;(`SZVeW!w}FRrcrKwwTDd zYph^%XvjSuX=2rW@f-V@eJfSg-e7Y6%cryHO2SElBD=0dW%HijzaBOJpjL-~N6wT3@W0+Nd}Ubn={ zI*BSZY-&83EUVD)@Z!_^`}LRdy9SzYByjv&8+U4NL^1b+=%c|)uPooB^V@Xkl@CRW zlRX9OJ_eURzW?tZ`-gx1vE2_9JJaXSa+w%^Z}B2q{yo2Jk~iEhRgZKGn5O-iCD!xD zp3SXV>mOfYyHotdW{S^kCb!u|$D{9_{wFEVHOuQ)#R4~rZ>t_F?Ypq5fI}<$?e|SO z*4)q8V=kSI3TEB$Y*u!_`s=Clp4+dR@~hly<;O)DOcS55*1w;~f2Sq>_gsD@VZmp{ z&9~pl9sR{Cbl$dv0K7I3K=aR}o>zz1jbt>w-btg}iItds|WjtN$Oc z>_69d<=mU_DzTjPS$8(Go$^&MlzP$4sm^azwUc|TMpqM4M)H}{@14Hm@;wq0zke zciV=?vn2FwjeD>CdHPj)4dcBV=WlG7Sa5td%dA+&+{Z?*k6&xFa6YlUVNX}BN9Lah z$8%p~O*UN5((T-q-S&-`gpBnU_14;jmb%S;liI^Lw}2 zZ@*jj@Ip549NW^H5kU+V!8Jb^9?xU{ZD@6|-B0}!6TiiQt`DnMUn<|RfOXBSr7}{% z%tjh-{_HUiJd&}%UUiPulV8euTeP?m)^5F@zx}rQgANrvO~oy*vJS-?)z1q|NQt*!cZ;OG+fj#Gh=(`_uWLb(cFuic(hRVDTK@#EWDuKf?wEX|)Gwl8H_ ze}nw*BX%`!gnt{{H95h>Ej;6pSO4q@Pg^EWc9?kOgZ-alVt)?3UvvE1>qk@fAM}pU zw_lqORl8z2^Motxny&=@1)e$~=;Qf`FUfz$!{VKOk1tFP2o&jMtzi9b`n``MzC~-A zVae3YM`vVStS>leo*J5%5GeBE{rmU%Tchm5MUF1^(u_K}<43ve4sQG3-u#PJHim^C zj?$a0xka;P*Hzp2j0MK37gwq8c(0titB<99KBz~@xtH0 zc>2MJxC!ak&Dst1>aK13ur&NojPaow^+PWTWdA?9F1+V;b8OAO{^uXhY_~eGJ9{~Y zr*Q7z?zzK&ZO%;ncdM12de?@xL1A%@Smaf2wL80IigL`7#r<%Z(+&X$T?!&EJh8xuu&#i^=x=&&a))S6fQRq=6OcDsRrRmS8V#&7Ts=7-IxJWyukgutS%@3&x|Ez# zUGrC3bcXI%i>3w?0*(lZ+O2~y6}&WaHZcquJoEuF1xR+Jb71Q=O(V@ch07~E$??&efC9} zq%$+q_50>c@wL}2`0Qpsl;3aA`@XhVEO_!w)rpqNwsOe-+4wqPg41fABbP!y>HPfF zpcj3BY3o{E-sMj|vtIkok`e!n*OK9Gx6-OT9S^;d7TjjK_1QbRA%V3;z;|uw@yvTm z&-3lcVBPV4-){qZ`+obMlkFpyZ~fO1v})g-6%`CW9@g&?wf{8vcHy5G;j`NqjK7|{ z$~yWUn6-{W8N%k0kof7t~!yI6DAZ1z(;oE|&veAPLn!|R-HbRQFpYIU4p zw>0MK5AQxDmemJrCvY(r`pmFuQ)TyHe^@P_5Tz-q;Uc2<@Xvk~R*fzu*T4f&)y>y_ zeLL`P zF1=Ipn$6~yf8GJv_wx>Er$7i9S4vi#C0|q}lN4c`cvtjRUJ>cfR| zyqL5(J~L!>S^|#Em|WK}<)D@YtNuwQn;#FFKR$W#L@&*6+TqXle>(K6tuESAWZ=A7 zHx?#d^-I-SfH`f#5rNyvGqm>6@7Rg7mf z$D5)zXLpO&&4`Ng#g;{;Q%llxO0O4Au)# zi*LX6TKkpbRLYeguEhZ_B2#WHm^)d$womKG`H-@^w;r4}_8&mkt!R7fU8+-2M z_OUUZ+z%Q%b(WeiOlvK({jS^l_de6L`y6M^?l3fDRP+|fh-#E$YWCU}_dSQd{3`d6 zL-l-XGJBYs6<5A~#(V1!qoF3##D*^|mmeDL$^X9Da*BA}`6uNId>_7kxA)!MEX5Tu zqVJrf%j!MevT4;^c4nGB)$zWz!43Wr=>rR=Pd}IX1`#R4OhxDP z4N?j3ZLF^JrZPKDU^z{aChTlHWv#%2JY8~&z<4k$D3>PyrYfr%GJ4XvO$5G zufvM}IUex(`stUVV#qb#9DPR-_X8go9=5KJHc6Yd@BPC+(}T2<&p19UddqacW?hN| z2SfbNQ{i8>UXQB|@S4f3_-mRqTi>2jKf2FL{n=cvY8a#JV=i%vS@ZNl0a2lJKAm|_ z)OxM@;KRGy&r?~CzQ>UFWw=527UoLC#J#GI(PON`5=jvNuGOG>N3w=!% zt5aL|$EN!7{dneM?JV>DbRFH;e44}altBbj&?#}L-ecxlu8E!dv%fL)2ZQ)phU0y* zho7CDEqJ`pJ-c@LwW{-8A`AtIe9?z^tLF%%w3<)tZV+p{wDrrnPQi*ur;-O;?x!vu zW%+eO!Gy7+=txhohW958ixbm~zsHJ~={fwYxEUUKRNPmA(@9U-M$ES8YFEK}29ZUL zDokd*!hSLg^J;pg&oOmyNnF8l$wYU?&-dx+>GAEx|APxQv*_=XDDrHWur_-8qnqjT z&zk4mk%-QgzZi9$L1#6~nLMv_9nR}_T>@GkpNYH>6zlp}Z$abpNi7#mBQhk;?sfC2 z7xrWb;&9o-KXFav`S>c;4>N36%Y0mH%3bt@TjPc6(~c;en!Da#LKx?5`&Fv(CuC#& zvCzL}JwhSPA8y2d-n8b?)R|5lkAD=bzWQsn&3Wg2A2h-&L!V3%dGO`sPu*2Ad;3;DP9>!`yAB%GJgL-=-j?8@p?}A9ua}hm0|qW@ZIg7BLitM- z5*yz%Pq`=gg;_mjvfIO5ReJ+Aczj&-xxMLf_^e-x+MmbUbT1J3_vp0t4u%bR9RcDk z>+8-X6|pKmIsDFl(h-4+_CEgp_K%-)r82~|TeGcO!^Ci)PuBXw8RPR?)Ya6Ut=-Bm zncQ~h`?Tyo8;)r*8Wx-_Wje+%cg^*fojU?HReW-v!JW}{>g-pUgPF4y$n`6AvMIQ} z`FdiCDeLK0eaqXe)7V81@ax;`U%ez)>;1*EtUJWRTVkVHTrcE%9(XZfw$i^J_apXv zy!5FqTIP7-5}8RVmY4Fj|F^eywVCnXd}9|!LMT_kt1Fss?(P=f8ufO^wW^kx?>Aoa zN@Ek$ea#=iJ*PrAK(gR1@49sT({nR<)9DPyEn1 zkLOlN;+jvo@p1)0wpL=6^B+cNod5NibAQscdWRp~9g0efJ(UmZU+3%c+3eo);jm2N z{@>gT^~ScgfA`$~E0#C!!KzU#90B$UU&PP znmX4uI()0g<{Q!LtG+3&UCngy$)aa`#q(t4B|Ii`MA&<+X#DV1KVr|fn5A3aFm-o0 zEot4i&(0eoKWgSZm#o_Oe|1E2Wz*`Q24(lYgpv}GyLsCMkALJ;JTlj*qxT?x zM5hqLfiEfruQ)ao3MVElZZPGOPS;Bb(@u-7xFs>kAZR%d0$4BvvETLHtq*u07b5FVaCC-0B_LmzbelN~3{Qq&i=P-Mi*t+)O z{c-CT@84g)>hjA!NAKLZ6R2O)cKdI(kyG8(4IggajI8)}O4xJK8CB1s^tEBqybCT& z)pA_TC{s68(7olYHAm*7N(S+_Te56q3w}DBPgy-@;b*x_=Zt-8!d`T(d31y|&T;_1#RA2}!b;gkCpeoR#1Y-?}tUZkKowDhByw`IQPwX0@6-*X&6AIsn z7#KcW)41T?#DI7Ivf}67Z;kqTro`at)4tHXW;s(WZ`}~;l@8j>t?{gCN}glmmn7l% zkD^Tvk~w>Lgw)(vL%KiQ)sMFMTk2NcIyrukhSvGN3l}P~eRy)^%9ZDPUh-@ zl6&XcnM@20+ixG8XItGRtnMe%_xQ$=%&O!`D$a~*+k#XR*q$wGFpp0ZkuBHh=@neE zKqxxgDwF%xYAx%12bhA~Vs9Q@7$m-|r{L(r)r(5KIm$V{HU)=!zHHMl?2Ji&-)88P z#i?(9^v5xAT|XJ7un!ZxAO4nXdh!0f``WPT+_bc3_U5zC27FcCQCPG-dFs6Xseud! zdMAW>m3A$%&{}$BYt-9c7JcpdVVn%*pZ(=o`Sw3LApH8ewW~+ctFPB)a?g0@ddNgH zahgn1chYxO`~4@*ggYNC*yqi8MOge+FTb!7^PZ0~AAX4I#?|&sjCWZacH?KDNMb>O zz}Bd@pmD|e^z?N8u$KER((1dHl{}o@Dt|!Y@|n+nc1$r^eKqU)kwP1(DGnTkfh>ZR zY;$TZN49*EF)(q6*ne)K_A$Y~4twHc1-Dz6tgd?T^xS&2O0mB&p8uK7Yw5}EJQ84^ zSkqzO&IlaiJFTM!?Azdl~%=)6T5E!TE+Y43R<-W!~7IPH+>ZqDfS%x%Xx zmCBM|d_Htld<%Pw-hpTOMF*;T?mw^Raq?GI=;Yig;*s2-v(WPGix+(RPtCA7=gnj} zJ*vCa-oT(>*~N@M(~Z;5*`!v_*!{yrn&jC_tLB#gf5ycUc8u}pNHp<@!GGo zmGjgY-Qq-!u99%RBxSH`-iAc&4TaK)cik4`cTBj_V8Cx8 zMM8$H?HEUGv%^~c72lZ)FG)*zPG$2e_Yvrtb1{=?uGob+sU~T6r+f};o|xWkz%+e_ z77Kr3k;V0_t=FU0UW@nf_1*i(xYp6^IfD)N^dCEQUVCXUJeZOYJ!{$a-o8FNiQ^yp zHI}Z^>}pzd?LpB*ch+Se0`5ki*$}lYv(i4H^v-PYDt;Etr%VskJtui<&d=Ez6`x@u zb^Py4ev6$xhu{90>HTl9c0_oW<`hPg9>dRb{nGusDs_A>yLj!K*zu^Km?1_a`^V8W zS?zflr{nI-+bd@Mr$+n9SM8m(OERnaI`&yuTmNoN+g!=F_n%#p_Ln^kr*&!`oZ8&F zeMaTF+i#zFtz5h{Dp#-Xaj8>>qS7L+7azMma>SieZHb7v=satgtITnI5!a96!NI}z z*FE`ucvg$>zdKVa`orhw$?+YtS-kbyT)*dY1Rf=<4STH7b*xq3YePM^7-Pk6O=p2U z;uSZ(n)zOy%AyjY z_CbZXYvyq;FLR5X-dxeY7a6FJ0`s>5AJxiuc>#%a_ zxXch2?zQ*I%aVI9O00^n?d?3;r2imjSN@^OpW)|w9uu|Mi^I;}&S5)e@n;REF8$%$dVZ9aarfI+W7-_Am(u z8VX9Lg?%{U?P9_|eTP;0+PPX?NnV!-ZRSSxD1OX$$ga;w9fm2!E@=QCb7pk?t_ z|9O?QhC``p!Kn@B;tw;tVyH@Cww+?nso2qxBI3GHKuJl-(|K;r-rpP3&&;X?*N87IbD1+j*O}c}S0By!r^fu<{;N-ySy&ugUU1yKqUZ1TLl*_Z z9^5f3cwP~=lglD?$Ew8JQS1N9#|b5wY?!ykj)8$ewZt`|BqgyV)hf9tHL)a>!N|bS zKo^88LJUo;3@oiojI<4mtqcsjGZZGFXvob^$xN%nt-;E4h8_b01B0ilpUXO@geCy7 Cv7ti% literal 0 HcmV?d00001 diff --git a/project/jni/application/scummvm/readme.txt b/project/jni/application/scummvm/readme.txt new file mode 100644 index 000000000..cbc537887 --- /dev/null +++ b/project/jni/application/scummvm/readme.txt @@ -0,0 +1,8 @@ +To compile ScummVM add the ScummVM SVN to directory "scummvm" (or make a symlink to it), +then from dir 'project/jni/application' execute commands + +rm src +ln -s scummvm src + +Then go to project root and launch 'build.sh' - that should be it. +You need to have Android SDK 2.2 and NDK r4b installed in your PATH. diff --git a/project/jni/application/scummvm/scummvm b/project/jni/application/scummvm/scummvm new file mode 120000 index 000000000..3c7c69dce --- /dev/null +++ b/project/jni/application/scummvm/scummvm @@ -0,0 +1 @@ +../../../../../scummvm/ \ No newline at end of file diff --git a/project/jni/mad/Android.mk b/project/jni/mad/Android.mk index 9e9dafa1b..1d613311c 100644 --- a/project/jni/mad/Android.mk +++ b/project/jni/mad/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := mad -LOCAL_CFLAGS := -I$(LOCAL_PATH) \ +LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include \ -DFPM_64BIT -DOPT_SPEED \ -DSTDC_HEADERS -DHAVE_UNISTD_H \ -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 \ diff --git a/project/jni/mad/mad.h b/project/jni/mad/include/mad.h similarity index 100% rename from project/jni/mad/mad.h rename to project/jni/mad/include/mad.h diff --git a/project/res/values/strings.xml b/project/res/values/strings.xml index d7285ec3f..28304933c 100644 --- a/project/res/values/strings.xml +++ b/project/res/values/strings.xml @@ -1,6 +1,6 @@ - Jooleem + ScummVM Initializing diff --git a/project/src/Accelerometer.java b/project/src/Accelerometer.java index f3a02cd76..bd6ae2735 100644 --- a/project/src/Accelerometer.java +++ b/project/src/Accelerometer.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package net.sourceforge.jooleem; +package org.scummvm.sdl; import android.app.Activity; import android.content.Context; diff --git a/project/src/Audio.java b/project/src/Audio.java index 09f29ac0c..1022b6e99 100644 --- a/project/src/Audio.java +++ b/project/src/Audio.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package net.sourceforge.jooleem; +package org.scummvm.sdl; import android.app.Activity; diff --git a/project/src/DataDownloader.java b/project/src/DataDownloader.java index 69e0311aa..ad977c126 100644 --- a/project/src/DataDownloader.java +++ b/project/src/DataDownloader.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package net.sourceforge.jooleem; +package org.scummvm.sdl; import android.app.Activity; import android.content.Context; diff --git a/project/src/GLSurfaceView_SDL.java b/project/src/GLSurfaceView_SDL.java index 447b95e6d..cf1608a4b 100644 --- a/project/src/GLSurfaceView_SDL.java +++ b/project/src/GLSurfaceView_SDL.java @@ -18,7 +18,7 @@ fixed with a hammer and rasp to work with libSDL port */ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package net.sourceforge.jooleem; +package org.scummvm.sdl; import java.io.Writer; import java.util.ArrayList; diff --git a/project/src/Globals.java b/project/src/Globals.java index 750661c8b..25f071470 100644 --- a/project/src/Globals.java +++ b/project/src/Globals.java @@ -1,14 +1,14 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere -package net.sourceforge.jooleem; +package org.scummvm.sdl; import android.app.Activity; import android.content.Context; class Globals { - public static String ApplicationName = "Jooleem"; + public static String ApplicationName = "ScummVM"; // Should be zip file - public static String DataDownloadUrl = "Data files are 10 Mb|http://sourceforge.net/projects/libsdl-android/files/Jooleem/jooleem_0.1.4_data.zip/download|http://sites.google.com/site/xpelyax/Home/jooleem_0.1.4_data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/jooleem_0.1.4_data.zip"; + public static String DataDownloadUrl = "Data files size is 3 Mb|https://sites.google.com/site/xpelyax/Home/scummvm-1.2.0-data-1.zip?attredirects=0%26d=1^Lure of the Temptress (10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-1.1.zip/download"; // Set this value to true if you're planning to render 3D using OpenGL - it eats some GFX resources, so disabled for 2D public static boolean NeedDepthBuffer = false; @@ -24,7 +24,7 @@ class Globals { public static boolean AppUsesMouse = true; - public static boolean AppNeedsArrowKeys = false; + public static boolean AppNeedsArrowKeys = true; public static boolean AppUsesJoystick = false; @@ -56,5 +56,5 @@ class Globals { } class LoadLibrary { - public LoadLibrary() { System.loadLibrary("sdl-1.2"); System.loadLibrary("sdl_mixer"); System.loadLibrary("sdl_image"); System.loadLibrary("sdl_ttf"); }; + public LoadLibrary() { System.loadLibrary("sdl-1.2"); System.loadLibrary("mad"); }; } diff --git a/project/src/MainActivity.java b/project/src/MainActivity.java index c11b33d6b..c34dec68d 100644 --- a/project/src/MainActivity.java +++ b/project/src/MainActivity.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package net.sourceforge.jooleem; +package org.scummvm.sdl; import android.app.Activity; import android.content.Context; diff --git a/project/src/Settings.java b/project/src/Settings.java index 9d3147d94..9d5e84ce2 100644 --- a/project/src/Settings.java +++ b/project/src/Settings.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package net.sourceforge.jooleem; +package org.scummvm.sdl; import android.app.Activity; import android.content.Context; diff --git a/project/src/Video.java b/project/src/Video.java index ed338d3f5..cf0a6c354 100644 --- a/project/src/Video.java +++ b/project/src/Video.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package net.sourceforge.jooleem; +package org.scummvm.sdl; import javax.microedition.khronos.opengles.GL10;