Update all CMake files

CMakeLists.txt

@@ -26,5 +26,5 @@ add_subdirectory(samples)
 
 # gameplay encoder
 # A pre-compiled executable can be found in 'gameplay/bin'. Uncomment to build yourself.
-#add_subdirectory(tools/encoder)
-#add_subdirectory(tools/luagen)
+add_subdirectory(tools/encoder)
+add_subdirectory(tools/luagen)

gameplay/CMakeLists.txt

@@ -533,7 +533,6 @@ set(GAMEPLAY_RES_SHADERS
 include_directories(
     src
     ../external-deps/include
-    ../external-deps/include/bullet
 )
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")

samples/CMakeLists.txt

@@ -3,15 +3,14 @@ include(BuildHelpers.CMakeLists.txt)
 include_directories( 
     ${CMAKE_SOURCE_DIR}/gameplay/src
     ${CMAKE_SOURCE_DIR}/external-deps/include
-    ${CMAKE_SOURCE_DIR}/external-deps/include/bullet
 )
 
 add_definitions(-D__linux__)
 
 IF(ARCH_DIR STREQUAL "x64")
-    link_directories(${CMAKE_SOURCE_DIR}/external-deps/libs/Linux/x86_64)
+    link_directories(${CMAKE_SOURCE_DIR}/external-deps/lib/linux/x86_64)
 ELSE()
-    link_directories(${CMAKE_SOURCE_DIR}/external-deps/libs/Linux/x86)
+    link_directories(${CMAKE_SOURCE_DIR}/external-deps/lib/linux/x86)
 ENDIF(ARCH_DIR STREQUAL "x64")
 
 

template/template-CMakeLists.txt

@@ -12,7 +12,7 @@ else()
 endif()
 
 set(GAMEPLAY_SRC_PATH "GAMEPLAY_PATH") 
-set(GAMEPLAY_EXT_LIBS_PATH "${GAMEPLAY_SRC_PATH}/external-deps/libs")
+set(GAMEPLAY_EXT_LIBS_PATH "${GAMEPLAY_SRC_PATH}/external-deps/lib")
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
     ADD_DEFINITIONS(-D__linux__)
@@ -55,11 +55,12 @@ macro (append_gameplay_lib listToAppend)
 endmacro(append_gameplay_lib)
 
 macro (append_gameplay_ext_lib listToAppend libName libDirName)
+    string(TOLOWER ${CMAKE_SYSTEM_NAME} systemName)
     IF("${libDirName}" STREQUAL "")
 		find_library(FOUND_LIB_${libName} NAMES ${libName} ${ARGN})
     ELSE("${libDirName}" STREQUAL "")
         set(pathToSearch
-            "${GAMEPLAY_EXT_LIBS_PATH}/${CMAKE_SYSTEM_NAME}/${ARCH_DEPS_DIR}")
+            "${GAMEPLAY_EXT_LIBS_PATH}/${systemName}/${ARCH_DEPS_DIR}")
 		find_library(FOUND_LIB_${libName} NAMES ${libName} ${ARGN} HINTS ${pathToSearch})
     ENDIF("${libDirName}" STREQUAL "")
 
@@ -93,7 +94,6 @@ endmacro(copy_files)
 include_directories( 
     ${GAMEPLAY_SRC_PATH}/gameplay/src
     ${GAMEPLAY_SRC_PATH}/external-deps/include
-    ${GAMEPLAY_SRC_PATH}/external-deps/include/bullet
 )
 
 append_gameplay_lib(GAMEPLAY_LIBRARIES)

tools/encoder/CMakeLists.txt

@@ -1,7 +1,6 @@
 
 include_directories( 
     ${CMAKE_SOURCE_DIR}/external-deps/include
-    ${CMAKE_SOURCE_DIR}/external-deps/freetype2/include
     /usr/include/fbxsdk
 )
 
@@ -17,8 +16,7 @@ ELSE()
 ENDIF(ARCH_DIR STREQUAL "x64")
 
 link_directories(
-    ${CMAKE_SOURCE_DIR}/external-deps/libs/Linux/${ARCH_DEPS_DIR}
-    ${CMAKE_SOURCE_DIR}/external-deps/freetype2/lib/linux/${ARCH_DIR}
+    ${CMAKE_SOURCE_DIR}/external-deps/lib/linux/${ARCH_DEPS_DIR}
 )
 
 set(APP_LIBRARIES

tools/luagen/CMakeLists.txt

@@ -12,7 +12,7 @@ ELSE()
 ENDIF(ARCH_DIR STREQUAL "x64")
 
 link_directories(
-    ${CMAKE_SOURCE_DIR}/external-deps/libs/Linux/${ARCH_DEPS_DIR}
+    ${CMAKE_SOURCE_DIR}/external-deps/lib/linux/${ARCH_DEPS_DIR}
 )
 
 set(APP_LIBRARIES