Merge branch 'master' into pxljm

Core/Contents/CMakeLists.txt

@@ -202,10 +202,6 @@ ELSEIF(APPLE)
 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)
-    # Needs fpic to link in shared lib on Linux
-    IF(CMAKE_COMPILER_IS_GNUCXX)
-		LIST(APPEND CMAKE_CXX_FLAGS -fPIC)
-    ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(MSVC)
 
 #IF(POLYCODE_BUILD_SHARED)

Modules/Contents/2DPhysics/CMakeLists.txt

@@ -20,17 +20,17 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 
 #IF(POLYCODE_BUILD_SHARED)
 ADD_LIBRARY(Polycode2DPhysics SHARED ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
-TARGET_LINK_LIBRARIES(Polycode2DPhysics 
-    Polycore 
-    ${BOX2D_LIBRARIES}
-    ${OPENGL_LIBRARIES}
-    ${OPENAL_LIBRARY}
-    ${PNG_LIBRARIES}
-    ${FREETYPE_LIBRARIES}
-    ${PHYSFS_LIBRARY}
-    ${VORBISFILE_LIBRARY})
+TARGET_LINK_LIBRARIES(Polycode2DPhysics ${BOX2D_LIBRARIES})
 IF(APPLE)
-    TARGET_LINK_LIBRARIES(Polycode2DPhysics "-framework Cocoa")
+	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)
 

Modules/Contents/3DPhysics/CMakeLists.txt

@@ -24,17 +24,17 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 
 #IF(POLYCODE_BUILD_SHARED)
 ADD_LIBRARY(Polycode3DPhysics SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
-TARGET_LINK_LIBRARIES(Polycode3DPhysics 
-    Polycore
-    ${BULLET_LIBRARIES}
-    ${OPENGL_LIBRARIES}
-    ${OPENAL_LIBRARY}
-    ${PNG_LIBRARIES}
-    ${FREETYPE_LIBRARIES}
-    ${PHYSFS_LIBRARY}
-    ${VORBISFILE_LIBRARY})
+TARGET_LINK_LIBRARIES(Polycode3DPhysics ${BULLET_LIBRARIES})
 IF(APPLE)
-    TARGET_LINK_LIBRARIES(Polycode3DPhysics "-framework Cocoa")
+    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)