From b1c2c0f2cec77ee1a0beb72c1f49b805ade940dc Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Mon, 29 Aug 2011 18:17:00 +0300
Subject: [PATCH] Added PUAE makefiles, it fails to link though

---
 .../application/puae/AndroidAppSettings.cfg   |   41 +
 project/jni/application/puae/AndroidBuild.sh  |   18 +
 .../jni/application/puae/AndroidData/data.zip |  Bin 0 -> 171 bytes
 project/jni/application/puae/PUAE             |    1 +
 project/jni/application/puae/icon.png         |  Bin 0 -> 8926 bytes
 project/jni/application/puae/puae.diff        | 1160 +++++++++++++++++
 project/jni/application/puae/readme.txt       |    4 +
 7 files changed, 1224 insertions(+)
 create mode 100644 project/jni/application/puae/AndroidAppSettings.cfg
 create mode 100755 project/jni/application/puae/AndroidBuild.sh
 create mode 100644 project/jni/application/puae/AndroidData/data.zip
 create mode 120000 project/jni/application/puae/PUAE
 create mode 100644 project/jni/application/puae/icon.png
 create mode 100644 project/jni/application/puae/puae.diff
 create mode 100644 project/jni/application/puae/readme.txt

diff --git a/project/jni/application/puae/AndroidAppSettings.cfg b/project/jni/application/puae/AndroidAppSettings.cfg
new file mode 100644
index 000000000..aa225e9ee
--- /dev/null
+++ b/project/jni/application/puae/AndroidAppSettings.cfg
@@ -0,0 +1,41 @@
+# The application settings for Android libSDL port
+AppSettingVersion=17
+LibSdlVersion=1.2
+AppName="PUAE"
+AppFullName=gnostic.puae.sdl
+ScreenOrientation=h
+InhibitSuspend=n
+AppDataDownloadUrl="Data|data.zip"
+VideoDepthBpp=16
+NeedDepthBuffer=n
+NeedStencilBuffer=n
+NeedGles2=n
+SwVideoMode=y
+SdlVideoResize=y
+SdlVideoResizeKeepAspect=n
+CompatibilityHacks=n
+AppUsesMouse=n
+AppNeedsTwoButtonMouse=n
+AppNeedsArrowKeys=y
+AppNeedsTextInput=y
+AppUsesJoystick=n
+AppHandlesJoystickSensitivity=y
+AppUsesMultitouch=n
+NonBlockingSwapBuffers=n
+RedefinedKeys="F6 RETURN F4 F3 F1 ESCAPE F6 F3 F4 F2 F6"
+AppTouchscreenKeyboardKeysAmount=6
+AppTouchscreenKeyboardKeysAmountAutoFire=2
+RedefinedKeysScreenKb="F6 F1 RETURN F4 F3 F2"
+StartupMenuButtonTimeout=3000
+HiddenMenuOptions='OptionalDownloadConfig'
+FirstStartMenuOptions=''
+MultiABI=n
+AppVersionCode=23301
+AppVersionName="2.3.3.01"
+CompiledLibraries="jpeg png freetype sdl_image"
+CustomBuildScript=n
+AppCflags='-DHAVE_CONFIG_H -D_GNU_SOURCE=1 -D_REENTRANT -DCPUEMU_0 -DCPUEMU_11 -DCPUEMU_12 -DCPUEMU_20 -DCPUEMU_21 -DCPUEMU_31 -DMMU -DFPUEMU -DAGA -DAUTOCONFIG -DFILESYS -DBSDSOCKET -DSUPPORT_THREADS -DUSE_SDL -DFDI2RAW -DDEBUGGER -DSAVESTATE -DENFORCER -DACTION_REPLAY -DXARCADE -DDRIVESOUND -DREGPARAM '
+AppLdflags=''
+AppSubdirsBuild='PUAE/src PUAE/src/include'
+AppCmdline=''
+ReadmeText='^You may press "Home" now - the data will be downloaded in background'
diff --git a/project/jni/application/puae/AndroidBuild.sh b/project/jni/application/puae/AndroidBuild.sh
new file mode 100755
index 000000000..30d9d3394
--- /dev/null
+++ b/project/jni/application/puae/AndroidBuild.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+
+LOCAL_PATH=`dirname $0`
+LOCAL_PATH=`cd $LOCAL_PATH && pwd`
+
+ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so
+ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libpthread.so
+
+if [ \! -f PUAE/configure ] ; then
+	sh -c "cd PUAE && ./bootstrap.sh"
+fi
+
+if [ \! -f PUAE/Makefile ] ; then
+	../setEnvironment.sh sh -c "cd PUAE && env SDL_CONFIG=$LOCAL_PATH/../sdl-config ./configure --build=x86_64-unknown-linux-gnu --host=arm-linux-androideabi --with-sdl --with-sdl-sound --with-sdl-gfx --with-sdl-gui --disable-gtktest"
+fi
+
+make -C PUAE -j4 && mv -f PUAE/puae libapplication.so
diff --git a/project/jni/application/puae/AndroidData/data.zip b/project/jni/application/puae/AndroidData/data.zip
new file mode 100644
index 0000000000000000000000000000000000000000..eecc7bb465be88226795302efcfcf223c75bf9c9
GIT binary patch
literal 171
zcmWIWW@h1H00HlkPTR?B*Nqq%7#Kj9i$R8=C^a!9H&w5sq9inglY#l&3kKg;FBp7F
zE4UdLSza(RFn|fJ0B=SnIc8kONPtWS8@Z$r#6&if6=EowfdSsEY#^1442%o`3=9me
HAPxfnqtYMl

literal 0
HcmV?d00001

diff --git a/project/jni/application/puae/PUAE b/project/jni/application/puae/PUAE
new file mode 120000
index 000000000..8ffbaf1e2
--- /dev/null
+++ b/project/jni/application/puae/PUAE
@@ -0,0 +1 @@
+../../../../../PUAE/
\ No newline at end of file
diff --git a/project/jni/application/puae/icon.png b/project/jni/application/puae/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ce066348ea2d42430ec4912bb4922cbd7c40e62
GIT binary patch
literal 8926
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

literal 0
HcmV?d00001

diff --git a/project/jni/application/puae/puae.diff b/project/jni/application/puae/puae.diff
new file mode 100644
index 000000000..dfd22adaf
--- /dev/null
+++ b/project/jni/application/puae/puae.diff
@@ -0,0 +1,1160 @@
+diff --git a/config.sub b/config.sub
+index 824ef27..cda5219 100755
+--- a/config.sub
++++ b/config.sub
+@@ -1142,7 +1142,7 @@ case $os in
+ 	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+ 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -udi* | -eabi* | -androideabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3740b04..3756e00 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -133,7 +133,7 @@ noinst_HEADERS = \
+ 	include/hrtimer.h	include/identify.h	\
+ 	include/inputdevice.h	include/joystick.h	\
+ 	include/keyboard.h	include/keybuf.h	\
+-	include/memory.h	\
++	include/uae_memory.h	\
+ 	include/native2amiga.h	include/newcpu.h	\
+ 	include/noflags.h	include/options.h	\
+ 	include/osemu.h		include/picasso96.h	\
+diff --git a/src/a2065.c b/src/a2065.c
+index d06500f..3384d93 100755
+--- a/src/a2065.c
++++ b/src/a2065.c
+@@ -12,7 +12,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "a2065.h"
+diff --git a/src/a2091.c b/src/a2091.c
+index 61d0d0e..19105ee 100755
+--- a/src/a2091.c
++++ b/src/a2091.c
+@@ -17,7 +17,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "rommgr.h"
+ #include "custom.h"
+ #include "newcpu.h"
+diff --git a/src/akiko.c b/src/akiko.c
+index 5331621..9e74808 100644
+--- a/src/akiko.c
++++ b/src/akiko.c
+@@ -15,7 +15,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "events.h"
+ #include "savestate.h"
+ #include "blkdev.h"
+diff --git a/src/amax.c b/src/amax.c
+index dfb0d3f..3095163 100755
+--- a/src/amax.c
++++ b/src/amax.c
+@@ -7,7 +7,7 @@
+ #include "zfile.h"
+ #include "amax.h"
+ #include "custom.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "newcpu.h"
+ 
+ static int data_scramble[8] = { 3, 2, 4, 5, 7, 6, 0, 1 };
+diff --git a/src/ar.c b/src/ar.c
+index 44b51bd..fddeecd 100644
+--- a/src/ar.c
++++ b/src/ar.c
+@@ -201,7 +201,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "rommgr.h"
+ #include "custom.h"
+ #include "newcpu.h"
+diff --git a/src/arcadia.c b/src/arcadia.c
+index 45771f4..de5364c 100755
+--- a/src/arcadia.c
++++ b/src/arcadia.c
+@@ -14,7 +14,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "rommgr.h"
+ #include "custom.h"
+ #include "newcpu.h"
+diff --git a/src/archivers/xfd/xfd.c b/src/archivers/xfd/xfd.c
+index f56d5f2..a1d3af4 100755
+--- a/src/archivers/xfd/xfd.c
++++ b/src/archivers/xfd/xfd.c
+@@ -20,7 +20,7 @@
+ #include "fsdb.h"
+ #include "uae.h"
+ #include "custom.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "newcpu.h"
+ 
+ #include "cpu_small.h"
+diff --git a/src/audio.c b/src/audio.c
+index cacac91..8f535e9 100644
+--- a/src/audio.c
++++ b/src/audio.c
+@@ -16,7 +16,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "autoconf.h"
+diff --git a/src/autoconf.c b/src/autoconf.c
+index 3110f8f..9729890 100644
+--- a/src/autoconf.c
++++ b/src/autoconf.c
+@@ -12,7 +12,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "events.h"
+ #include "newcpu.h"
+diff --git a/src/blitter.c b/src/blitter.c
+index 7b57e47..a11c0d2 100644
+--- a/src/blitter.c
++++ b/src/blitter.c
+@@ -19,7 +19,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "events.h"
+ #include "newcpu.h"
+diff --git a/src/blkdev-libscg.c b/src/blkdev-libscg.c
+index dd22160..a6237bf 100644
+--- a/src/blkdev-libscg.c
++++ b/src/blkdev-libscg.c
+@@ -15,7 +15,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "threaddep/thread.h"
+ #include "blkdev.h"
+ #include "scsidev.h"
+diff --git a/src/blkdev.c b/src/blkdev.c
+index 4b7d222..6e117cf 100644
+--- a/src/blkdev.c
++++ b/src/blkdev.c
+@@ -10,7 +10,7 @@
+ #include "sysconfig.h"
+ #include "sysdeps.h"
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ 
+ #include "blkdev.h"
+ #include "scsidev.h"
+diff --git a/src/bsdsocket-posix-new.c b/src/bsdsocket-posix-new.c
+index d5a2782..087828d 100644
+--- a/src/bsdsocket-posix-new.c
++++ b/src/bsdsocket-posix-new.c
+@@ -27,7 +27,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "autoconf.h"
+@@ -60,6 +60,9 @@
+ #endif
+ 
+ #define WAITSIGNAL	waitsig (context, sb)
++#ifdef ANDROID
++#define IPPROTO_ENCAP 98
++#endif
+ 
+ /* Sigqueue is unsafe on SMP machines.
+  * Temporary work-around.
+diff --git a/src/bsdsocket.c b/src/bsdsocket.c
+index 7b07927..741425b 100644
+--- a/src/bsdsocket.c
++++ b/src/bsdsocket.c
+@@ -15,7 +15,7 @@
+ #include <stddef.h>
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "autoconf.h"
+diff --git a/src/catweasel.c b/src/catweasel.c
+index e4fa65c..e38429e 100644
+--- a/src/catweasel.c
++++ b/src/catweasel.c
+@@ -17,7 +17,7 @@
+ #ifdef CATWEASEL
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "ioport.h"
+ #include "catweasel.h"
+ #include "uae.h"
+diff --git a/src/cd32_fmv.c b/src/cd32_fmv.c
+index 5b70d43..31d86ff 100755
+--- a/src/cd32_fmv.c
++++ b/src/cd32_fmv.c
+@@ -11,7 +11,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "rommgr.h"
+ #include "custom.h"
+ #include "newcpu.h"
+diff --git a/src/cdtv.c b/src/cdtv.c
+index 452b8b0..fdf5e0b 100755
+--- a/src/cdtv.c
++++ b/src/cdtv.c
+@@ -21,7 +21,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "debug.h"
+diff --git a/src/cfgfile.c b/src/cfgfile.c
+index 174408a..3ca6f16 100644
+--- a/src/cfgfile.c
++++ b/src/cfgfile.c
+@@ -25,7 +25,7 @@
+ #include "gfxdep/gfx.h"
+ #include "sounddep/sound.h"
+ #include "savestate.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "rommgr.h"
+ #include "gui.h"
+ #include "newcpu.h"
+diff --git a/src/cia.c b/src/cia.c
+index c3a2f44..2a04770 100644
+--- a/src/cia.c
++++ b/src/cia.c
+@@ -14,7 +14,7 @@
+ 
+ #include "options.h"
+ #include "events.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "cia.h"
+diff --git a/src/clipboard.c b/src/clipboard.c
+index 780508d..f09d30f 100644
+--- a/src/clipboard.c
++++ b/src/clipboard.c
+@@ -8,7 +8,7 @@
+ #include "clipboard.h"
+ 
+ #include "threaddep/thread.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "native2amiga_api.h"
+ 
+ int clipboard_debug;
+diff --git a/src/compemu_fpp.c b/src/compemu_fpp.c
+index 88c6977..e9399cb 100644
+--- a/src/compemu_fpp.c
++++ b/src/compemu_fpp.c
+@@ -14,7 +14,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "ersatz.h"
+diff --git a/src/compemu_support.c b/src/compemu_support.c
+index d0cf233..4b8e8ff 100644
+--- a/src/compemu_support.c
++++ b/src/compemu_support.c
+@@ -10,7 +10,7 @@
+ 
+ #include "options.h"
+ #include "events.h"
+-#include "include/memory.h"
++#include "include/uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "comptbl.h"
+diff --git a/src/compemu_support_codegen.c b/src/compemu_support_codegen.c
+index 64e83b1..d8259f9 100755
+--- a/src/compemu_support_codegen.c
++++ b/src/compemu_support_codegen.c
+@@ -71,7 +71,7 @@
+ 
+ //#include "machdep/m68k.h"
+ #include "custom.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ //#include "readcpu.h"
+ #include "newcpu.h"
+ #include "comptbl.h"
+diff --git a/src/consolehook.c b/src/consolehook.c
+index eebc1d0..7b425c2 100755
+--- a/src/consolehook.c
++++ b/src/consolehook.c
+@@ -4,7 +4,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "execlib.h"
+ #include "disk.h"
+ #include "rommgr.h"
+diff --git a/src/cpummu.c b/src/cpummu.c
+index 87a37bb..d2b1199 100755
+--- a/src/cpummu.c
++++ b/src/cpummu.c
+@@ -30,7 +30,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "newcpu.h"
+ #include "debug.h"
+ #include "cpummu.h"
+diff --git a/src/custom.c b/src/custom.c
+index 63a863e..af2947f 100644
+--- a/src/custom.c
++++ b/src/custom.c
+@@ -20,7 +20,7 @@
+ #include "audio.h"
+ #include "sounddep/sound.h"
+ #include "events.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "cia.h"
+diff --git a/src/debug.c b/src/debug.c
+index cb9da70..26b2438 100644
+--- a/src/debug.c
++++ b/src/debug.c
+@@ -16,7 +16,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "cpu_prefetch.h"
+diff --git a/src/disk.c b/src/disk.c
+index a4c2f70..a3f8d39 100644
+--- a/src/disk.c
++++ b/src/disk.c
+@@ -20,7 +20,7 @@ int disk_debug_track = -1;
+ 
+ #include "uae.h"
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "events.h"
+ #include "custom.h"
+ #include "ersatz.h"
+diff --git a/src/drawing.c b/src/drawing.c
+index 4ee69b7..80bd5d3 100644
+--- a/src/drawing.c
++++ b/src/drawing.c
+@@ -37,7 +37,7 @@
+ #include "options.h"
+ #include "threaddep/thread.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "xwin.h"
+diff --git a/src/enforcer.c b/src/enforcer.c
+index 15eadce..6d223b8 100644
+--- a/src/enforcer.c
++++ b/src/enforcer.c
+@@ -14,7 +14,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "uae.h"
+diff --git a/src/ersatz.c b/src/ersatz.c
+index a1c57a5..ac0d175 100644
+--- a/src/ersatz.c
++++ b/src/ersatz.c
+@@ -12,7 +12,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "cpu_prefetch.h"
+diff --git a/src/expansion.c b/src/expansion.c
+index 864c9e8..935e6e0 100644
+--- a/src/expansion.c
++++ b/src/expansion.c
+@@ -14,7 +14,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "rommgr.h"
+ #include "autoconf.h"
+ #include "custom.h"
+diff --git a/src/filesys.c b/src/filesys.c
+index ffd51f8..00be4b5 100644
+--- a/src/filesys.c
++++ b/src/filesys.c
+@@ -28,7 +28,7 @@
+ #include "threaddep/thread.h"
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "events.h"
+ #include "newcpu.h"
+diff --git a/src/fpp.c b/src/fpp.c
+index 45be55f..32e7d1b 100644
+--- a/src/fpp.c
++++ b/src/fpp.c
+@@ -16,7 +16,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "events.h"
+ #include "newcpu.h"
+diff --git a/src/fsdb.c b/src/fsdb.c
+index f009672..7a0e43e 100644
+--- a/src/fsdb.c
++++ b/src/fsdb.c
+@@ -12,7 +12,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "filesys.h"
+diff --git a/src/fsusage.c b/src/fsusage.c
+index 09302c3..dbd88cc 100644
+--- a/src/fsusage.c
++++ b/src/fsusage.c
+@@ -367,7 +367,7 @@ int
+ 
+ #endif /* STAT_STATVFS */
+ 
+-#if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS)
++#if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS) && !defined(ANDROID)
+ 	/* !Ultrix && !SVR2 */
+ 
+ 	fsp->fsu_blocks = CONVERT_BLOCKS (fsd.f_blocks);
+diff --git a/src/gayle.c b/src/gayle.c
+index 7c0549d..a48fdad 100755
+--- a/src/gayle.c
++++ b/src/gayle.c
+@@ -17,7 +17,7 @@
+ 
+ #include "options.h"
+ 
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "filesys.h"
+diff --git a/src/genblitter.c b/src/genblitter.c
+index 1cde4e3..65032e0 100644
+--- a/src/genblitter.c
++++ b/src/genblitter.c
+@@ -40,7 +40,7 @@ static void generate_func(void)
+     printf("#include \"sysdeps.h\"\n");
+     printf("#include \"options.h\"\n");
+     printf("#include \"custom.h\"\n");
+-    printf("#include \"memory.h\"\n");
++    printf("#include \"uae_memory.h\"\n");
+     printf("#include \"blitter.h\"\n");
+     printf("#include \"blitfunc.h\"\n\n");
+ 
+@@ -219,7 +219,7 @@ static void generate_table(void)
+     printf("#include \"sysdeps.h\"\n");
+     printf("#include \"options.h\"\n");
+     printf("#include \"custom.h\"\n");
+-    printf("#include \"memory.h\"\n");
++    printf("#include \"uae_memory.h\"\n");
+     printf("#include \"blitter.h\"\n");
+     printf("#include \"blitfunc.h\"\n\n");
+     printf("blitter_func * const blitfunc_dofast[256] = {\n");
+diff --git a/src/gencomp.c b/src/gencomp.c
+index 6e5ae6e..1aa4261 100644
+--- a/src/gencomp.c
++++ b/src/gencomp.c
+@@ -2881,7 +2881,7 @@ generate_includes (FILE * f, int bigger)
+     fprintf (f, "#include \"sysdeps.h\"\n");
+ 	if (bigger)
+ 		fprintf (f, "#include \"options.h\"\n");
+-    fprintf (f, "#include \"memory.h\"\n");
++    fprintf (f, "#include \"uae_memory.h\"\n");
+     fprintf (f, "#include \"custom.h\"\n");
+     fprintf (f, "#include \"events.h\"\n");
+     fprintf (f, "#include \"newcpu.h\"\n");
+diff --git a/src/gencpu.c b/src/gencpu.c
+index 0b6b4a9..f4dd534 100644
+--- a/src/gencpu.c
++++ b/src/gencpu.c
+@@ -3540,7 +3540,7 @@ static void generate_includes (FILE * f)
+ 	fprintf (f, "#include \"sysconfig.h\"\n");
+ 	fprintf (f, "#include \"sysdeps.h\"\n");
+ 	fprintf (f, "#include \"options.h\"\n");
+-	fprintf (f, "#include \"memory.h\"\n");
++	fprintf (f, "#include \"uae_memory.h\"\n");
+ 	fprintf (f, "#include \"custom.h\"\n");
+ 	fprintf (f, "#include \"events.h\"\n");
+ 	fprintf (f, "#include \"newcpu.h\"\n");
+diff --git a/src/gfx-svga/svga.c b/src/gfx-svga/svga.c
+index f9246c0..88a5e11 100644
+--- a/src/gfx-svga/svga.c
++++ b/src/gfx-svga/svga.c
+@@ -19,7 +19,7 @@
+ #include "options.h"
+ #include "threaddep/thread.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "keyboard.h"
+ #include "xwin.h"
+ #include "custom.h"
+diff --git a/src/gfx-x11/xwin.c b/src/gfx-x11/xwin.c
+index f5537a6..6cbcd2c 100644
+--- a/src/gfx-x11/xwin.c
++++ b/src/gfx-x11/xwin.c
+@@ -23,7 +23,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "xwin.h"
+ #include "custom.h"
+ #include "drawing.h"
+diff --git a/src/gfxlib.c b/src/gfxlib.c
+index 73e13a0..5bfa8c3 100755
+--- a/src/gfxlib.c
++++ b/src/gfxlib.c
+@@ -31,7 +31,7 @@
+ 
+ #include "options.h"
+ #include "threaddep/thread.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "xwin.h"
+diff --git a/src/gui-gtk/gtkui.c b/src/gui-gtk/gtkui.c
+index f9c445e..acb486b 100644
+--- a/src/gui-gtk/gtkui.c
++++ b/src/gui-gtk/gtkui.c
+@@ -21,7 +21,7 @@
+ #include "autoconf.h"
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "gui.h"
+ #include "newcpu.h"
+diff --git a/src/gui-muirexx/ami-rexx.c b/src/gui-muirexx/ami-rexx.c
+index d8c3df5..fff7de6 100644
+--- a/src/gui-muirexx/ami-rexx.c
++++ b/src/gui-muirexx/ami-rexx.c
+@@ -47,7 +47,7 @@
+ #include "sysdeps.h"
+ #include "uae.h"
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "disk.h"
+diff --git a/src/hardfile.c b/src/hardfile.c
+index 68d4641..d720e23 100644
+--- a/src/hardfile.c
++++ b/src/hardfile.c
+@@ -12,7 +12,7 @@
+ 
+ #include "threaddep/thread.h"
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "disk.h"
+diff --git a/src/identify.c b/src/identify.c
+index 831d376..8a8a877 100644
+--- a/src/identify.c
++++ b/src/identify.c
+@@ -10,7 +10,7 @@
+ 
+ #ifdef DEBUGGER
+ 
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "identify.h"
+ 
+ const struct mem_labels int_labels[] =
+diff --git a/src/inputdevice.c b/src/inputdevice.c
+index 8704829..84a6e24 100644
+--- a/src/inputdevice.c
++++ b/src/inputdevice.c
+@@ -29,7 +29,7 @@
+ #include "custom.h"
+ #include "xwin.h"
+ #include "drawing.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "events.h"
+ #include "newcpu.h"
+ #include "uae.h"
+diff --git a/src/inputrecord.c b/src/inputrecord.c
+index 27d2927..8401c91 100755
+--- a/src/inputrecord.c
++++ b/src/inputrecord.c
+@@ -28,7 +28,7 @@
+ #include "disk.h"
+ 
+ #if INPUTRECORD_DEBUG > 0
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "newcpu.h"
+ #endif
+ 
+diff --git a/src/jd-beos/joystick.cpp b/src/jd-beos/joystick.cpp
+index 50b51de..bc8bb6d 100644
+--- a/src/jd-beos/joystick.cpp
++++ b/src/jd-beos/joystick.cpp
+@@ -11,7 +11,7 @@ extern "C" {
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "inputdevice.h"
+ }
+diff --git a/src/jd-linuxold/joystick.c b/src/jd-linuxold/joystick.c
+index c302241..82e8c66 100644
+--- a/src/jd-linuxold/joystick.c
++++ b/src/jd-linuxold/joystick.c
+@@ -16,7 +16,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "inputdevice.h"
+ 
+diff --git a/src/jd-none/joystick.c b/src/jd-none/joystick.c
+index 08a71ce..c93068f 100644
+--- a/src/jd-none/joystick.c
++++ b/src/jd-none/joystick.c
+@@ -11,7 +11,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "inputdevice.h"
+ 
+diff --git a/src/main.c b/src/main.c
+index d8eb698..2f10c06 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -18,7 +18,7 @@
+ #include "uae.h"
+ #include "audio.h"
+ #include "events.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "serial.h"
+ #include "newcpu.h"
+diff --git a/src/memory.c b/src/memory.c
+index cf6c6d2..d10c4d5 100644
+--- a/src/memory.c
++++ b/src/memory.c
+@@ -13,7 +13,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "rommgr.h"
+ #include "ersatz.h"
+ #include "zfile.h"
+diff --git a/src/misc.c b/src/misc.c
+index 0f34ae8..10cfc98 100644
+--- a/src/misc.c
++++ b/src/misc.c
+@@ -13,7 +13,7 @@
+ 
+ #include "misc.h"
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "events.h"
+diff --git a/src/native2amiga.c b/src/native2amiga.c
+index 53dc2de..3755749 100644
+--- a/src/native2amiga.c
++++ b/src/native2amiga.c
+@@ -14,7 +14,7 @@
+ 
+ #include "threaddep/thread.h"
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "autoconf.h"
+diff --git a/src/ncr_scsi.c b/src/ncr_scsi.c
+index 3ec83be..f338bbe 100755
+--- a/src/ncr_scsi.c
++++ b/src/ncr_scsi.c
+@@ -15,7 +15,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "rommgr.h"
+ #include "custom.h"
+ #include "newcpu.h"
+diff --git a/src/newcpu.c b/src/newcpu.c
+index 6f12fc1..64808b2 100644
+--- a/src/newcpu.c
++++ b/src/newcpu.c
+@@ -17,7 +17,7 @@
+ #include "options.h"
+ #include "events.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "cpummu.h"
+diff --git a/src/od-amiga/blkdev-amiga.c b/src/od-amiga/blkdev-amiga.c
+index a28389f..f662619 100644
+--- a/src/od-amiga/blkdev-amiga.c
++++ b/src/od-amiga/blkdev-amiga.c
+@@ -11,7 +11,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "include/memory.h"
++#include "include/uae_memory.h"
+ #include "threaddep/thread.h"
+ #include "blkdev.h"
+ #include "scsidev.h"
+diff --git a/src/od-beos/parser.c b/src/od-beos/parser.c
+index 42aed69..3876ed1 100644
+--- a/src/od-beos/parser.c
++++ b/src/od-beos/parser.c
+@@ -15,7 +15,7 @@
+ #include "gensound.h"
+ #include "events.h"
+ #include "uae.h"
+-#include "include/memory.h"
++#include "include/uae_memory.h"
+ #include "custom.h"
+ #include "autoconf.h"
+ #include "newcpu.h"
+diff --git a/src/od-generic/memory.c b/src/od-generic/memory.c
+index ec9e370..28df694 100644
+--- a/src/od-generic/memory.c
++++ b/src/od-generic/memory.c
+@@ -11,8 +11,10 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
++#ifndef ANDROID
+ #include <sys/sysctl.h>
+-#include "include/memory.h"
++#endif
++#include "include/uae_memory.h"
+ 
+ #ifdef JIT
+ 
+diff --git a/src/od-generic/parser.c b/src/od-generic/parser.c
+index 42aed69..3876ed1 100644
+--- a/src/od-generic/parser.c
++++ b/src/od-generic/parser.c
+@@ -15,7 +15,7 @@
+ #include "gensound.h"
+ #include "events.h"
+ #include "uae.h"
+-#include "include/memory.h"
++#include "include/uae_memory.h"
+ #include "custom.h"
+ #include "autoconf.h"
+ #include "newcpu.h"
+diff --git a/src/od-linux/Makefile.am b/src/od-linux/Makefile.am
+index 594dc6d..f7e64ba 100644
+--- a/src/od-linux/Makefile.am
++++ b/src/od-linux/Makefile.am
+@@ -6,4 +6,4 @@ noinst_LIBRARIES = libosdep.a
+ 
+ libosdep_a_SOURCES = main.c memory.c blkdev-linux.c parser.c
+ 
+-noinst_HEADERS = memory.h hrtimer.h
++noinst_HEADERS = uae_memory.h hrtimer.h
+diff --git a/src/od-linux/blkdev-linux.c b/src/od-linux/blkdev-linux.c
+index a5282c3..9a6ce48 100644
+--- a/src/od-linux/blkdev-linux.c
++++ b/src/od-linux/blkdev-linux.c
+@@ -14,7 +14,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "../include/memory.h"
++#include "../include/uae_memory.h"
+ #include "blkdev.h"
+ #include "scsidev.h"
+ #include "gui.h"
+diff --git a/src/od-linux/parser.c b/src/od-linux/parser.c
+index 42aed69..3876ed1 100644
+--- a/src/od-linux/parser.c
++++ b/src/od-linux/parser.c
+@@ -15,7 +15,7 @@
+ #include "gensound.h"
+ #include "events.h"
+ #include "uae.h"
+-#include "include/memory.h"
++#include "include/uae_memory.h"
+ #include "custom.h"
+ #include "autoconf.h"
+ #include "newcpu.h"
+diff --git a/src/od-macosx/Makefile.am b/src/od-macosx/Makefile.am
+index 21ba1ef..8ce194f 100644
+--- a/src/od-macosx/Makefile.am
++++ b/src/od-macosx/Makefile.am
+@@ -6,7 +6,7 @@ noinst_LIBRARIES = libosdep.a
+ 
+ libosdep_a_SOURCES = main.m memory.c parser.c
+ 
+-noinst_HEADERS = main.h memory.h hrtimer.h
++noinst_HEADERS = main.h uae_memory.h hrtimer.h
+ noinst_DATA = Info.plist.in puae.icns Credits.rtf.in
+ 
+ EXTRA_DIST = puae.icns
+diff --git a/src/od-macosx/parser.c b/src/od-macosx/parser.c
+index 42aed69..3876ed1 100644
+--- a/src/od-macosx/parser.c
++++ b/src/od-macosx/parser.c
+@@ -15,7 +15,7 @@
+ #include "gensound.h"
+ #include "events.h"
+ #include "uae.h"
+-#include "include/memory.h"
++#include "include/uae_memory.h"
+ #include "custom.h"
+ #include "autoconf.h"
+ #include "newcpu.h"
+diff --git a/src/od-win32/Makefile.am b/src/od-win32/Makefile.am
+index 382ff71..a2d7c30 100644
+--- a/src/od-win32/Makefile.am
++++ b/src/od-win32/Makefile.am
+@@ -7,4 +7,4 @@ noinst_LIBRARIES = libosdep.a
+ libosdep_a_SOURCES = main.c memory.c posixemu.c writelog.c fsdb_win32.c \
+ 		     hardfile_win32.c bsdsock.c
+ 
+-noinst_HEADERS = memory.h hrtimer.h posixemu.h
++noinst_HEADERS = uae_memory.h hrtimer.h posixemu.h
+diff --git a/src/od-win32/bsdsock.c b/src/od-win32/bsdsock.c
+index 8bc8680..9f0659e 100755
+--- a/src/od-win32/bsdsock.c
++++ b/src/od-win32/bsdsock.c
+@@ -19,7 +19,7 @@
+ #include <process.h>
+ 
+ #include "options.h"
+-#include "include/memory.h"
++#include "include/uae_memory.h"
+ #include "custom.h"
+ #include "events.h"
+ #include "newcpu.h"
+diff --git a/src/od-win32/memory.c b/src/od-win32/memory.c
+index 0141a40..78bd46c 100644
+--- a/src/od-win32/memory.c
++++ b/src/od-win32/memory.c
+@@ -9,7 +9,7 @@
+ #include "sysconfig.h"
+ #include "sysdeps.h"
+ 
+-#include "memory.h"
++#include "uae_memory.h"
+ 
+ #ifdef JIT
+ 
+diff --git a/src/picasso96.c b/src/picasso96.c
+index 85bae89..47fb9a4 100644
+--- a/src/picasso96.c
++++ b/src/picasso96.c
+@@ -46,7 +46,7 @@ int p96hack_vpos, p96hack_vpos2, p96refresh_active;
+ #include "gfxdep/gfx.h"
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "savestate.h"
+ #include "autoconf.h"
+diff --git a/src/rommgr.c b/src/rommgr.c
+index 2de33d6..f9cffea 100755
+--- a/src/rommgr.c
++++ b/src/rommgr.c
+@@ -12,7 +12,7 @@
+ #include "uae.h"
+ #include "gui.h"
+ #include "rommgr.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "zfile.h"
+ #include "crc32.h"
+ 
+diff --git a/src/sana2.c b/src/sana2.c
+index c434f1a..1559e6c 100755
+--- a/src/sana2.c
++++ b/src/sana2.c
+@@ -14,7 +14,7 @@
+ 
+ #include "threaddep/thread.h"
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "events.h"
+ #include "newcpu.h"
+diff --git a/src/savestate.c b/src/savestate.c
+index 0345966..52d49ad 100644
+--- a/src/savestate.c
++++ b/src/savestate.c
+@@ -50,7 +50,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "zfile.h"
+ #include "ar.h"
+ #include "autoconf.h"
+diff --git a/src/scsidev.c b/src/scsidev.c
+index 366253d..f544e56 100755
+--- a/src/scsidev.c
++++ b/src/scsidev.c
+@@ -12,7 +12,7 @@
+ 
+ #include "threaddep/thread.h"
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "disk.h"
+diff --git a/src/scsiemul.c b/src/scsiemul.c
+index 8f6bacf..2a900b8 100644
+--- a/src/scsiemul.c
++++ b/src/scsiemul.c
+@@ -16,7 +16,7 @@
+ #include "uae.h"
+ #include "threaddep/thread.h"
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "events.h"
+ #include "newcpu.h"
+diff --git a/src/sd-sdl/sound.c b/src/sd-sdl/sound.c
+index 067df4e..3de228d 100644
+--- a/src/sd-sdl/sound.c
++++ b/src/sd-sdl/sound.c
+@@ -13,7 +13,7 @@
+ 
+ #include "options.h"
+ #include "audio.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "events.h"
+ #include "custom.h"
+ #include "gui.h"
+diff --git a/src/sd-solaris/sound.c b/src/sd-solaris/sound.c
+index 5994996..93192e6 100644
+--- a/src/sd-solaris/sound.c
++++ b/src/sd-solaris/sound.c
+@@ -11,7 +11,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "events.h"
+ #include "custom.h"
+ #include "audio.h"
+diff --git a/src/serial.c b/src/serial.c
+index 2791573..50cd219 100644
+--- a/src/serial.c
++++ b/src/serial.c
+@@ -13,7 +13,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "cia.h"
+diff --git a/src/test/test_optflag.c b/src/test/test_optflag.c
+index 4222ac8..d1e4cd4 100644
+--- a/src/test/test_optflag.c
++++ b/src/test/test_optflag.c
+@@ -15,7 +15,7 @@
+ #include "options.h"
+ #include "events.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ 
+diff --git a/src/traps.c b/src/traps.c
+index 9ecf37e..a82b0ed 100644
+--- a/src/traps.c
++++ b/src/traps.c
+@@ -14,7 +14,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "threaddep/thread.h"
+diff --git a/src/tui.c b/src/tui.c
+index e2ffbf9..f615339 100644
+--- a/src/tui.c
++++ b/src/tui.c
+@@ -22,7 +22,7 @@
+ #include "xwin.h"
+ #include "tui.h"
+ #include "gui.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "audio.h"
+ #include "version.h"
+ 
+diff --git a/src/uaeexe.c b/src/uaeexe.c
+index dc94516..209efca 100644
+--- a/src/uaeexe.c
++++ b/src/uaeexe.c
+@@ -9,7 +9,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "autoconf.h"
+diff --git a/src/uaelib.c b/src/uaelib.c
+index d6815d6..4f0d156 100644
+--- a/src/uaelib.c
++++ b/src/uaelib.c
+@@ -16,7 +16,7 @@
+ 
+ #include "options.h"
+ #include "uae.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "xwin.h"
+diff --git a/src/uaeresource.c b/src/uaeresource.c
+index 9c132ba..15e3eb3 100755
+--- a/src/uaeresource.c
++++ b/src/uaeresource.c
+@@ -9,7 +9,7 @@
+ #include "sysdeps.h"
+ 
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "traps.h"
+diff --git a/src/uaeserial.c b/src/uaeserial.c
+index 9c1afec..c86fe5a 100755
+--- a/src/uaeserial.c
++++ b/src/uaeserial.c
+@@ -12,7 +12,7 @@
+ 
+ #include "threaddep/thread.h"
+ #include "options.h"
+-#include "memory.h"
++#include "uae_memory.h"
+ #include "custom.h"
+ #include "newcpu.h"
+ #include "traps.h"
diff --git a/project/jni/application/puae/readme.txt b/project/jni/application/puae/readme.txt
new file mode 100644
index 000000000..04d0cbb92
--- /dev/null
+++ b/project/jni/application/puae/readme.txt
@@ -0,0 +1,4 @@
+Grab PUAE sources:
+git clone git://github.com/GnoStiC/PUAE.git
+Apply patch puae.diff, then you may run build.sh
+Warning: it won't build yet, you'll need to edit makefiles by hand
\ No newline at end of file