Bläddra i källkod

Some Linux fixes - FIND_PACKAGE(FreeType) in the right scope for common includes to work.

Cameron Hart 14 år sedan
förälder
incheckning
83bbc92025

+ 1 - 0
Bindings/Contents/CMakeLists.txt

@@ -1,4 +1,5 @@
 FIND_PACKAGE(Lua51 REQUIRED)
+FIND_PACKAGE(Freetype REQUIRED)
     
 INCLUDE(PolycodeIncludes)
 

+ 2 - 2
CMake/PolycodeIncludes.cmake

@@ -14,10 +14,10 @@ INCLUDE_DIRECTORIES(
     ${Polycode_SOURCE_DIR}/Core/Contents/Include
     ${OPENGL_INCLUDE_DIR}
     ${OPENAL_INCLUDE_DIR}
-    ${FREETYPE_INCLUDE_DIR}
+    ${FREETYPE_INCLUDE_DIRS}
     ${PHYSFS_INCLUDE_DIR}
     ${OGG_INCLUDE_DIR}
     ${VORBISFILE_INCLUDE_DIR}
     ${PNG_INCLUDE_DIR}
     ${OPENGLEXT_INCLUDE_DIR}
-)
+)

+ 8 - 2
CMakeLists.txt

@@ -8,17 +8,23 @@ IF(NOT CMAKE_BUILD_TYPE)
     MESSAGE("No CMAKE_BUILD_TYPE specified, defaulting to ${CMAKE_BUILD_TYPE}") 
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
+IF(APPLE OR WIN32)
+	SET(build_player ON)
+ELSE()
+	SET(build_player OFF)
+ENDIF()
+
 # Options for what components to build
 OPTION(POLYCODE_BUILD_SHARED "Build Polycode shared libraries" ON)
 OPTION(POLYCODE_BUILD_STATIC "Build Polycode static libraries" OFF)
 OPTION(POLYCODE_BUILD_BINDINGS "Build Polycode Lua bindings" ON)
 OPTION(POLYCODE_BUILD_EXAMPLES "Build Polycode examples" ON)
 OPTION(POLYCODE_BUILD_MODULES "Build Polycode modules" ON)
-OPTION(POLYCODE_BUILD_PLAYER "Build Polycode standalone player" ON)
+OPTION(POLYCODE_BUILD_PLAYER "Build Polycode standalone player" ${build_player})
 OPTION(POLYCODE_BUILD_TOOLS "Build Polycode tools" ON)
 
 OPTION(POLYCODE_INSTALL_FRAMEWORK "Install Polycode Core, Modules and Tools" ON)
-OPTION(POLYCODE_INSTALL_PLAYER "Install Polycode Player" ON)
+OPTION(POLYCODE_INSTALL_PLAYER "Install Polycode Player" ${POLYCODE_BUILD_PLAYER})
 
 # Some non-standard CMake modules
 SET(CMAKE_MODULE_PATH ${Polycode_SOURCE_DIR}/CMake)

+ 2 - 0
Modules/Contents/2DPhysics/CMakeLists.txt

@@ -1,3 +1,5 @@
+FIND_PACKAGE(Freetype REQUIRED)
+
 INCLUDE(PolycodeIncludes)
 
 SET(polycode2DPhysics_SRCS