diff options
| -rw-r--r-- | libretro/jni/Android.mk | 25 | ||||
| -rw-r--r-- | libretro/jni/Application.mk | 1 | ||||
| -rw-r--r-- | src/loadzip.cpp | 4 | ||||
| -rw-r--r-- | src/memmap.cpp | 4 | ||||
| -rw-r--r-- | src/screenshot.c | 8 | ||||
| -rw-r--r-- | src/sdd1.cpp | 2 |
6 files changed, 36 insertions, 8 deletions
diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk new file mode 100644 index 0000000..4e8f462 --- /dev/null +++ b/libretro/jni/Android.mk @@ -0,0 +1,25 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +APP_DIR := ../../src + +LOCAL_MODULE := retro + +ifeq ($(TARGET_ARCH),arm) +LOCAL_CFLAGS += -DANDROID_ARM +LOCAL_ARM_MODE := arm +endif + +ifeq ($(TARGET_ARCH),x86) +LOCAL_CFLAGS += -DANDROID_X86 +endif + +ifeq ($(TARGET_ARCH),mips) +LOCAL_CFLAGS += -DANDROID_MIPS -D__mips__ -D__MIPSEL__ +endif + +LOCAL_SRC_FILES += $(APP_DIR)/apu.cpp $(APP_DIR)/apuaux.cpp $(APP_DIR)/c4.cpp $(APP_DIR)/c4emu.cpp $(APP_DIR)/cheats.cpp $(APP_DIR)/cheats2.cpp $(APP_DIR)/clip.cpp $(APP_DIR)/data.cpp $(APP_DIR)/screenshot.c $(APP_DIR)/dsp1.cpp $(APP_DIR)/fxemu.cpp $(APP_DIR)/fxinst.cpp $(APP_DIR)/globals.cpp $(APP_DIR)/loadzip.cpp $(APP_DIR)/ppu.cpp $(APP_DIR)/dma.cpp $(APP_DIR)/memmap.cpp $(APP_DIR)/cpu.cpp $(APP_DIR)/cpuexec.cpp $(APP_DIR)/cpuops.cpp $(APP_DIR)/sa1.cpp $(APP_DIR)/sa1cpu.cpp $(APP_DIR)/sdd1.cpp $(APP_DIR)/sdd1emu.cpp $(APP_DIR)/snapshot.cpp $(APP_DIR)/soundux.cpp.arm $(APP_DIR)/spc700.cpp $(APP_DIR)/spc700a.s $(APP_DIR)/srtc.cpp $(APP_DIR)/spc_decode.s $(APP_DIR)/tile16.cpp.arm $(APP_DIR)/tile16add.cpp.arm $(APP_DIR)/tile16add1_2.cpp.arm $(APP_DIR)/tile16fadd1_2.cpp.arm $(APP_DIR)/tile16sub.cpp.arm $(APP_DIR)/tile16sub1_2.cpp.arm $(APP_DIR)/tile16fsub1_2.cpp.arm $(APP_DIR)/mode7new.cpp.arm $(APP_DIR)/mode7.cpp.arm $(APP_DIR)/mode7add.cpp.arm $(APP_DIR)/mode7add1_2.cpp.arm $(APP_DIR)/mode7sub.cpp.arm $(APP_DIR)/mode7sub1_2.cpp.arm $(APP_DIR)/mode7prio.cpp.arm $(APP_DIR)/mode7addprio.cpp.arm $(APP_DIR)/mode7add1_2prio.cpp.arm $(APP_DIR)/mode7subprio.cpp.arm $(APP_DIR)/mode7sub1_2prio.cpp.arm $(APP_DIR)/gfx16.cpp.arm $(APP_DIR)/rops.cpp ../libretro.cpp ../memstream.c +LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -fomit-frame-pointer -DNDEBUG=1 -DHAVE_STRINGS_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H -D__LIBRETRO__ -DINLINE=inline -DUSE_SA1 # -std=gnu99 + +include $(BUILD_SHARED_LIBRARY) diff --git a/libretro/jni/Application.mk b/libretro/jni/Application.mk new file mode 100644 index 0000000..f05229c --- /dev/null +++ b/libretro/jni/Application.mk @@ -0,0 +1 @@ +APP_ABI := armeabi armeabi-v7a diff --git a/src/loadzip.cpp b/src/loadzip.cpp index 1bbcaac..6e082d7 100644 --- a/src/loadzip.cpp +++ b/src/loadzip.cpp @@ -65,7 +65,7 @@ bool8 LoadZip(const char* zipname, int32 *TotalFileSize, int32 *headers) -{ +{/* *TotalFileSize = 0; *headers = 0; @@ -216,5 +216,7 @@ bool8 LoadZip(const char* zipname, unzClose(file); return (TRUE); + */ + return (FALSE); } #endif diff --git a/src/memmap.cpp b/src/memmap.cpp index dffbbd9..e561772 100644 --- a/src/memmap.cpp +++ b/src/memmap.cpp @@ -1049,9 +1049,9 @@ bool8_32 CMemory::SaveSRAM (const char *filename) {
fwrite ((char *) ::SRAM, size, 1, file);
fclose (file);
- sync();
+ //sync();
#if defined(__linux)
- chown (filename, getuid (), getgid ());
+ //chown (filename, getuid (), getgid ());
#endif
return (TRUE);
}
diff --git a/src/screenshot.c b/src/screenshot.c index ab169cf..14a4efa 100644 --- a/src/screenshot.c +++ b/src/screenshot.c @@ -17,7 +17,7 @@ void getScreenShot(unsigned short *screen) { screen += 32;
if (!screenShot) {
- screenShot = gCreateBitmap(SS_WIDTH, SS_HEIGHT, 32);
+ screenShot = 0;//gCreateBitmap(SS_WIDTH, SS_HEIGHT, 32);
if (!screenShot) return;
}
@@ -40,7 +40,7 @@ int saveScreenShot() { if (!screenShot) return -1;
// get filename of last loaded ROM (the running one)
- getConfigValue(CONFIG_LASTLOADED, fn, sizeof(fn));
+ //getConfigValue(CONFIG_LASTLOADED, fn, sizeof(fn));
// set file ext to .png
ext = strrchr(fn, '.');
if (!ext) ext = &fn[strlen(fn)];
@@ -48,7 +48,7 @@ int saveScreenShot() { // compose screenshot file's full path
sprintf(png_fn, "%s%s", getScreenShotsDir(), strrchr(fn, '/'));
- ret = save_png(screenShot, png_fn);
+ ret = 0;//save_png(screenShot, png_fn);
sync();
return ret;
@@ -66,6 +66,6 @@ const char *getScreenShotsDir() { }
void destroyScreenShot() {
- gDestroyBitmap(screenShot);
+ //gDestroyBitmap(screenShot);
screenShot = NULL;
}
diff --git a/src/sdd1.cpp b/src/sdd1.cpp index 8c79750..aa3da87 100644 --- a/src/sdd1.cpp +++ b/src/sdd1.cpp @@ -110,7 +110,7 @@ void S9xSDD1SaveLoggedData () Memory.SDD1LoggedDataCount, fs); fclose (fs); #if defined(__linux) - chown (S9xGetFilename (".dat"), getuid (), getgid ()); + //chown (S9xGetFilename (".dat"), getuid (), getgid ()); #endif } Memory.SDD1LoggedDataCountPrev = Memory.SDD1LoggedDataCount; |