From 7f2660dc2027231d3a4f915a7d0a5cab31509735 Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 21 Feb 2013 20:01:11 +0100 Subject: [PATCH 1/3] keen package Updates --- .../commandergenius/AndroidData/keen1.zip | Bin 151317 -> 152321 bytes .../commandergenius/AndroidData/keen4.zip | Bin 582281 -> 582637 bytes .../commandergenius/AndroidData/keen7.zip | Bin 658094 -> 661279 bytes .../commandergenius/commandergenius | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/application/commandergenius/AndroidData/keen1.zip b/project/jni/application/commandergenius/AndroidData/keen1.zip index cf46b7f9501227f2710f5531ff93f38903fd8899..b04c92bd36d2daedfc2dde4227a5292e575bd4ea 100644 GIT binary patch delta 2410 zcmbO_kF#+Zr(b|KGm8i_0|NsCXLqO*h=yS{1_p-o#N5p z7a6&*xG(JrV>%Yq7jH7!uwj}l_<&IlOOQA}WMpN+h{^3fj~Q=bM*DWnH;e_M7^z|V zTt=q5GMK`3a!iX^FjCZZRb{3QK1|gc4VhTjF;(xhU<%|DkU>jo)A`()Qc|#ICP>B- zX!z?0V!^T&Ba=NdBm-j0Tp*PU3?Mx!=r(1zGs&oeavMaALc^a%KQuM2?v5U=jxN&$ zJ(xr$-(=;H1LZ@6a#c214u|C4>F3>A|F-f@wE_=Ol~1qnU{X^>b=tj`sA@c1eFETSUI3X1%H#+$3*VxupZ?B+ zNfj-0CN5!w7HAOf`nZO<`WP63Lua~!Clikxs<*BzLsdUL&XY+U%}mY}sA?c)8bi#~ zTFr=V=A+f9>Zf18G_!sksv3xyreHG-eH!;1GG=68SisD{facuw*tD5}wM~!p!tkEW zMpX6FtGzJ1=dm4C4a6xH5HrtXn(4F~RsHn0m}W-oMO6bf)6f87rq+IpATv9Fs(yOB zH-B<@Afb7-bNb0-73bKPC+o)Iw#i3aXl5|4=`dU~mGM9`DD5Ui5_;qbi?X z>&K*lR!(JFp{d#K$D}3)D)C|E&X&eg9%yRb`!PxIsW7N8%;jWY@bhG1U|;|MxG-we delta 1431 zcmZo%#yNE!=R`j#7H$RxhK&`+Sy^}(7#KGDv+>M@u(B6>TZ1JxAG?>r#KHxVwR*UZ z10u`us+pOE6C^hKt-yA$y6wA{Fd8#KnE#eBsxm^D#w!?4GDDa=YZ!Z>3RbRTbcHJT zx1KQq%1qnH_=gpuwrD%!E2y@d-HdEdZB2U_&q0{W6Amy!SlbH@G0H)i^Nuhs=YSXx zdX~`>YSy|-j9gH&PF!V7hl<+YX0&00sO^5ps0Vez$w!Q=OkkgFzxRakCd9kjkH2Ls z5C!{uyE`+}T^R_|M1g5B3pix9KUZPu;DdS?v_09Xmj0`@mVXi&~($3=CS#=(em~%g8YOEv7Bs*1=3LgV^Hh%fy4`lAsMRHRfP7a(gcR^*YMT zz!1TUZcWfOMuzEoe3{gRP(A6ei;-bEqaTJRz4kzjHZ*`3eJX!_%WXymh7>k*qhH=$}Qpk7Lz)+^4*$iVOoBkDijXJnY37l2`n>O-gzmJlPRp9^5(K}&dg zj~N-J{|I1GMN6pMZx|V-TL)s~je15VhUtxgOd3+Cc_u-Qi6J1!HO$jBJQy4W(@(1~ z@d%;j3U*~ChUvUP7`bAyArr&&z#t|KH1)GBm>8x{4`NcY0A+btZrRfK!HtO_BQrgt kI61#4HMPJ{FD0=gz?+o~q(X^7iD5cB14D*869WSS0DcoX*Z=?k diff --git a/project/jni/application/commandergenius/AndroidData/keen4.zip b/project/jni/application/commandergenius/AndroidData/keen4.zip index 1b6b8cceb5da472f0b68c066364650e1336e5a66..fe333957cdab1554ed7dd204197425a798c7cf14 100644 GIT binary patch delta 663 zcmeA?s{Ho2vR{BVGm8i_0|NttV0Wk!h=yS{1_p-o#N5R)mRcxo9Ttd&r@IriL|&4I2GWTYrGm zpxQboh84RRUV4RV>< z4RV>=4RTqw8|1RSe*>0n*N_}fmqxI$+okStR5MR!e#9Xp z1hR$!3=|svG=dn@jURES3W00|@fa9D;%l=R7^as!;!r~q{{Rx-1ri6j388*U4gkZ*uDD;vl@b_RBaE=C51mk&4?7#ILv*-MB3 diff --git a/project/jni/application/commandergenius/AndroidData/keen7.zip b/project/jni/application/commandergenius/AndroidData/keen7.zip index ab57cb9160cb77ab55f1eef16459d9e1662a4da3..e60ab7d8d174d7026bb166d50f2774800ef8dcd9 100644 GIT binary patch delta 1417 zcmZ2CRb&1-4Zi?yW)=}<1_lNOsqRoG5Dmj@3=9nEiMgr8`Uo{Y7KNaw;eo5kPEE}- z*PkFIAc`imQErBlfCQT0=3P!_m@q}VTs0X5#L?AmcjICd5JMB4eAIoBfC-x5bVd#? zjm?uiI9V`FS>W@R2~%{TzlJ`BJDShdwV$nHY(HDa)PA;(x&3S%%l5N%tm?ZlRJQ-H zWZVA3lD(Y?!-4J1HtgG*Z8+AJU1B0y$ z0|UCpyUC=*}2r@KnW9}<~q6>Mh-3)IaIqOe9_Da=ipLD zQ==Myre*?24XWQ`>(SJlrvI{Z9-K8Prk@;jxEh2f{$$v4kPN2%_x|jWfeJN#;WOhyE!<}9D4sKstMB{ zb8@Mo1+L5)G&NFOTzzEII-|BFfeRZa6ZEXVf}H{WMtt6iJ7`{F|u$mFfdH^ z_gKWD0TN>LG-QEDI{E%(g0TDpH1xq*o7?N#+v^$I+v}Oy+v}Oz+v{1jx7V|(?*_}Z z@3UgtzR!xioe6Aad#Ek@_E1}nwIyJeOc&b3VFqSxkJ!YqgLC@JqZ|SdKIbtGT{f^) z+uhD^aI-*6OT56bJ@EqPRR^%lbT>h+yy;3pTtY%1e=&f8Lc^9u5Mz3f5SOYD$eSP@ z0|Q8WjuQjJ^r=Ez8ffA9Pt-69*vP@)?ds}hu2+y)65!3q zWX~+Z%)r3GP%u5qDssk*Ra|Tg40j?K7*Msz?B-yYZXm{`islX9gB%Rgi^aIq#ZbKw zbCiQ2H6^oT`U4Rzk?9x2xCD$*!^M=1iy=3$AR{#~MK3wqB*2@M4HTe)41x>~nHdAlK=n! diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 290f82353..7d595f878 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 290f82353bee0e48e45bd19f2c24bba98b93f1d2 +Subproject commit 7d595f87856eb7de4ea065e0afa29432ca774b27 From cfb9d53217bd83eb1defef12a5560fb384767d9c Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 21 Feb 2013 20:42:30 +0100 Subject: [PATCH 2/3] Parameter Update for CG --- project/jni/application/commandergenius/AndroidAppSettings.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index 75827e561..805654cc5 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg @@ -47,7 +47,7 @@ ResetSdlConfigForThisVersion=n DeleteFilesOnUpgrade="%" CompiledLibraries="tremor ogg" CustomBuildScript=n -AppCflags='-frtti -fexceptions -finline-functions -O2 -DTREMOR=1 -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++11' +AppCflags='-frtti -fexceptions -finline-functions -O2 -DTREMOR=1 -DANDROID=1 -DBUILD_TYPE=LINUX -DTARGET_LNX=1 -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address -std=c++11' AppLdflags='-ltremor' AppOverlapsSystemHeaders= AppSubdirsBuild='commandergenius/src/*' From b0f3c27c7b3300a36b7636bafa45b548e1a5aa2f Mon Sep 17 00:00:00 2001 From: Gerhard Stein Date: Thu, 21 Feb 2013 21:16:20 +0100 Subject: [PATCH 3/3] Updates for CG --- project/jni/application/commandergenius/commandergenius | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 7d595f878..d03ad81c4 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 7d595f87856eb7de4ea065e0afa29432ca774b27 +Subproject commit d03ad81c489e7d6562818a96bbbb409ad9b044a7