Merge branch 'master' into pxljm

Core/Contents/Include/PolyGlobals.h

@@ -47,7 +47,7 @@ THE SOFTWARE.
 #define TODEGREES 57.2957795
 #define TORADIANS 0.0174532925
 
-#ifdef _WINDOWS
+#if defined(_WINDOWS) && defined(Polycore_EXPORTS)
 	#define _PolyExport __declspec(dllexport)
 #else
 	#define _PolyExport

Modules/Contents/2DPhysics/CMakeLists.txt

@@ -45,14 +45,14 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
 
     # install libraries
 #    IF(POLYCODE_BUILD_SHARED)
-	INSTALL(TARGETS Polycode2DPhysics EXPORT Polycode2DPhysics-targets
-		DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
+    INSTALL(TARGETS Polycode2DPhysics EXPORT Polycode2DPhysics-targets
+        DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
 #    ENDIF(POLYCODE_BUILD_SHARED)
 #    IF(POLYCODE_BUILD_STATIC)
 #        INSTALL(TARGETS Polycode2DPhysics_static DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
 #    ENDIF(POLYCODE_BUILD_STATIC)
 
-	INSTALL(EXPORT Polycode2DPhysics-targets DESTINATION
-		${POLYCODE_RELEASE_DIR}/Framework/Modules/lib/Polycode2DPhysics)
+    INSTALL(EXPORT Polycode2DPhysics-targets DESTINATION
+        ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib/Polycode2DPhysics)
     
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)