Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: make glfw3 visable to subprojects

This commit is contained in:
martell 2014-10-09 05:34:27 +01:00
parent 07c31bb4e1
commit 479cd16886
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -164,6 +164,14 @@ include_directories(
) )
if(LINUX)
find_package(GLFW3 REQUIRED)
message( STATUS "GLFW3 dirs: ${GLFW3_INCLUDE_DIRS}")
include_directories(${GLFW3_INCLUDE_DIRS})
endif(LINUX)
if(NOT MINGW) if(NOT MINGW)

11
cocos/CMakeLists.txt
View File

@ -95,16 +95,6 @@ if(MINGW)
else() else()
if(LINUX)
find_package(GLFW3 REQUIRED)
message( STATUS "GLFW3 dirs: ${GLFW3_INCLUDE_DIRS}")
include_directories(${GLFW3_INCLUDE_DIRS})
endif(LINUX)
#todo: provide prebuild versions of minizip for android ios mac and msvc #todo: provide prebuild versions of minizip for android ios mac and msvc
#done: prebuilt version for mingw-w64 (linux distros should have them also) #done: prebuilt version for mingw-w64 (linux distros should have them also)
# check for opensuse the buildbot system arch and ubuntu # check for opensuse the buildbot system arch and ubuntu
@ -119,6 +109,7 @@ endif()
../external/xxhash ../external/xxhash
../external/xxtea) ../external/xxtea)
add_library(cocos2d ${BUILD_TYPE} ${COCOS_SRC}) add_library(cocos2d ${BUILD_TYPE} ${COCOS_SRC})