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

add box2d tinyzml back

This commit is contained in:
andyque 2014-09-27 01:26:35 -07:00
parent 99dddc1247
commit db2559ef67
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -122,13 +122,6 @@ else()
message( FATAL_ERROR "Unsupported architecture, CMake will exit" ) message( FATAL_ERROR "Unsupported architecture, CMake will exit" )
endif() endif()
if(LINUX)
set(PLATFORM_INCLUDE_DIR
/usr/include/
/usr/local/include/GLFW
)
endif()
include_directories( include_directories(
${PLATFORM_INCLUDE_DIR} ${PLATFORM_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cocos ${CMAKE_CURRENT_SOURCE_DIR}/cocos
@ -248,4 +241,4 @@ if(BUILD_LUA_LIBS)
add_subdirectory(tests/lua-empty-test/project) add_subdirectory(tests/lua-empty-test/project)
endif(BUILD_LUA_TESTS) endif(BUILD_LUA_TESTS)
endif(BUILD_LUA_LIBS) endif(BUILD_LUA_LIBS)

2
cmake/Modules/FindGLFW3.cmake
View File

@ -43,7 +43,7 @@ FIND_PATH(GLFW3_INCLUDE_DIR glfw3.h
) )
FIND_LIBRARY(GLFW3_LIBRARY FIND_LIBRARY(GLFW3_LIBRARY
NAMES glfw3 libglfw3 NAMES glfw3 libglfw3 glfw
HINTS HINTS
ENV GLFW3_DIR ENV GLFW3_DIR
PATH_SUFFIXES lib PATH_SUFFIXES lib