projects
/
freeglut
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a1cb8b0
)
Android: reference android library dependencies, needed for shared libs builds
author
Sylvain Beucler
<beuc@beuc.net>
Tue, 1 May 2012 09:33:05 +0000
(09:33 +0000)
committer
Sylvain Beucler
<beuc@beuc.net>
Tue, 1 May 2012 09:33:05 +0000
(09:33 +0000)
git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1273
7f0cb862
-5218-0410-a997-
914c9d46530a
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
c75e4fe
..
f1c406f
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-203,7
+203,7
@@
IF(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)
@@
-219,6
+219,11
@@
if(UNIX AND NOT ANDROID)
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)