FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1237 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
beuc 2012-04-09 18:35:25 +00:00
parent 9d024e63ab
commit 56742b2bbd
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freeglut/freeglut/android_toolchain.cmake
View File

@ -3,6 +3,4 @@ SET(CMAKE_SYSTEM_NAME Linux) # Tell CMake we're cross-compiling
include(CMakeForceCompiler) include(CMakeForceCompiler)
# Prefix detection only works with compiler id "GNU" # Prefix detection only works with compiler id "GNU"
CMAKE_FORCE_C_COMPILER(arm-linux-androideabi-gcc GNU) CMAKE_FORCE_C_COMPILER(arm-linux-androideabi-gcc GNU)
# '-DANDROID' is the Android build system convention
ADD_DEFINITIONS(-DANDROID)
SET(ANDROID TRUE) SET(ANDROID TRUE)

2
freeglut/freeglut/src/fg_internal.h
View File

@ -42,7 +42,7 @@
|| ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) ) || ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) )
# define TARGET_HOST_MS_WINDOWS 1 # define TARGET_HOST_MS_WINDOWS 1
#elif defined (ANDROID) #elif defined (__ANDROID__)
# define TARGET_HOST_ANDROID 1 # define TARGET_HOST_ANDROID 1
#elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun) #elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun)