Tidied up includes and fixed some paths to Mac files.

Bindings/Contents/CMakeLists.txt

@@ -1,8 +1,6 @@
-FIND_PACKAGE(Lua51 REQUIRED)
-FIND_PACKAGE(Freetype REQUIRED)
-    
 INCLUDE(PolycodeIncludes)
 
+FIND_PACKAGE(Lua51 REQUIRED)
 INCLUDE_DIRECTORIES(
     ${LUA_INCLUDE_DIR}
     LUA/Include

CMake/PolycodeIncludes.cmake

@@ -9,6 +9,21 @@ ELSE(MSVC)
     INCLUDE_DIRECTORIES(${Polycode_SOURCE_DIR}/Core/Build/Linux)
 ENDIF(MSVC)
 
+FIND_PACKAGE(OpenGL REQUIRED)
+FIND_PACKAGE(PNG REQUIRED)
+FIND_PACKAGE(PhysFS REQUIRED)
+FIND_PACKAGE(OpenAL REQUIRED)
+FIND_PACKAGE(Freetype REQUIRED)
+FIND_PACKAGE(Ogg REQUIRED)
+FIND_PACKAGE(Vorbis REQUIRED)
+FIND_PACKAGE(VorbisFile REQUIRED)
+
+# Use SDL on non-Apple unixes
+IF(UNIX AND NOT APPLE)
+    FIND_PACKAGE(SDL REQUIRED)
+ENDIF(UNIX AND NOT APPLE)
+
+#
 # Set up common include directories
 INCLUDE_DIRECTORIES(
     ${Polycode_SOURCE_DIR}/Core/Contents/Include

Core/Contents/CMakeLists.txt

@@ -1,17 +1,3 @@
-FIND_PACKAGE(OpenGL REQUIRED)
-FIND_PACKAGE(PNG REQUIRED)
-FIND_PACKAGE(PhysFS REQUIRED)
-FIND_PACKAGE(OpenAL REQUIRED)
-FIND_PACKAGE(Freetype REQUIRED)
-FIND_PACKAGE(Ogg REQUIRED)
-FIND_PACKAGE(Vorbis REQUIRED)
-FIND_PACKAGE(VorbisFile REQUIRED)
-
-# Use SDL on non-Apple unixes
-IF(UNIX AND NOT APPLE)
-    FIND_PACKAGE(SDL REQUIRED)
-ENDIF(UNIX AND NOT APPLE)
-
 # set up common includes
 INCLUDE(PolycodeIncludes)
 
@@ -212,8 +198,8 @@ IF(MSVC)
     SET(polycore_SRCS ${polycore_SRCS} ../Build/MSVC/Polycore/PolycodeView.cpp Source/PolyWinCore.cpp)
     SET(polycore_HDRS ${polycore_HDRS} ../Build/MSVC/Polycore/PolycodeView.h Include/PolyWinCore.h)
 ELSEIF(APPLE)
-    SET(polycore_SRCS ${polycore_SRCS} Source/PolyAGLCore.cpp Source/PolyCocoaCore.cpp Source/PolycodeView.mm)
-    SET(polycore_HDRS ${polycore_HDRS} Include/PolyAGLCore.h Include/PolyCocoaCore.h Include/PolycodeView.h)
+    SET(polycore_SRCS ${polycore_SRCS} "../Build/Mac OS X/PolycodeView.mm" Source/PolyAGLCore.cpp Source/PolyCocoaCore.cpp)
+    SET(polycore_HDRS ${polycore_HDRS} "../Build/Mac OS X/PolycodeView.h" Include/PolyAGLCore.h Include/PolyCocoaCore.h)
 ELSE(MSVC)
     SET(polycore_SRCS ${polycore_SRCS} ../Build/Linux/PolycodeView.cpp Source/PolySDLCore.cpp)
     SET(polycore_HDRS ${polycore_HDRS} ../Build/Linux/PolycodeView.h Include/PolySDLCore.h)
@@ -256,4 +242,4 @@ IF(POLYCODE_INSTALL_PLAYER AND POLYCODE_BUILD_SHARED)
     INSTALL(TARGETS Polycore DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
     INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/Bin/ 
         DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
-ENDIF()
+ENDIF()

Modules/Contents/2DPhysics/CMakeLists.txt

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

Tools/Contents/polybuild/CMakeLists.txt

@@ -1,7 +1,6 @@
-FIND_PACKAGE(ZLIB)
-
 INCLUDE(PolycodeIncludes)
 
+FIND_PACKAGE(ZLIB)
 INCLUDE_DIRECTORIES(
     ${ZLIB_INCLUDE_DIR}
     ${Polycode_SOURCE_DIR}/Tools/Dependencies/unzip11 

Tools/Contents/polyimport/CMakeLists.txt

@@ -1,7 +1,6 @@
-FIND_PACKAGE(Assimp REQUIRED)
-
 INCLUDE(PolycodeIncludes)
 
+FIND_PACKAGE(Assimp REQUIRED)
 INCLUDE_DIRECTORIES(
     ${ASSIMP_INCLUDE_DIR} 
     Include)
@@ -10,12 +9,12 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 
 IF(POLYCODE_BUILD_SHARED)
     ADD_EXECUTABLE(polyimport Source/polyimport.cpp Include/polyimport.h)
-    TARGET_LINK_LIBRARIES(polyimport Polycore ${ASSIMP_LIBRARY_RELEASE})
+    TARGET_LINK_LIBRARIES(polyimport Polycore ${ASSIMP_LIBRARIES})
 ENDIF(POLYCODE_BUILD_SHARED)
 
 IF(POLYCODE_BUILD_STATIC)
     ADD_EXECUTABLE(polyimport_static Source/polyimport.cpp Include/polyimport.h)
-    TARGET_LINK_LIBRARIES(polyimport_static Polycore_static ${PHYSFS_LIBRARY} ${ASSIMP_LIBRARY_RELEASE})
+    TARGET_LINK_LIBRARIES(polyimport_static Polycore_static ${PHYSFS_LIBRARY} ${ASSIMP_LIBRARIES}})
 ENDIF(POLYCODE_BUILD_STATIC)
 
 IF(POLYCODE_INSTALL_FRAMEWORK)