diff options
| author | dhewg | 2011-02-06 16:03:52 +0100 |
|---|---|---|
| committer | dhewg | 2011-02-14 18:58:55 +0100 |
| commit | 8de5edde9599b6ca00c23e753c00676d7bc9b335 (patch) | |
| tree | dde692488ea2e0fd503a1f37882afcdf2ee1632f | |
| parent | 29d1df94db1c2c16646eba116591456fdc0d65a4 (diff) | |
| download | scummvm-rg350-8de5edde9599b6ca00c23e753c00676d7bc9b335.tar.gz scummvm-rg350-8de5edde9599b6ca00c23e753c00676d7bc9b335.tar.bz2 scummvm-rg350-8de5edde9599b6ca00c23e753c00676d7bc9b335.zip | |
ANDROID: Protect port files with our define
get rid of -DANDROID and -DANDROID_BACKEND
| -rw-r--r-- | backends/platform/android/android.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/android/asset-archive.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/android/asset-archive.h | 2 | ||||
| -rw-r--r-- | backends/platform/android/video.cpp | 5 | ||||
| -rw-r--r-- | backends/platform/android/video.h | 2 | ||||
| -rwxr-xr-x | configure | 1 |
6 files changed, 10 insertions, 6 deletions
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp index efcee488a5..6502f94408 100644 --- a/backends/platform/android/android.cpp +++ b/backends/platform/android/android.cpp @@ -23,14 +23,14 @@ * */ +#if defined(__ANDROID__) + #include "backends/base-backend.h" #include "base/main.h" #include "graphics/surface.h" #include "backends/platform/android/video.h" -#if defined(ANDROID_BACKEND) - #include <jni.h> #include <string.h> diff --git a/backends/platform/android/asset-archive.cpp b/backends/platform/android/asset-archive.cpp index 20c6a653c0..bd32847f6a 100644 --- a/backends/platform/android/asset-archive.cpp +++ b/backends/platform/android/asset-archive.cpp @@ -23,7 +23,7 @@ * */ -#if defined(ANDROID) +#if defined(__ANDROID__) #include <jni.h> diff --git a/backends/platform/android/asset-archive.h b/backends/platform/android/asset-archive.h index b3f6993c50..28e48426e9 100644 --- a/backends/platform/android/asset-archive.h +++ b/backends/platform/android/asset-archive.h @@ -23,7 +23,7 @@ * */ -#if defined(ANDROID) +#if defined(__ANDROID__) #include <jni.h> diff --git a/backends/platform/android/video.cpp b/backends/platform/android/video.cpp index 3275335d97..a64e322c95 100644 --- a/backends/platform/android/video.cpp +++ b/backends/platform/android/video.cpp @@ -23,6 +23,8 @@ * */ +#if defined(__ANDROID__) + #include "base/main.h" #include "graphics/surface.h" @@ -352,3 +354,6 @@ void GLESPaletteTexture::drawTexture(GLshort x, GLshort y, GLshort w, GLshort h) GLESTexture::drawTexture(x, y, w, h); } + +#endif + diff --git a/backends/platform/android/video.h b/backends/platform/android/video.h index 2ca07e0afd..4b73508907 100644 --- a/backends/platform/android/video.h +++ b/backends/platform/android/video.h @@ -23,7 +23,7 @@ * */ -#if defined(ANDROID) +#if defined(__ANDROID__) #include <GLES/gl.h> @@ -1659,7 +1659,6 @@ if test -n "$_host"; then echo "Cross-compiling to $_host" case "$_host" in android) - DEFINES="$DEFINES -DANDROID -DANDROID_BACKEND" _unix=yes _need_memalign=yes # we link a .so as default |