projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Android: implement fgPlatformDeinitialiseInputDevices
[freeglut]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
c75e4fe
..
3068986
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-187,7
+187,10
@@
ENDIF()
# lib m for math, not needed on windows
IF (NOT WIN32)
# lib m for math, not needed on windows
IF (NOT WIN32)
+ # For compilation:
LIST(APPEND LIBS m)
LIST(APPEND LIBS m)
+ # For CHECK_FUNCTION_EXISTS:
+ LIST(APPEND CMAKE_REQUIRED_LIBRARIES m)
ENDIF()
IF(WIN32)
ENDIF()
IF(WIN32)
@@
-203,7
+206,7
@@
IF(CMAKE_COMPILER_IS_GNUCC)
ENDIF()
ENDIF(CMAKE_COMPILER_IS_GNUCC)
ENDIF()
ENDIF(CMAKE_COMPILER_IS_GNUCC)
-if(UNIX AND NOT ANDROID)
+IF(UNIX AND NOT ANDROID)
FIND_PACKAGE(X11 REQUIRED)
LIST(APPEND LIBS ${X11_LIBRARIES})
IF(X11_Xrandr_FOUND)
FIND_PACKAGE(X11 REQUIRED)
LIST(APPEND LIBS ${X11_LIBRARIES})
IF(X11_Xrandr_FOUND)
@@
-219,6
+222,11
@@
if(UNIX AND NOT ANDROID)
LIST(APPEND LIBS ${X11_Xxf86vm_LIB})
ENDIF()
ENDIF()
LIST(APPEND LIBS ${X11_Xxf86vm_LIB})
ENDIF()
ENDIF()
+IF(ANDROID)
+ # -landroid for ANativeWindow
+ # -llog for native Android logging
+ LIST(APPEND LIBS android log)
+ENDIF()
INCLUDE(CheckIncludeFiles)
INCLUDE(CheckFunctionExists)
INCLUDE(CheckIncludeFiles)
INCLUDE(CheckFunctionExists)
@@
-256,6
+264,10
@@
IF (NOT (HAVE_STDINT_H OR HAVE_INTTYPES_H))
ENDIF()
ENDIF()
ENDIF()
ENDIF()
+# Check for sinf/cosf/sqrtf
+CHECK_FUNCTION_EXISTS(sinf HAVE_SINF)
+CHECK_FUNCTION_EXISTS(cosf HAVE_COSF)
+CHECK_FUNCTION_EXISTS(sqrtf HAVE_SQRTF)
# The generated config.h is placed in the project's build directory, just to
# ensure that all CMake-generated files are kept away from the main source tree.
# The generated config.h is placed in the project's build directory, just to
# ensure that all CMake-generated files are kept away from the main source tree.