From 6e730dab4724b6921f12fc959aa02415a52b3643 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 14 Oct 2012 05:18:53 +0200 Subject: [PATCH] (Android) Split up project into native / phoenix - phoenix now doesn't show main screen/rom browser (sigh) --- android/gen/stub.txt | 0 android/jni/Android.mk | 53 ----------------- android/{ => native}/.classpath | 0 android/native/.project | 33 +++++++++++ android/native/AndroidManifest.xml | 30 ++++++++++ android/native/jni/Android.mk | 54 ++++++++++++++++++ android/native/jni/Application.mk | 1 + android/{ => native}/jni/main.c | 2 +- .../native/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 2569 bytes .../native/res/drawable-ldpi/ic_launcher.png | Bin 0 -> 938 bytes .../native/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 1721 bytes .../native/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 3139 bytes android/native/res/values/strings.xml | 4 ++ android/phoenix/.classpath | 8 +++ android/{ => phoenix}/.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 android/{ => phoenix}/AndroidManifest.xml | 11 +++- android/{ => phoenix}/project.properties | 0 .../res/drawable-hdpi/ic_action_close.png | Bin .../res/drawable-hdpi/ic_action_history.png | Bin .../res/drawable-hdpi/ic_action_load.png | Bin .../res/drawable-hdpi/ic_action_main.png | Bin .../res/drawable-hdpi/ic_action_open.png | Bin .../res/drawable-hdpi/ic_action_save.png | Bin .../res/drawable-hdpi/ic_action_settings.png | Bin .../res/drawable-hdpi/ic_launcher.png | Bin .../res/drawable-ldpi/ic_action_close.png | Bin .../res/drawable-ldpi/ic_action_history.png | Bin .../res/drawable-ldpi/ic_action_load.png | Bin .../res/drawable-ldpi/ic_action_main.png | Bin .../res/drawable-ldpi/ic_action_open.png | Bin .../res/drawable-ldpi/ic_action_save.png | Bin .../res/drawable-ldpi/ic_action_settings.png | Bin .../res/drawable-ldpi/ic_launcher.png | Bin .../res/drawable-mdpi/ic_action_close.png | Bin .../res/drawable-mdpi/ic_action_history.png | Bin .../res/drawable-mdpi/ic_action_load.png | Bin .../res/drawable-mdpi/ic_action_main.png | Bin .../res/drawable-mdpi/ic_action_open.png | Bin .../res/drawable-mdpi/ic_action_save.png | Bin .../res/drawable-mdpi/ic_action_settings.png | Bin .../res/drawable-mdpi/ic_launcher.png | Bin .../res/drawable-xhdpi/ic_action_close.png | Bin .../res/drawable-xhdpi/ic_action_history.png | Bin .../res/drawable-xhdpi/ic_action_load.png | Bin .../res/drawable-xhdpi/ic_action_main.png | Bin .../res/drawable-xhdpi/ic_action_open.png | Bin .../res/drawable-xhdpi/ic_action_save.png | Bin .../res/drawable-xhdpi/ic_action_settings.png | Bin .../res/drawable-xhdpi/ic_launcher.png | Bin .../{ => phoenix}/res/layout/file_choose.xml | 0 .../{ => phoenix}/res/layout/file_view.xml | 0 android/{ => phoenix}/res/layout/main.xml | 0 .../{ => phoenix}/res/layout/rombrowser.xml | 0 android/{ => phoenix}/res/menu/main_menu.xml | 0 android/{ => phoenix}/res/raw/retroarch.cfg | 0 android/{ => phoenix}/res/values/strings.xml | 0 .../retroarch/fileio/FileArrayAdapter.java | 0 .../src/com/retroarch/fileio/FileChooser.java | 0 .../src/com/retroarch/fileio/Option.java | 0 .../{ => phoenix}/src/com/retroarch/main.java | 4 ++ android/proguard-project.txt | 20 ------- 62 files changed, 143 insertions(+), 77 deletions(-) delete mode 100644 android/gen/stub.txt delete mode 100644 android/jni/Android.mk rename android/{ => native}/.classpath (100%) create mode 100644 android/native/.project create mode 100644 android/native/AndroidManifest.xml create mode 100644 android/native/jni/Android.mk create mode 100644 android/native/jni/Application.mk rename android/{ => native}/jni/main.c (99%) create mode 100644 android/native/res/drawable-hdpi/ic_launcher.png create mode 100644 android/native/res/drawable-ldpi/ic_launcher.png create mode 100644 android/native/res/drawable-mdpi/ic_launcher.png create mode 100644 android/native/res/drawable-xhdpi/ic_launcher.png create mode 100644 android/native/res/values/strings.xml create mode 100644 android/phoenix/.classpath rename android/{ => phoenix}/.project (100%) rename android/{ => phoenix}/.settings/org.eclipse.jdt.core.prefs (100%) rename android/{ => phoenix}/AndroidManifest.xml (73%) rename android/{ => phoenix}/project.properties (100%) rename android/{ => phoenix}/res/drawable-hdpi/ic_action_close.png (100%) rename android/{ => phoenix}/res/drawable-hdpi/ic_action_history.png (100%) rename android/{ => phoenix}/res/drawable-hdpi/ic_action_load.png (100%) rename android/{ => phoenix}/res/drawable-hdpi/ic_action_main.png (100%) rename android/{ => phoenix}/res/drawable-hdpi/ic_action_open.png (100%) rename android/{ => phoenix}/res/drawable-hdpi/ic_action_save.png (100%) rename android/{ => phoenix}/res/drawable-hdpi/ic_action_settings.png (100%) rename android/{ => phoenix}/res/drawable-hdpi/ic_launcher.png (100%) rename android/{ => phoenix}/res/drawable-ldpi/ic_action_close.png (100%) rename android/{ => phoenix}/res/drawable-ldpi/ic_action_history.png (100%) rename android/{ => phoenix}/res/drawable-ldpi/ic_action_load.png (100%) rename android/{ => phoenix}/res/drawable-ldpi/ic_action_main.png (100%) rename android/{ => phoenix}/res/drawable-ldpi/ic_action_open.png (100%) rename android/{ => phoenix}/res/drawable-ldpi/ic_action_save.png (100%) rename android/{ => phoenix}/res/drawable-ldpi/ic_action_settings.png (100%) rename android/{ => phoenix}/res/drawable-ldpi/ic_launcher.png (100%) rename android/{ => phoenix}/res/drawable-mdpi/ic_action_close.png (100%) rename android/{ => phoenix}/res/drawable-mdpi/ic_action_history.png (100%) rename android/{ => phoenix}/res/drawable-mdpi/ic_action_load.png (100%) rename android/{ => phoenix}/res/drawable-mdpi/ic_action_main.png (100%) rename android/{ => phoenix}/res/drawable-mdpi/ic_action_open.png (100%) rename android/{ => phoenix}/res/drawable-mdpi/ic_action_save.png (100%) rename android/{ => phoenix}/res/drawable-mdpi/ic_action_settings.png (100%) rename android/{ => phoenix}/res/drawable-mdpi/ic_launcher.png (100%) rename android/{ => phoenix}/res/drawable-xhdpi/ic_action_close.png (100%) rename android/{ => phoenix}/res/drawable-xhdpi/ic_action_history.png (100%) rename android/{ => phoenix}/res/drawable-xhdpi/ic_action_load.png (100%) rename android/{ => phoenix}/res/drawable-xhdpi/ic_action_main.png (100%) rename android/{ => phoenix}/res/drawable-xhdpi/ic_action_open.png (100%) rename android/{ => phoenix}/res/drawable-xhdpi/ic_action_save.png (100%) rename android/{ => phoenix}/res/drawable-xhdpi/ic_action_settings.png (100%) rename android/{ => phoenix}/res/drawable-xhdpi/ic_launcher.png (100%) rename android/{ => phoenix}/res/layout/file_choose.xml (100%) rename android/{ => phoenix}/res/layout/file_view.xml (100%) rename android/{ => phoenix}/res/layout/main.xml (100%) rename android/{ => phoenix}/res/layout/rombrowser.xml (100%) rename android/{ => phoenix}/res/menu/main_menu.xml (100%) rename android/{ => phoenix}/res/raw/retroarch.cfg (100%) rename android/{ => phoenix}/res/values/strings.xml (100%) rename android/{ => phoenix}/src/com/retroarch/fileio/FileArrayAdapter.java (100%) rename android/{ => phoenix}/src/com/retroarch/fileio/FileChooser.java (100%) rename android/{ => phoenix}/src/com/retroarch/fileio/Option.java (100%) rename android/{ => phoenix}/src/com/retroarch/main.java (96%) delete mode 100644 android/proguard-project.txt diff --git a/android/gen/stub.txt b/android/gen/stub.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/android/jni/Android.mk b/android/jni/Android.mk deleted file mode 100644 index acc182a206..0000000000 --- a/android/jni/Android.mk +++ /dev/null @@ -1,53 +0,0 @@ -RARCH_VERSION = "0.9.7" -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -APP_OPTIM := debug - -LOCAL_MODULE := retroarch -LOCAL_SRC_FILES = ../../retroarch.c \ - ../../file.c \ - ../../file_path.c \ - ../../hash.c \ - ../../driver.c \ - ../../settings.c \ - ../../dynamic.c \ - ../../message.c \ - ../../rewind.c \ - ../../gfx/gfx_common.c \ - ../../input/input_common.c \ - ../../patch.c \ - ../../fifo_buffer.c \ - ../../compat/compat.c \ - ../../audio/null.c \ - ../../audio/utils.c \ - ../../audio/hermite.c \ - ../../gfx/null.c \ - ../../gfx/gl.c \ - ../../gfx/scaler/scaler.c \ - ../../gfx/scaler/pixconv.c \ - ../../gfx/scaler/scaler_int.c \ - ../../gfx/scaler/filter.c \ - ../../gfx/gfx_context.c \ - ../../gfx/context/androidegl_ctx.c \ - ../../gfx/math/matrix.c \ - ../../gfx/shader_glsl.c \ - ../../gfx/fonts/null_fonts.c \ - ../../gfx/state_tracker.c \ - ../../input/null.c \ - ../../screenshot.c \ - ../../conf/config_file.c \ - ../../autosave.c \ - ../../thread.c \ - ../../console/rzlib/rzlib.c \ - main.c - -LOCAL_CFLAGS = -marm -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DINLINE=inline -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 - -LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl -lz -LOCAL_STATIC_LIBRARIES := android_native_app_glue - -include $(BUILD_SHARED_LIBRARY) - -$(call import-module,android/native_app_glue) diff --git a/android/.classpath b/android/native/.classpath similarity index 100% rename from android/.classpath rename to android/native/.classpath diff --git a/android/native/.project b/android/native/.project new file mode 100644 index 0000000000..eea71ff970 --- /dev/null +++ b/android/native/.project @@ -0,0 +1,33 @@ + + + android.app.NativeActivity + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/android/native/AndroidManifest.xml b/android/native/AndroidManifest.xml new file mode 100644 index 0000000000..2a8e6b51ad --- /dev/null +++ b/android/native/AndroidManifest.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk new file mode 100644 index 0000000000..d6c43fe68a --- /dev/null +++ b/android/native/jni/Android.mk @@ -0,0 +1,54 @@ +RARCH_VERSION = "0.9.7" +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +APP_OPTIM := debug + +LOCAL_MODULE := retroarch + +RARCH_PATH := ../../.. +LOCAL_SRC_FILES = $(RARCH_PATH)/retroarch.c \ + $(RARCH_PATH)/file.c \ + $(RARCH_PATH)/file_path.c \ + $(RARCH_PATH)/hash.c \ + $(RARCH_PATH)/driver.c \ + $(RARCH_PATH)/settings.c \ + $(RARCH_PATH)/dynamic.c \ + $(RARCH_PATH)/message.c \ + $(RARCH_PATH)/rewind.c \ + $(RARCH_PATH)/gfx/gfx_common.c \ + $(RARCH_PATH)/input/input_common.c \ + $(RARCH_PATH)/patch.c \ + $(RARCH_PATH)/fifo_buffer.c \ + $(RARCH_PATH)/compat/compat.c \ + $(RARCH_PATH)/audio/null.c \ + $(RARCH_PATH)/audio/utils.c \ + $(RARCH_PATH)/audio/hermite.c \ + $(RARCH_PATH)/gfx/null.c \ + $(RARCH_PATH)/gfx/gl.c \ + $(RARCH_PATH)/gfx/scaler/scaler.c \ + $(RARCH_PATH)/gfx/scaler/pixconv.c \ + $(RARCH_PATH)/gfx/scaler/scaler_int.c \ + $(RARCH_PATH)/gfx/scaler/filter.c \ + $(RARCH_PATH)/gfx/gfx_context.c \ + $(RARCH_PATH)/gfx/context/androidegl_ctx.c \ + $(RARCH_PATH)/gfx/math/matrix.c \ + $(RARCH_PATH)/gfx/shader_glsl.c \ + $(RARCH_PATH)/gfx/fonts/null_fonts.c \ + $(RARCH_PATH)/gfx/state_tracker.c \ + $(RARCH_PATH)/input/null.c \ + $(RARCH_PATH)/screenshot.c \ + $(RARCH_PATH)/conf/config_file.c \ + $(RARCH_PATH)/autosave.c \ + $(RARCH_PATH)/thread.c \ + main.c + +LOCAL_CFLAGS = -marm -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_GLSL -DHAVE_ZLIB -DHAVE_RARCH_MAIN_WRAP -DINLINE=inline -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 + +LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl -lz +LOCAL_STATIC_LIBRARIES := android_native_app_glue + +include $(BUILD_SHARED_LIBRARY) + +$(call import-module,android/native_app_glue) diff --git a/android/native/jni/Application.mk b/android/native/jni/Application.mk new file mode 100644 index 0000000000..22d188e595 --- /dev/null +++ b/android/native/jni/Application.mk @@ -0,0 +1 @@ +APP_PLATFORM := android-9 diff --git a/android/jni/main.c b/android/native/jni/main.c similarity index 99% rename from android/jni/main.c rename to android/native/jni/main.c index 75391de305..1bcbba0077 100644 --- a/android/jni/main.c +++ b/android/native/jni/main.c @@ -25,7 +25,7 @@ #include #include -#include "../../general.h" +#include "../../../general.h" JNIEXPORT jint JNICALL JNI_OnLoad( JavaVM *vm, void *pvt) { diff --git a/android/native/res/drawable-hdpi/ic_launcher.png b/android/native/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d75e77d2517c88bb8da13c6aee30b86b4b896941 GIT binary patch literal 2569 zcmV+k3ikDhP)I&|pJG0Z>@I)K~l4iN-l1AuV=3|oYisNB@bK{GiKywmoit4`M}AWGQa@SCJFzG$ zE2{(W6cM#C#y%-3DwJw2&O+gjeYy}!DKS=L?kiB-pk9&TYK?^{r&npQSurJ3k!elOI7aM2L+!$ ze_l}#xv>!rhl2-T1OQ2rGL|o2{*T7S#>N{rZrHD#yXD9a+oigQl9Cdyzi%L@si_gw z$VojlAICErZ{56k(|$a&(SGpY!B0&l({n^5`79!~w6s*QZ*_GwTrO8gz&?oM)U|-; zdFu7Q6F^2E4gB+->^bx8FCXdG*K9Tq%Hf2BD6gUYl8oHk+!_E+5>cn37IXtDG7wSV zQOsymf5}#>wF5xc0PFeGVzC5F{6OG1PH`2^zccVWe^ref00<5awns!nsLp2~f>bp~ z6h*}VeK}76GGQm8_FfvZ5Wq-Zy3YYvbMoX#gih|?-)6Ik>FMdK7-JU#A?U=36HhDM zPhQWVzP^4AW9(f3pZol3XP@Y_XY}aN>*{cR$Oxj~;Nb3xrVj)`xXZaS#@199h8)V+r3)BpQ=VqzjZ9uGVo4NY-}uusCdXq4PP{2eNz5mMaHGKWb}zzQgCqaK*Sja zRca`~eybh;k{DxI06GE0IvfsIhY>+3zvvF#jImh&L;xAru3ZDZJ;b$`+QXMETlUzJ zB}+aO1ObN*9fEap)37tC1q&9i4I4Hb69fTg&z{B2%#Vk@SXIO2nFp}?>VfVbN$Tx> zZ2UcD&6)*+!GNx=F689opdtO(pch@Ul1F)YIl{uidbU#*mrYS@+nIfiHacGE{t^A~ zwmSx_izZK=3{e!p^E^UALNIC4qz4)^H8mAcQBe>@5uzv}F)(@(~ZPIkLoxS0Xw6wHN0E>y}k|t5iaXbEz=-Q5Y_ zBZ{`RHfA&t()A@51##qlretUa6 z#%$}n|9QM6BkO#Yg#Vw*-xmV17si+cz%HlL85|T81e3`m96o&b$zOWj5S7}`yu1?m z`T3Us>>Vgl45k(aF!kusqc3mm_#v<2kg;jgrdmmo9PRDx6dxb|4UXg15z%qY2=Yg` zUi}C_abjX(TGIQjer zM2v`J-z5PE3D3Br*tVmi!>@H(kRzb`lt=a10L;DTt9dQP7)xM`RWZh{`z}X8LBS-o zuwPSC0{}BLQXsS4ZdW}k$jr=y*XzB|YpzYc6JYHKYHx2ZUa(-n*p!9VgoK2Igp`HW z*perTR81&3IT-*Nw2IpC@$ufu9ObYbmT$+Lg9)K=k3}cU{3tddIXT%}Sy{Q8F*aEf zAH*0-I&$R5m2G#j73Iw~2`j&~1#xk4XlZG|`0?YBl9IBG=lRtd`kjy{lUXX0EuXOFRfZTkn3=} z-I8WLXrK-9=H_M$#t9Cw$yqx(I#k_;U}gbt@&`gtqwmX6MTnvZ0M3V8P4EVTLA8?R zT0#&S8v2DM1QF36v$C>UxZh6bCkx*@6&V>BUj&+^YG7)PprD{nUUmLVF^C*Ea6ksI zOUqIt7C<3@)Lu0W58yulHWHD2I25Ifv0MNz0*FNS#|zEAIqoK++My(f0}uqjgYGX= zT>xCs(a}AJfChtMgwyGi0o)!=mAlz&j^a3OB!CbASKHd!K6klXUC^OJhYlS&bm-8b fLx&C>!yf+w)Ps_T>-oC!00000NkvXXu0mjfK(@ad literal 0 HcmV?d00001 diff --git a/android/native/res/drawable-ldpi/ic_launcher.png b/android/native/res/drawable-ldpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..320c2a408e10e5b521e8ba4b63fdf97523ae58c5 GIT binary patch literal 938 zcmV;b16BNqP)zHRKdG|0;w+VF_eVWS`!6$}#*6PX}P8A60eLRt`X8FpDo`Kv`? zMEwyfC}R>af3y*(sLUHWf=I0;MYz;{EUm=dw4JXXb;82S=JxYEzuxbB@AG}{?R(z? z2oNAZfPjBMB2}c6CX9@XoB#lwPUj$meB44`)!W-!A(2Q>TwL5n2noj3a*xMz82|@> z8yp;bzm8W_ET~&S${q^G#Ap6;7wKespxShEgit=w8W28{u%+aOrbpCjcD2-ZG$EE{Uz*M44`bSgy8*x+ z{A2|1JSu}Yj^lVaJw4qo5{ZHUQYocJOKt5>0YEC1CjQS``^{ppG!jBO>gwvy+S=-0 z@9c<+no?R^YRl*cfaAg2?~;;|ithew@NTF6PSShw<>h7Plbsj$06=fmml8rqe^fOD z;0G_rWHMQ0Wo6!WA4GL^wVGj=we|Kr>Y`p7z5Dc3Hp{Xj{Q63Y6>a;6Hzc<0AI6mw z>)&-&R@QL4^lWw{nUO^5WnSybUsW)YgWk@dpm_xqDuzSiW%!wS=mM<0@tlfMC&h}s}R$O?di zb8~b1@D*?3VUS9ts#2@f6EO`}N+~lxKkr;zT-27u^5C9 zUKinT7!1Rpv$NCGEDs8=&HGoLdIqs27#{_*rJA>`U- zB$vyjhX)4$K&eztDin%W09IoT^T5DBEdUCDmXwrm-QC^pg@uJfTk*VJ?;(f7;VvvJ zURobT3*3XqLbk2z)7_r!3YcLb};awo$rQ)e5cki9tz4!Eo$9cyK`0^vu?Vj!3 z?!MpW`99C*eSW@QAVLv}P=q2h2_h{_%)H5JwQjq9{W>H`LR3@~va_=*h-m3#4PfTS z`}+ER@9OG`76bu)zaM#ddF?u#u0RyUfjh}dT9nvqw#}Y)uWIb^H{CV&2wakqo0F-Kx z7eZV~%p5)RgfgY3rrsPbXfl~JdvGi=nM|rP{`pk_fSn<>i6OR4QvqP+IFHBUZ*Fdu z&zw0U_xAS6ilY2A#ALBpREqyB_!ds5vvF{6kiA~7pP4hY8m%bG;laT{RuqMI@812y z@cpYb0sx2s+n$nT+1J$6BsVrT%2un@#mpat<$%ZI`Kjb+TG%0%7AMSR=J$wbdqzfv zZ^rxcV6)labUKk*?gRilUlp{O_T<%90?5#iw9AW%ik=nMw%=NK^!8rghl%ibJbdWT zcSJ;=Ftc#&+O?`>zvbR$vIEZ@+qjXLe=`phpHMqu*DI43x2+kPJe8@uET7m6$`)MpeApjkKV92(#w5SfS+wI{Yq|@nC zOs#Jc0Q3QXD2fUZIf&>o5jD=8JJ&iwEVD)czTx_2&6-63-X)^`fQ}nO4$I2QQXOD0 z7{bfwNB}Z3GeJaqLtK9%z%OpuvLzF>qxnUat=a5E~misA>?B6dJcZDJdxrWqlT?c(c`3)jaaK_{+Lap9TPP z4#AKZUZHQa`f>FS#>20Rh{+A#Gb9QquCOEkC<1_mw)KSo%13(x@$vBhpacPkqPQPG zNhs4Wub6|zk3k9ZM}PS-xdLKxwZ&L{{n))RBO?Pu)DhYTRJAxJCgy*eZ<3Od#@tth z&`4BQSBHUtfo`MG*wWF_VZ56F0=kdtbUGY4azwi0FvrZV6jxZj8IO{z>K9O6UJfF{ z)~#F7^u+h$GICE|JrWZW(b?IFcm956T(X-JenDYjA!(k4MxqrfR={jF!(=j{w6t_w zvRAexAw4}EX0sV{=FGu`58@{5tqIRELD$m)-gkJwDk$-Jg<#7jU1`eF?zt_p1O1){hmwUjT$Q zvY|c@=WsY0&YnG+nVg)A=H_PX;y3OYgWKN{xw^WVTrL+BML|J9!D~dcFPOwcbQM5w zZgo1HzwSDYCHD$|O`A4Rc6PQ%M1D;<;Pd$|-b*1P%Q65=)11V5yPKJAu5%g; zhJKgJg`Aw6!$h=3b0Z@nFM#9_K>fuP2V+Bd%F4<>L@85nGxzq+3Vaq;Ccn%<>ao;# zgTXL3;Xc63iGe4swYAlxstoPzVCI6!0`Pjh%T;H0oq=AjuL`ljIIdAbQItI^SFU`u zsi}!1NkYQrOBm&1%Qsm7k|e1<^>RNEP+Vatytp~O&+T@js;Uai9799{cgz81*4yp& zn=ds!rc$;}zZd!W`2c|A4osgu9g7w%;*{+JD!ZzeTv$#- z`?Yw$+}qo$o<83-qQqA6B!E-5(uCxxs4zt2U}iBtKi>erTUlA@U3F^SNTt0HzGUVI}uI(jA%-TW^RF!RdV+S+g1+S-EGJIj_W zyAm54J9DH_V$=pCiXw`Nih`ejCr+HWtKE0Of(60fcUyOaA{3zrX{Ubyi(`A7(HW`O P00000NkvXXu0mjfmtHtx literal 0 HcmV?d00001 diff --git a/android/native/res/drawable-xhdpi/ic_launcher.png b/android/native/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..c7009bd2ccf9733c4c0d98848cd6e299e83b8db4 GIT binary patch literal 3139 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 literal 0 HcmV?d00001 diff --git a/android/native/res/values/strings.xml b/android/native/res/values/strings.xml new file mode 100644 index 0000000000..d8f551374e --- /dev/null +++ b/android/native/res/values/strings.xml @@ -0,0 +1,4 @@ + + + NativeActivity + diff --git a/android/phoenix/.classpath b/android/phoenix/.classpath new file mode 100644 index 0000000000..3f9691c5dd --- /dev/null +++ b/android/phoenix/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/android/.project b/android/phoenix/.project similarity index 100% rename from android/.project rename to android/phoenix/.project diff --git a/android/.settings/org.eclipse.jdt.core.prefs b/android/phoenix/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from android/.settings/org.eclipse.jdt.core.prefs rename to android/phoenix/.settings/org.eclipse.jdt.core.prefs diff --git a/android/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml similarity index 73% rename from android/AndroidManifest.xml rename to android/phoenix/AndroidManifest.xml index 425f321e6a..96cd13eff3 100644 --- a/android/AndroidManifest.xml +++ b/android/phoenix/AndroidManifest.xml @@ -4,11 +4,11 @@ android:versionCode="1" android:versionName="1.0" > - + + android:label="@string/app_name"> @@ -18,7 +18,12 @@ - + + diff --git a/android/project.properties b/android/phoenix/project.properties similarity index 100% rename from android/project.properties rename to android/phoenix/project.properties diff --git a/android/res/drawable-hdpi/ic_action_close.png b/android/phoenix/res/drawable-hdpi/ic_action_close.png similarity index 100% rename from android/res/drawable-hdpi/ic_action_close.png rename to android/phoenix/res/drawable-hdpi/ic_action_close.png diff --git a/android/res/drawable-hdpi/ic_action_history.png b/android/phoenix/res/drawable-hdpi/ic_action_history.png similarity index 100% rename from android/res/drawable-hdpi/ic_action_history.png rename to android/phoenix/res/drawable-hdpi/ic_action_history.png diff --git a/android/res/drawable-hdpi/ic_action_load.png b/android/phoenix/res/drawable-hdpi/ic_action_load.png similarity index 100% rename from android/res/drawable-hdpi/ic_action_load.png rename to android/phoenix/res/drawable-hdpi/ic_action_load.png diff --git a/android/res/drawable-hdpi/ic_action_main.png b/android/phoenix/res/drawable-hdpi/ic_action_main.png similarity index 100% rename from android/res/drawable-hdpi/ic_action_main.png rename to android/phoenix/res/drawable-hdpi/ic_action_main.png diff --git a/android/res/drawable-hdpi/ic_action_open.png b/android/phoenix/res/drawable-hdpi/ic_action_open.png similarity index 100% rename from android/res/drawable-hdpi/ic_action_open.png rename to android/phoenix/res/drawable-hdpi/ic_action_open.png diff --git a/android/res/drawable-hdpi/ic_action_save.png b/android/phoenix/res/drawable-hdpi/ic_action_save.png similarity index 100% rename from android/res/drawable-hdpi/ic_action_save.png rename to android/phoenix/res/drawable-hdpi/ic_action_save.png diff --git a/android/res/drawable-hdpi/ic_action_settings.png b/android/phoenix/res/drawable-hdpi/ic_action_settings.png similarity index 100% rename from android/res/drawable-hdpi/ic_action_settings.png rename to android/phoenix/res/drawable-hdpi/ic_action_settings.png diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/phoenix/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from android/res/drawable-hdpi/ic_launcher.png rename to android/phoenix/res/drawable-hdpi/ic_launcher.png diff --git a/android/res/drawable-ldpi/ic_action_close.png b/android/phoenix/res/drawable-ldpi/ic_action_close.png similarity index 100% rename from android/res/drawable-ldpi/ic_action_close.png rename to android/phoenix/res/drawable-ldpi/ic_action_close.png diff --git a/android/res/drawable-ldpi/ic_action_history.png b/android/phoenix/res/drawable-ldpi/ic_action_history.png similarity index 100% rename from android/res/drawable-ldpi/ic_action_history.png rename to android/phoenix/res/drawable-ldpi/ic_action_history.png diff --git a/android/res/drawable-ldpi/ic_action_load.png b/android/phoenix/res/drawable-ldpi/ic_action_load.png similarity index 100% rename from android/res/drawable-ldpi/ic_action_load.png rename to android/phoenix/res/drawable-ldpi/ic_action_load.png diff --git a/android/res/drawable-ldpi/ic_action_main.png b/android/phoenix/res/drawable-ldpi/ic_action_main.png similarity index 100% rename from android/res/drawable-ldpi/ic_action_main.png rename to android/phoenix/res/drawable-ldpi/ic_action_main.png diff --git a/android/res/drawable-ldpi/ic_action_open.png b/android/phoenix/res/drawable-ldpi/ic_action_open.png similarity index 100% rename from android/res/drawable-ldpi/ic_action_open.png rename to android/phoenix/res/drawable-ldpi/ic_action_open.png diff --git a/android/res/drawable-ldpi/ic_action_save.png b/android/phoenix/res/drawable-ldpi/ic_action_save.png similarity index 100% rename from android/res/drawable-ldpi/ic_action_save.png rename to android/phoenix/res/drawable-ldpi/ic_action_save.png diff --git a/android/res/drawable-ldpi/ic_action_settings.png b/android/phoenix/res/drawable-ldpi/ic_action_settings.png similarity index 100% rename from android/res/drawable-ldpi/ic_action_settings.png rename to android/phoenix/res/drawable-ldpi/ic_action_settings.png diff --git a/android/res/drawable-ldpi/ic_launcher.png b/android/phoenix/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from android/res/drawable-ldpi/ic_launcher.png rename to android/phoenix/res/drawable-ldpi/ic_launcher.png diff --git a/android/res/drawable-mdpi/ic_action_close.png b/android/phoenix/res/drawable-mdpi/ic_action_close.png similarity index 100% rename from android/res/drawable-mdpi/ic_action_close.png rename to android/phoenix/res/drawable-mdpi/ic_action_close.png diff --git a/android/res/drawable-mdpi/ic_action_history.png b/android/phoenix/res/drawable-mdpi/ic_action_history.png similarity index 100% rename from android/res/drawable-mdpi/ic_action_history.png rename to android/phoenix/res/drawable-mdpi/ic_action_history.png diff --git a/android/res/drawable-mdpi/ic_action_load.png b/android/phoenix/res/drawable-mdpi/ic_action_load.png similarity index 100% rename from android/res/drawable-mdpi/ic_action_load.png rename to android/phoenix/res/drawable-mdpi/ic_action_load.png diff --git a/android/res/drawable-mdpi/ic_action_main.png b/android/phoenix/res/drawable-mdpi/ic_action_main.png similarity index 100% rename from android/res/drawable-mdpi/ic_action_main.png rename to android/phoenix/res/drawable-mdpi/ic_action_main.png diff --git a/android/res/drawable-mdpi/ic_action_open.png b/android/phoenix/res/drawable-mdpi/ic_action_open.png similarity index 100% rename from android/res/drawable-mdpi/ic_action_open.png rename to android/phoenix/res/drawable-mdpi/ic_action_open.png diff --git a/android/res/drawable-mdpi/ic_action_save.png b/android/phoenix/res/drawable-mdpi/ic_action_save.png similarity index 100% rename from android/res/drawable-mdpi/ic_action_save.png rename to android/phoenix/res/drawable-mdpi/ic_action_save.png diff --git a/android/res/drawable-mdpi/ic_action_settings.png b/android/phoenix/res/drawable-mdpi/ic_action_settings.png similarity index 100% rename from android/res/drawable-mdpi/ic_action_settings.png rename to android/phoenix/res/drawable-mdpi/ic_action_settings.png diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/phoenix/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from android/res/drawable-mdpi/ic_launcher.png rename to android/phoenix/res/drawable-mdpi/ic_launcher.png diff --git a/android/res/drawable-xhdpi/ic_action_close.png b/android/phoenix/res/drawable-xhdpi/ic_action_close.png similarity index 100% rename from android/res/drawable-xhdpi/ic_action_close.png rename to android/phoenix/res/drawable-xhdpi/ic_action_close.png diff --git a/android/res/drawable-xhdpi/ic_action_history.png b/android/phoenix/res/drawable-xhdpi/ic_action_history.png similarity index 100% rename from android/res/drawable-xhdpi/ic_action_history.png rename to android/phoenix/res/drawable-xhdpi/ic_action_history.png diff --git a/android/res/drawable-xhdpi/ic_action_load.png b/android/phoenix/res/drawable-xhdpi/ic_action_load.png similarity index 100% rename from android/res/drawable-xhdpi/ic_action_load.png rename to android/phoenix/res/drawable-xhdpi/ic_action_load.png diff --git a/android/res/drawable-xhdpi/ic_action_main.png b/android/phoenix/res/drawable-xhdpi/ic_action_main.png similarity index 100% rename from android/res/drawable-xhdpi/ic_action_main.png rename to android/phoenix/res/drawable-xhdpi/ic_action_main.png diff --git a/android/res/drawable-xhdpi/ic_action_open.png b/android/phoenix/res/drawable-xhdpi/ic_action_open.png similarity index 100% rename from android/res/drawable-xhdpi/ic_action_open.png rename to android/phoenix/res/drawable-xhdpi/ic_action_open.png diff --git a/android/res/drawable-xhdpi/ic_action_save.png b/android/phoenix/res/drawable-xhdpi/ic_action_save.png similarity index 100% rename from android/res/drawable-xhdpi/ic_action_save.png rename to android/phoenix/res/drawable-xhdpi/ic_action_save.png diff --git a/android/res/drawable-xhdpi/ic_action_settings.png b/android/phoenix/res/drawable-xhdpi/ic_action_settings.png similarity index 100% rename from android/res/drawable-xhdpi/ic_action_settings.png rename to android/phoenix/res/drawable-xhdpi/ic_action_settings.png diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/phoenix/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from android/res/drawable-xhdpi/ic_launcher.png rename to android/phoenix/res/drawable-xhdpi/ic_launcher.png diff --git a/android/res/layout/file_choose.xml b/android/phoenix/res/layout/file_choose.xml similarity index 100% rename from android/res/layout/file_choose.xml rename to android/phoenix/res/layout/file_choose.xml diff --git a/android/res/layout/file_view.xml b/android/phoenix/res/layout/file_view.xml similarity index 100% rename from android/res/layout/file_view.xml rename to android/phoenix/res/layout/file_view.xml diff --git a/android/res/layout/main.xml b/android/phoenix/res/layout/main.xml similarity index 100% rename from android/res/layout/main.xml rename to android/phoenix/res/layout/main.xml diff --git a/android/res/layout/rombrowser.xml b/android/phoenix/res/layout/rombrowser.xml similarity index 100% rename from android/res/layout/rombrowser.xml rename to android/phoenix/res/layout/rombrowser.xml diff --git a/android/res/menu/main_menu.xml b/android/phoenix/res/menu/main_menu.xml similarity index 100% rename from android/res/menu/main_menu.xml rename to android/phoenix/res/menu/main_menu.xml diff --git a/android/res/raw/retroarch.cfg b/android/phoenix/res/raw/retroarch.cfg similarity index 100% rename from android/res/raw/retroarch.cfg rename to android/phoenix/res/raw/retroarch.cfg diff --git a/android/res/values/strings.xml b/android/phoenix/res/values/strings.xml similarity index 100% rename from android/res/values/strings.xml rename to android/phoenix/res/values/strings.xml diff --git a/android/src/com/retroarch/fileio/FileArrayAdapter.java b/android/phoenix/src/com/retroarch/fileio/FileArrayAdapter.java similarity index 100% rename from android/src/com/retroarch/fileio/FileArrayAdapter.java rename to android/phoenix/src/com/retroarch/fileio/FileArrayAdapter.java diff --git a/android/src/com/retroarch/fileio/FileChooser.java b/android/phoenix/src/com/retroarch/fileio/FileChooser.java similarity index 100% rename from android/src/com/retroarch/fileio/FileChooser.java rename to android/phoenix/src/com/retroarch/fileio/FileChooser.java diff --git a/android/src/com/retroarch/fileio/Option.java b/android/phoenix/src/com/retroarch/fileio/Option.java similarity index 100% rename from android/src/com/retroarch/fileio/Option.java rename to android/phoenix/src/com/retroarch/fileio/Option.java diff --git a/android/src/com/retroarch/main.java b/android/phoenix/src/com/retroarch/main.java similarity index 96% rename from android/src/com/retroarch/main.java rename to android/phoenix/src/com/retroarch/main.java index 7a8794fa9a..0970810f9a 100644 --- a/android/src/com/retroarch/main.java +++ b/android/phoenix/src/com/retroarch/main.java @@ -71,6 +71,10 @@ public class main extends Activity if(requestCode == ACTIVITY_LOAD_ROM) { /* + Intent myIntent = new Intent(this, NativeActivity.class); + startActivity(myIntent); + */ + /* rruntime.settings_set_defaults(); rruntime.load_game(data.getStringExtra("PATH"), 0); diff --git a/android/proguard-project.txt b/android/proguard-project.txt deleted file mode 100644 index f2fe1559a2..0000000000 --- a/android/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#}