Add Android JNI Makefiles and Makefile.common

3 files changed, 31 insertions, 24 deletions

diff --git a/source/cheats.c b/source/cheats.c
index 62d9a76..f9f1ac8 100644
--- a/source/cheats.c
+++ b/source/cheats.c
@@ -213,7 +213,7 @@ void S9xStartCheatSearch(SCheatData* d)
 #define TEST_BIT(a,v) \
 ((a)[(v) >> 5] & (1 << ((v) & 31)))
 
-#define _C(c,a,b) \
+#define CHEATS_C(c,a,b) \
 ((c) == S9X_LESS_THAN ? (a) < (b) : \
  (c) == S9X_GREATER_THAN ? (a) > (b) : \
  (c) == S9X_LESS_THAN_OR_EQUAL ? (a) <= (b) : \
@@ -261,7 +261,7 @@ void S9xSearchForChange(SCheatData* d, S9xCheatComparisonType cmp,
       for (i = 0; i < 0x20000 - l; i++)
       {
          if (TEST_BIT(d->WRAM_BITS, i) &&
-               _C(cmp, _DS(size, d->RAM, i), _DS(size, d->CWRAM, i)))
+               CHEATS_C(cmp, _DS(size, d->RAM, i), _DS(size, d->CWRAM, i)))
          {
             if (update)
                d->CWRAM [i] = d->RAM [i];
@@ -273,7 +273,7 @@ void S9xSearchForChange(SCheatData* d, S9xCheatComparisonType cmp,
       for (i = 0; i < 0x10000 - l; i++)
       {
          if (TEST_BIT(d->SRAM_BITS, i) &&
-               _C(cmp, _DS(size, d->SRAM, i), _DS(size, d->CSRAM, i)))
+               CHEATS_C(cmp, _DS(size, d->SRAM, i), _DS(size, d->CSRAM, i)))
          {
             if (update)
                d->CSRAM [i] = d->SRAM [i];
@@ -285,7 +285,7 @@ void S9xSearchForChange(SCheatData* d, S9xCheatComparisonType cmp,
       for (i = 0; i < 0x2000 - l; i++)
       {
          if (TEST_BIT(d->IRAM_BITS, i) &&
-               _C(cmp, _DS(size, d->FillRAM + 0x3000, i), _DS(size, d->CIRAM, i)))
+               CHEATS_C(cmp, _DS(size, d->FillRAM + 0x3000, i), _DS(size, d->CIRAM, i)))
          {
             if (update)
                d->CIRAM [i] = d->FillRAM [i + 0x3000];
@@ -299,7 +299,7 @@ void S9xSearchForChange(SCheatData* d, S9xCheatComparisonType cmp,
       for (i = 0; i < 0x20000 - l; i++)
       {
          if (TEST_BIT(d->WRAM_BITS, i) &&
-               _C(cmp, _D(size, d->RAM, i), _D(size, d->CWRAM, i)))
+               CHEATS_C(cmp, _D(size, d->RAM, i), _D(size, d->CWRAM, i)))
          {
             if (update)
                d->CWRAM [i] = d->RAM [i];
@@ -311,7 +311,7 @@ void S9xSearchForChange(SCheatData* d, S9xCheatComparisonType cmp,
       for (i = 0; i < 0x10000 - l; i++)
       {
          if (TEST_BIT(d->SRAM_BITS, i) &&
-               _C(cmp, _D(size, d->SRAM, i), _D(size, d->CSRAM, i)))
+               CHEATS_C(cmp, _D(size, d->SRAM, i), _D(size, d->CSRAM, i)))
          {
             if (update)
                d->CSRAM [i] = d->SRAM [i];
@@ -323,7 +323,7 @@ void S9xSearchForChange(SCheatData* d, S9xCheatComparisonType cmp,
       for (i = 0; i < 0x2000 - l; i++)
       {
          if (TEST_BIT(d->IRAM_BITS, i) &&
-               _C(cmp, _D(size, d->FillRAM + 0x3000, i), _D(size, d->CIRAM, i)))
+               CHEATS_C(cmp, _D(size, d->FillRAM + 0x3000, i), _D(size, d->CIRAM, i)))
          {
             if (update)
                d->CIRAM [i] = d->FillRAM [i + 0x3000];
@@ -364,7 +364,7 @@ void S9xSearchForValue(SCheatData* d, S9xCheatComparisonType cmp,
       for (i = 0; i < 0x20000 - l; i++)
       {
          if (TEST_BIT(d->WRAM_BITS, i) &&
-               _C(cmp, _DS(size, d->RAM, i), (int32) value))
+               CHEATS_C(cmp, _DS(size, d->RAM, i), (int32) value))
          {
             if (update)
                d->CWRAM [i] = d->RAM [i];
@@ -376,7 +376,7 @@ void S9xSearchForValue(SCheatData* d, S9xCheatComparisonType cmp,
       for (i = 0; i < 0x10000 - l; i++)
       {
          if (TEST_BIT(d->SRAM_BITS, i) &&
-               _C(cmp, _DS(size, d->SRAM, i), (int32) value))
+               CHEATS_C(cmp, _DS(size, d->SRAM, i), (int32) value))
          {
             if (update)
                d->CSRAM [i] = d->SRAM [i];
@@ -388,7 +388,7 @@ void S9xSearchForValue(SCheatData* d, S9xCheatComparisonType cmp,
       for (i = 0; i < 0x2000 - l; i++)
       {
          if (TEST_BIT(d->IRAM_BITS, i) &&
-               _C(cmp, _DS(size, d->FillRAM + 0x3000, i), (int32) value))
+               CHEATS_C(cmp, _DS(size, d->FillRAM + 0x3000, i), (int32) value))
          {
             if (update)
                d->CIRAM [i] = d->FillRAM [i + 0x3000];
@@ -402,7 +402,7 @@ void S9xSearchForValue(SCheatData* d, S9xCheatComparisonType cmp,
       for (i = 0; i < 0x20000 - l; i++)
       {
          if (TEST_BIT(d->WRAM_BITS, i) &&
-               _C(cmp, _D(size, d->RAM, i), value))
+               CHEATS_C(cmp, _D(size, d->RAM, i), value))
          {
             if (update)
                d->CWRAM [i] = d->RAM [i];
@@ -414,7 +414,7 @@ void S9xSearchForValue(SCheatData* d, S9xCheatComparisonType cmp,
       for (i = 0; i < 0x10000 - l; i++)
       {
          if (TEST_BIT(d->SRAM_BITS, i) &&
-               _C(cmp, _D(size, d->SRAM, i), value))
+               CHEATS_C(cmp, _D(size, d->SRAM, i), value))
          {
             if (update)
                d->CSRAM [i] = d->SRAM [i];
@@ -426,7 +426,7 @@ void S9xSearchForValue(SCheatData* d, S9xCheatComparisonType cmp,
       for (i = 0; i < 0x2000 - l; i++)
       {
          if (TEST_BIT(d->IRAM_BITS, i) &&
-               _C(cmp, _D(size, d->FillRAM + 0x3000, i), value))
+               CHEATS_C(cmp, _D(size, d->FillRAM + 0x3000, i), value))
          {
             if (update)
                d->CIRAM [i] = d->FillRAM [i + 0x3000];
diff --git a/source/seta010.c b/source/seta010.c
index 75deb74..2bb9b93 100644
--- a/source/seta010.c
+++ b/source/seta010.c
@@ -442,9 +442,10 @@ void S9xSetST010(uint32 Address, uint8 Byte)
       //
       case 0x02:
       {
-#ifdef FAST_LSB_WORD_ACCESS
-         ST010_SortDrivers(*(short*)&SRAM[0x0024], (uint16*)(SRAM + 0x0040),
-                           (uint16*)(SRAM + 0x0080));
+#if defined(FAST_LSB_WORD_ACCESS) && !defined(ANDROID)
+         /* TODO - FIXME */
+         ST010_SortDrivers(*(short*)&Memory.SRAM[0x0024], (uint16*)(Memory.SRAM + 0x0040),
+                           (uint16*)(Memory.SRAM + 0x0080));
 #else
          uint16 Places[32];
          uint16 Positions = ST010_WORD(0x0024);
@@ -485,10 +486,11 @@ void S9xSetST010(uint32 Address, uint8 Byte)
       //
       case 0x03:
       {
-#ifdef FAST_LSB_WORD_ACCESS
+#if defined(FAST_LSB_WORD_ACCESS) && !defined(ANDROID)
+         /* TODO - FIXME */
          ST010_Scale(*(short*)&Memory.SRAM[0x0004], *(short*)&Memory.SRAM[0x0000],
                      *(short*)&Memory.SRAM[0x0002],
-                     (int &) Memory.SRAM[0x0010], (int &) Memory.SRAM[0x0014]);
+                     (int &)Memory.SRAM[0x0010], (int&)Memory.SRAM[0x0014]);
 #else
          int x1, y1;
 
@@ -517,7 +519,8 @@ void S9xSetST010(uint32 Address, uint8 Byte)
       //
       case 0x06:
       {
-#ifdef FAST_LSB_WORD_ACCESS
+#if defined(FAST_LSB_WORD_ACCESS) && !defined(ANDROID)
+         /* TODO - FIXME */
          ST010_Multiply(*(short*)&Memory.SRAM[0x0000], *(short*)&Memory.SRAM[0x0002],
                         (int &) Memory.SRAM[0x0010]);
 #else
@@ -593,7 +596,8 @@ void S9xSetST010(uint32 Address, uint8 Byte)
       //
       case 0x08:
       {
-#ifdef FAST_LSB_WORD_ACCESS
+#if defined(FAST_LSB_WORD_ACCESS) && !defined(ANDROID)
+         /* TODO - FIXME */
          ST010_Rotate(*(short*)&Memory.SRAM[0x0004], *(short*)&Memory.SRAM[0x0000],
                       *(short*)&Memory.SRAM[0x0002],
                       (short &) Memory.SRAM[0x0010], (short &) Memory.SRAM[0x0012]);
@@ -622,7 +626,8 @@ void S9xSetST010(uint32 Address, uint8 Byte)
          Memory.SRAM[0x0006] = Memory.SRAM[0x0002];
          Memory.SRAM[0x0007] = Memory.SRAM[0x0003];
 
-#ifdef FAST_LSB_WORD_ACCESS
+#if defined(FAST_LSB_WORD_ACCESS) && !defined(ANDROID)
+         /* TODO - FIXME */
          ST010_OP01(*(short*)&Memory.SRAM[0x0000], *(short*)&Memory.SRAM[0x0002],
                     (short*) &Memory.SRAM[0x0000], (short*) &Memory.SRAM[0x0002],
                     (short*) &Memory.SRAM[0x0004], (short*) &Memory.SRAM[0x0010]);
@@ -647,7 +652,8 @@ void S9xSetST010(uint32 Address, uint8 Byte)
       case 0x04:
       {
          int16 square, x, y;
-#ifdef FAST_LSB_WORD_ACCESS
+#if defined(FAST_LSB_WORD_ACCESS) && !defined(ANDROID)
+         /* TODO - FIXME */
          x = *((int16*)Memory.SRAM);
          y = *((int16*)&Memory.SRAM[2]);
 #else
@@ -657,7 +663,8 @@ void S9xSetST010(uint32 Address, uint8 Byte)
          square = (int16)sqrt((double)(y * y + x * x));
          //SETA_Distance( x,y,square );
 
-#ifdef FAST_LSB_WORD_ACCESS
+#if defined(FAST_LSB_WORD_ACCESS) && !defined(ANDROID)
+         /* TODO - FIXME */
          *((int16*)&Memory.SRAM[0x10]) = square;
 #else
          Memory.SRAM[0x10] = (uint8)(square);
diff --git a/source/soundux.c b/source/soundux.c
index 23b2abe..1ddbd48 100644
--- a/source/soundux.c
+++ b/source/soundux.c
@@ -510,7 +510,7 @@ void AltDecodeBlock(Channel* ch)
    if ((ch->last_block = filter & 1))
       ch->loop = (filter & 2) != 0;
 
-#if (defined (USE_X86_ASM) && (defined (__i386__) || defined (__i486__) ||\
+#if !defined(ANDROID) && (defined (USE_X86_ASM) && (defined (__i386__) || defined (__i486__) ||\
                defined (__i586__) || defined (__WIN32__) || defined (__DJGPP)))
    int16* raw = ch->block = ch->decoded;