Merge branch 'master' into pxljm

CMake/ExternalBox2D.cmake

@@ -3,9 +3,9 @@ INCLUDE(ExternalProject)
 SET(box2d_PREFIX ${PROJECT_BINARY_DIR}/box2d)
 
 # Needs fpic to link in shared lib on Linux
-IF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(box2d_CXX_ARGS -DCMAKE_CXX_FLAGS=-fPIC)
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+#IF(CMAKE_COMPILER_IS_GNUCXX)
+#    SET(box2d_CXX_ARGS -DCMAKE_CXX_FLAGS=-fPIC)
+#ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 SET(box2d_CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>

CMake/ExternalBullet.cmake

@@ -12,10 +12,10 @@ SET(bullet_CMAKE_ARGS
     -DBUILD_UNIT_TESTS=OFF
 )
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
-    # Needs fpic to link in shared lib on Linux with GCC
-    LIST(APPEND bullet_CMAKE_ARGS -DCMAKE_CXX_FLAGS=-fPIC)
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+#IF(CMAKE_COMPILER_IS_GNUCXX)
+#    # Needs fpic to link in shared lib on Linux with GCC
+#    LIST(APPEND bullet_CMAKE_ARGS -DCMAKE_CXX_FLAGS=-fPIC)
+#ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 ExternalProject_Add(bullet
     PREFIX ${bullet_PREFIX}

Modules/Contents/2DPhysics/CMakeLists.txt

@@ -19,24 +19,23 @@ INCLUDE_DIRECTORIES(
 SET(CMAKE_DEBUG_POSTFIX "_d")
 
 #IF(POLYCODE_BUILD_SHARED)
-ADD_LIBRARY(Polycode2DPhysics SHARED ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
-TARGET_LINK_LIBRARIES(Polycode2DPhysics ${BOX2D_LIBRARIES})
-IF(APPLE)
-	TARGET_LINK_LIBRARIES(Polycode2DPhysics
-		Polycore
-		${OPENGL_LIBRARIES}
-		${OPENAL_LIBRARY}
-		${PNG_LIBRARIES}
-		${FREETYPE_LIBRARIES}
-		${PHYSFS_LIBRARY}
-		${VORBISFILE_LIBRARY}
-		"-framework Cocoa")
-ENDIF(APPLE)
+#ADD_LIBRARY(Polycode2DPhysics SHARED ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
+#TARGET_LINK_LIBRARIES(Polycode2DPhysics ${BOX2D_LIBRARIES})
+#IF(APPLE)
+#    TARGET_LINK_LIBRARIES(Polycode2DPhysics
+#        Polycore
+#        ${OPENGL_LIBRARIES}
+#        ${OPENAL_LIBRARY}
+#        ${PNG_LIBRARIES}
+#        ${FREETYPE_LIBRARIES}
+#        ${PHYSFS_LIBRARY}
+#        ${VORBISFILE_LIBRARY}
+#        "-framework Cocoa")
+#ENDIF(APPLE)
 #ENDIF(POLYCODE_BUILD_SHARED)
 
 #IF(POLYCODE_BUILD_STATIC)
-#    ADD_LIBRARY(Polycode2DPhysics_static ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
-#    TARGET_LINK_LIBRARIES(Polycode2DPhysics_static Polycore_static)
+ADD_LIBRARY(Polycode2DPhysics ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
 #ENDIF(POLYCODE_BUILD_STATIC)
 
 IF(POLYCODE_INSTALL_FRAMEWORK)

Modules/Contents/3DPhysics/CMakeLists.txt

@@ -23,24 +23,23 @@ INCLUDE_DIRECTORIES(
 SET(CMAKE_DEBUG_POSTFIX "_d")
 
 #IF(POLYCODE_BUILD_SHARED)
-ADD_LIBRARY(Polycode3DPhysics SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
-TARGET_LINK_LIBRARIES(Polycode3DPhysics ${BULLET_LIBRARIES})
-IF(APPLE)
-    TARGET_LINK_LIBRARIES(Polycode3DPhysics
-        Polycore
-	    ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-        ${PNG_LIBRARIES}
-        ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${VORBISFILE_LIBRARY}
-	   	"-framework Cocoa")
-ENDIF(APPLE)
+#ADD_LIBRARY(Polycode3DPhysics SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
+#TARGET_LINK_LIBRARIES(Polycode3DPhysics ${BULLET_LIBRARIES})
+#IF(APPLE)
+#    TARGET_LINK_LIBRARIES(Polycode3DPhysics
+#        Polycore
+#        ${OPENGL_LIBRARIES}
+#        ${OPENAL_LIBRARY}
+#        ${PNG_LIBRARIES}
+#        ${FREETYPE_LIBRARIES}
+#        ${PHYSFS_LIBRARY}
+#        ${VORBISFILE_LIBRARY}
+#        "-framework Cocoa")
+#ENDIF(APPLE)
 #ENDIF(POLYCODE_BUILD_SHARED)
 
 #IF(POLYCODE_BUILD_STATIC)
-#    ADD_LIBRARY(Polycode3DPhysics_static ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
-#    TARGET_LINK_LIBRARIES(Polycode3DPhysics_static Polycore_static)
+ADD_LIBRARY(Polycode3DPhysics ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
 #ENDIF(POLYCODE_BUILD_STATIC)
 
 IF(POLYCODE_INSTALL_FRAMEWORK)