__ANDROID__ is defined in the Android build environment; no need for an extra -DANDROID

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1237 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/android_toolchain.cmake b/android_toolchain.cmake
index 93498c6..ef3bb61 100644 (file)
--- a/android_toolchain.cmake
+++ b/android_toolchain.cmake
@@ -3,6 +3,4 @@ SET(CMAKE_SYSTEM_NAME Linux)  # Tell CMake we're cross-compiling
 include(CMakeForceCompiler)
 # Prefix detection only works with compiler id "GNU"
 CMAKE_FORCE_C_COMPILER(arm-linux-androideabi-gcc GNU)
-# '-DANDROID' is the Android build system convention
-ADD_DEFINITIONS(-DANDROID)
 SET(ANDROID TRUE)

diff --git a/src/fg_internal.h b/src/fg_internal.h
index da0b44d..b3d892d 100644 (file)
--- a/src/fg_internal.h
+++ b/src/fg_internal.h
@@ -42,7 +42,7 @@
     || ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) )
 #   define  TARGET_HOST_MS_WINDOWS 1
 
-#elif defined (ANDROID)
+#elif defined (__ANDROID__)
 #   define  TARGET_HOST_ANDROID  1
 
 #elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun)