Re-enabled building modules and fixed up module CMakefiles.

CMakeLists.txt

@@ -11,7 +11,7 @@ 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" OFF)
+OPTION(POLYCODE_BUILD_MODULES "Build Polycode modules" ON)
 OPTION(POLYCODE_BUILD_TOOLS "Build Polycode tools" ON)
 
 # Some non-standard CMake modules

Core/Build/CMake/FindBox2D.cmake

@@ -11,7 +11,9 @@ IF(BOX2D_INCLUDE_DIR)
   SET(BOX2D_FIND_QUIETLY TRUE)
 ENDIF(BOX2D_INCLUDE_DIR)
 
-FIND_PATH(BOX2D_INCLUDE_DIR Box2D.h)
+FIND_PATH(BOX2D_INCLUDE_DIR Box2D.h
+  PATH_SUFFIXES include/Box2D include
+)
 
 SET(BOX2D_NAMES box2d Box2d BOX2D Box2D)
 FIND_LIBRARY(BOX2D_LIBRARY NAMES ${BOX2D_NAMES})

Modules/Contents/2DPhysics/CMakeLists.txt

@@ -10,9 +10,18 @@ SET(polycode2DPhysics_HDRS
 )
 
 INCLUDE_DIRECTORIES(
+    ${BOX2D_INCLUDE_DIRS}
     Include
 )
 
+IF(POLYCODE_BUILD_SHARED)
+LINK_LIBRARIES(${BOX2D_LIBRARIES})
 ADD_LIBRARY(Polycode2DPhysics SHARED ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
-ADD_LIBRARY(Polycode2DPhysicsStatic ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
+TARGET_LINK_LIBRARIES(Polycode2DPhysics PolyCore)
+ENDIF(POLYCODE_BUILD_SHARED)
+
+IF(POLYCODE_BUILD_STATIC)
+ADD_LIBRARY(Polycode2DPhysics_static ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
+TARGET_LINK_LIBRARIES(Polycode2DPhysics_static PolyCore_static)
+ENDIF(POLYCODE_BUILD_STATIC)
 

Modules/Contents/3DPhysics/CMakeLists.txt

@@ -14,10 +14,20 @@ SET(polycode3DPhysics_HDRS
 )
 
 INCLUDE_DIRECTORIES(
-    ../../Dependencies/Include/Bullet
+    ${BULLET_INCLUDE_DIRS}
     Include
 )
 
 #ADD_LIBRARY(Polycode3DPhysics SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
 ADD_LIBRARY(Polycode3DPhysicsStatic ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
 
+IF(POLYCODE_BUILD_SHARED)
+LINK_LIBRARIES(${BULLET_LIBRARIES})
+ADD_LIBRARY(Polycode3DPhysics SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
+TARGET_LINK_LIBRARIES(Polycode3DPhysics PolyCore)
+ENDIF(POLYCODE_BUILD_SHARED)
+
+IF(POLYCODE_BUILD_STATIC)
+ADD_LIBRARY(Polycode3DPhysics_static ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
+TARGET_LINK_LIBRARIES(Polycode3DPhysics_static PolyCore_static)
+ENDIF(POLYCODE_BUILD_STATIC)