From db2559ef677f1d9cf3f0dff7dbdb57a86415eaa9 Mon Sep 17 00:00:00 2001 From: andyque Date: Sat, 27 Sep 2014 01:26:35 -0700 Subject: [PATCH] add box2d tinyzml back --- CMakeLists.txt | 9 +-------- cmake/Modules/FindGLFW3.cmake | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa587a11ad..7af4207ac0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,13 +122,6 @@ else() message( FATAL_ERROR "Unsupported architecture, CMake will exit" ) endif() -if(LINUX) -set(PLATFORM_INCLUDE_DIR - /usr/include/ - /usr/local/include/GLFW -) -endif() - include_directories( ${PLATFORM_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cocos @@ -248,4 +241,4 @@ if(BUILD_LUA_LIBS) add_subdirectory(tests/lua-empty-test/project) endif(BUILD_LUA_TESTS) -endif(BUILD_LUA_LIBS) \ No newline at end of file +endif(BUILD_LUA_LIBS) diff --git a/cmake/Modules/FindGLFW3.cmake b/cmake/Modules/FindGLFW3.cmake index 937a8d0f52..07799b25cc 100644 --- a/cmake/Modules/FindGLFW3.cmake +++ b/cmake/Modules/FindGLFW3.cmake @@ -43,7 +43,7 @@ FIND_PATH(GLFW3_INCLUDE_DIR glfw3.h ) FIND_LIBRARY(GLFW3_LIBRARY - NAMES glfw3 libglfw3 + NAMES glfw3 libglfw3 glfw HINTS ENV GLFW3_DIR PATH_SUFFIXES lib