Răsfoiți Sursa

Compile all libs as static except for Modules.

Cameron Hart 14 ani în urmă
părinte
comite
246f876526

+ 9 - 13
Bindings/Contents/CMakeLists.txt

@@ -24,12 +24,8 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 #ENDIF(POLYCODE_BUILD_SHARED)
 #ENDIF(POLYCODE_BUILD_SHARED)
 
 
 #IF(POLYCODE_BUILD_STATIC)
 #IF(POLYCODE_BUILD_STATIC)
-#    ADD_LIBRARY(PolycodeLua_static ${polycodeLua_SRCS} ${polycodeLua_HDRS})
-#    TARGET_LINK_LIBRARIES(PolycodeLua_static Polycore_static)
-#ENDIF(POLYCODE_BUILD_STATIC)
-
 ADD_LIBRARY(PolycodeLua ${polycodeLua_SRCS} ${polycodeLua_HDRS})
 ADD_LIBRARY(PolycodeLua ${polycodeLua_SRCS} ${polycodeLua_HDRS})
-TARGET_LINK_LIBRARIES(PolycodeLua)
+#ENDIF(POLYCODE_BUILD_STATIC)
 
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
 IF(POLYCODE_INSTALL_FRAMEWORK)
     
     
@@ -38,14 +34,14 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
         DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/include)
         DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/include)
 
 
     # install libraries
     # install libraries
-    IF(POLYCODE_BUILD_SHARED)
-        INSTALL(TARGETS PolycodeLua 
-            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
-    ENDIF(POLYCODE_BUILD_SHARED)
+#    IF(POLYCODE_BUILD_SHARED)
+#        INSTALL(TARGETS PolycodeLua_dynamic
+#            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
+#    ENDIF(POLYCODE_BUILD_SHARED)
     
     
-    IF(POLYCODE_BUILD_STATIC)
-        INSTALL(TARGETS PolycodeLua_static 
-            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
-    ENDIF(POLYCODE_BUILD_STATIC)
+#    IF(POLYCODE_BUILD_STATIC)
+     INSTALL(TARGETS PolycodeLua 
+         DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
+#    ENDIF(POLYCODE_BUILD_STATIC)
     
     
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)

+ 9 - 9
CMakeLists.txt

@@ -9,19 +9,19 @@ IF(NOT CMAKE_BUILD_TYPE)
     MESSAGE("No CMAKE_BUILD_TYPE specified, defaulting to ${CMAKE_BUILD_TYPE}")
     MESSAGE("No CMAKE_BUILD_TYPE specified, defaulting to ${CMAKE_BUILD_TYPE}")
 ENDIF(NOT CMAKE_BUILD_TYPE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
 
-IF(APPLE OR WIN32)
-    SET(build_player OFF)
-ELSE()
-    SET(build_player OFF)
-ENDIF()
+#IF(APPLE OR WIN32)
+#    SET(build_player OFF)
+#ELSE()
+#    SET(build_player OFF)
+#ENDIF()
 
 
 # Options for what components to build
 # Options for what components to build
-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_SHARED "Build Polycode shared libraries" OFF)
+#OPTION(POLYCODE_BUILD_STATIC "Build Polycode static libraries" ON)
+OPTION(POLYCODE_BUILD_BINDINGS "Build Polycode Lua bindings" OFF)
 OPTION(POLYCODE_BUILD_EXAMPLES "Build Polycode examples" ON)
 OPTION(POLYCODE_BUILD_EXAMPLES "Build Polycode examples" ON)
 OPTION(POLYCODE_BUILD_MODULES "Build Polycode modules" ON)
 OPTION(POLYCODE_BUILD_MODULES "Build Polycode modules" ON)
-OPTION(POLYCODE_BUILD_PLAYER "Build Polycode standalone player" ${build_player})
+OPTION(POLYCODE_BUILD_PLAYER "Build Polycode standalone player" OFF)
 OPTION(POLYCODE_BUILD_TOOLS "Build Polycode tools" ON)
 OPTION(POLYCODE_BUILD_TOOLS "Build Polycode tools" ON)
 
 
 OPTION(POLYCODE_INSTALL_FRAMEWORK "Install Polycode Core, Modules and Tools" ON)
 OPTION(POLYCODE_INSTALL_FRAMEWORK "Install Polycode Core, Modules and Tools" ON)

+ 31 - 28
Core/Contents/CMakeLists.txt

@@ -204,24 +204,24 @@ ELSE(MSVC)
     SET(polycore_HDRS ${polycore_HDRS} ../Build/Linux/PolycodeView.h Include/PolySDLCore.h)
     SET(polycore_HDRS ${polycore_HDRS} ../Build/Linux/PolycodeView.h Include/PolySDLCore.h)
 ENDIF(MSVC)
 ENDIF(MSVC)
 
 
-IF(POLYCODE_BUILD_SHARED)
-    ADD_LIBRARY(Polycore SHARED ${polycore_SRCS} ${polycore_HDRS})
-    TARGET_LINK_LIBRARIES(Polycore
-        ${OPENGL_LIBRARIES}
-        ${OPENAL_LIBRARY}
-        ${PNG_LIBRARIES}
-        ${FREETYPE_LIBRARIES}
-        ${PHYSFS_LIBRARY}
-        ${OGG_LIBRARIES}
-        ${VORBIS_LIBRARIES}
-        ${VORBISFILE_LIBRARIES}
-        ${SDL_LIBRARY}
-        ${EXTRA_LIBS})
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#    ADD_LIBRARY(Polycore_dynamic SHARED ${polycore_SRCS} ${polycore_HDRS})
+#    TARGET_LINK_LIBRARIES(Polycore_dynamic
+#        ${OPENGL_LIBRARIES}
+#        ${OPENAL_LIBRARY}
+#        ${PNG_LIBRARIES}
+#        ${FREETYPE_LIBRARIES}
+#        ${PHYSFS_LIBRARY}
+#        ${OGG_LIBRARIES}
+#        ${VORBIS_LIBRARIES}
+#        ${VORBISFILE_LIBRARIES}
+#        ${SDL_LIBRARY}
+#        ${EXTRA_LIBS})
+#ENDIF(POLYCODE_BUILD_SHARED)
 
 
-IF(POLYCODE_BUILD_STATIC)
-    ADD_LIBRARY(Polycore_static ${polycore_SRCS} ${polycore_HDRS})
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_LIBRARY(Polycore ${polycore_SRCS} ${polycore_HDRS})
+#ENDIF(POLYCODE_BUILD_STATIC)
 
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
 IF(POLYCODE_INSTALL_FRAMEWORK)
     # install headers
     # install headers
@@ -229,20 +229,23 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
         DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/include)
         DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/include)
 
 
     # install libraries
     # install libraries
-    IF(POLYCODE_BUILD_SHARED)
-        INSTALL(TARGETS Polycore EXPORT Polycore-targets 
-            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/lib)
-    ENDIF(POLYCODE_BUILD_SHARED)
+#    IF(POLYCODE_BUILD_SHARED)
+#        INSTALL(TARGETS Polycore_dynamic EXPORT Polycore-targets 
+#            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/lib)
+#    ENDIF(POLYCODE_BUILD_SHARED)
     
     
-    IF(POLYCODE_BUILD_STATIC)
-        INSTALL(TARGETS Polycore_static EXPORT Polycore-targets 
+#    IF(POLYCODE_BUILD_STATIC)
+        INSTALL(TARGETS Polycore EXPORT Polycore-targets 
             DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/lib)
             DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/lib)
-    ENDIF(POLYCODE_BUILD_STATIC)
+#    ENDIF(POLYCODE_BUILD_STATIC)
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)
 
 
-IF(POLYCODE_INSTALL_PLAYER AND POLYCODE_BUILD_SHARED)
-    # install required libs
-    INSTALL(TARGETS Polycore DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
+IF(POLYCODE_INSTALL_PLAYER)
+    # install core libs for player
+#    IF(POLYCODE_BUILD_SHARED)
+#        INSTALL(TARGETS Polycore_dynamic DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
+#    END(POLYCODE_BUILD_SHARED)
+    
     INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/bin/ 
     INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/bin/ 
         DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
         DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
-ENDIF()
+ENDIF(POLYCODE_INSTALL_PLAYER)

+ 8 - 8
Examples/C++/2DShapes/CMakeLists.txt

@@ -1,11 +1,11 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(.)
 
 
-IF(POLYCODE_BUILD_SHARED)
-    ADD_EXECUTABLE(2DShapes ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-    TARGET_LINK_LIBRARIES(2DShapes Polycore)
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#    ADD_EXECUTABLE(2DShapes_dynamic ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+#    TARGET_LINK_LIBRARIES(2DShapes_dynamic Polycore_dynamic)
+#ENDIF(POLYCODE_BUILD_SHARED)
 
 
-IF(POLYCODE_BUILD_STATIC)
-    ADD_EXECUTABLE(2DShapes_static ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(2DShapes_static Polycore_static)
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_EXECUTABLE(2DShapes ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+TARGET_LINK_LIBRARIES(2DShapes Polycore)
+#ENDIF(POLYCODE_BUILD_STATIC)

+ 8 - 8
Examples/C++/2DTransforms/CMakeLists.txt

@@ -1,12 +1,12 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(.)
 
 
-IF(POLYCODE_BUILD_SHARED)
-	ADD_EXECUTABLE(2DTransforms ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(2DTransforms Polycore)
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#	ADD_EXECUTABLE(2DTransforms_dynamic ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+#	TARGET_LINK_LIBRARIES(2DTransforms_dynamic Polycore_dynamic)
+#ENDIF(POLYCODE_BUILD_SHARED)
 
 
-IF(POLYCODE_BUILD_STATIC)
-	ADD_EXECUTABLE(2DTransforms_static ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(2DTransforms_static Polycore_static)
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_EXECUTABLE(2DTransforms ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+TARGET_LINK_LIBRARIES(2DTransforms Polycore)
+#ENDIF(POLYCODE_BUILD_STATIC)
 
 

+ 8 - 8
Examples/C++/3DAudio/CMakeLists.txt

@@ -1,12 +1,12 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(.)
 
 
-IF(POLYCODE_BUILD_SHARED)
-	ADD_EXECUTABLE(3DAudio ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(3DAudio Polycore)
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#	ADD_EXECUTABLE(3DAudio_dynamic ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+#	TARGET_LINK_LIBRARIES(3DAudio_dynamic Polycore_dynamic)
+#ENDIF(POLYCODE_BUILD_SHARED)
 
 
-IF(POLYCODE_BUILD_STATIC)
-	ADD_EXECUTABLE(3DAudio_static ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(3DAudio_static Polycore_static)
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_EXECUTABLE(3DAudio ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+TARGET_LINK_LIBRARIES(3DAudio Polycore)
+#ENDIF(POLYCODE_BUILD_STATIC)
 
 

+ 8 - 8
Examples/C++/AdvancedLighting/CMakeLists.txt

@@ -1,12 +1,12 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(.)
 
 
-IF(POLYCODE_BUILD_SHARED)
-	ADD_EXECUTABLE(AdvancedLighting ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(AdvancedLighting Polycore)
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#	ADD_EXECUTABLE(AdvancedLighting_dynamic ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+#	TARGET_LINK_LIBRARIES(AdvancedLighting_dynamic Polycore_dynamic)
+#ENDIF(POLYCODE_BUILD_SHARED)
 
 
-IF(POLYCODE_BUILD_STATIC)
-	ADD_EXECUTABLE(AdvancedLighting_static ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(AdvancedLighting_static Polycore_static)
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_EXECUTABLE(AdvancedLighting ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+TARGET_LINK_LIBRARIES(AdvancedLighting Polycore)
+#ENDIF(POLYCODE_BUILD_STATIC)
 
 

+ 8 - 8
Examples/C++/BasicImage/CMakeLists.txt

@@ -1,12 +1,12 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(.)
 
 
-IF(POLYCODE_BUILD_SHARED)
-	ADD_EXECUTABLE(BasicImage ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(BasicImage Polycore)
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#	ADD_EXECUTABLE(BasicImage_dynamic ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+#	TARGET_LINK_LIBRARIES(BasicImage_dynamic Polycore_dynamic)
+#ENDIF(POLYCODE_BUILD_SHARED)
 
 
-IF(POLYCODE_BUILD_STATIC)
-	ADD_EXECUTABLE(BasicImage_static ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(BasicImage_static Polycore_static)
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_EXECUTABLE(BasicImage ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+TARGET_LINK_LIBRARIES(BasicImage Polycore)
+#ENDIF(POLYCODE_BUILD_STATIC)
 
 

+ 8 - 8
Examples/C++/BasicLighting/CMakeLists.txt

@@ -1,11 +1,11 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(.)
 
 
-IF(POLYCODE_BUILD_SHARED)
-	ADD_EXECUTABLE(BasicLighting ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(BasicLighting Polycore)
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#	ADD_EXECUTABLE(BasicLighting_dynamic ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+#	TARGET_LINK_LIBRARIES(BasicLighting_dynamic Polycore_dynamic)
+#ENDIF(POLYCODE_BUILD_SHARED)
 
 
-IF(POLYCODE_BUILD_STATIC)
-	ADD_EXECUTABLE(BasicLighting_static ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(BasicLighting_static Polycore_static)
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_EXECUTABLE(BasicLighting ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+TARGET_LINK_LIBRARIES(BasicLighting Polycore)
+#ENDIF(POLYCODE_BUILD_STATIC)

+ 8 - 8
Examples/C++/BasicText/CMakeLists.txt

@@ -1,11 +1,11 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(.)
 
 
-IF(POLYCODE_BUILD_SHARED)
-	ADD_EXECUTABLE(BasicText ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(BasicText Polycore)
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#	ADD_EXECUTABLE(BasicText_dynamic ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+#	TARGET_LINK_LIBRARIES(BasicText_dynamic Polycore_dynamic)
+#ENDIF(POLYCODE_BUILD_SHARED)
 
 
-IF(POLYCODE_BUILD_STATIC)
-	ADD_EXECUTABLE(BasicText_static ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(BasicText_static Polycore_static)
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_EXECUTABLE(BasicText ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+TARGET_LINK_LIBRARIES(BasicText Polycore)
+#ENDIF(POLYCODE_BUILD_STATIC)

+ 4 - 5
Examples/C++/CMakeLists.txt

@@ -1,6 +1,7 @@
 INCLUDE(PolycodeIncludes)
 INCLUDE(PolycodeIncludes)
 
 
-IF(POLYCODE_BUILD_STATIC)
+# Only build if using SDL
+IF(SDL_FOUND)
     LINK_LIBRARIES(
     LINK_LIBRARIES(
         ${OPENGL_LIBRARIES}
         ${OPENGL_LIBRARIES}
         ${OPENAL_LIBRARY}
         ${OPENAL_LIBRARY}
@@ -8,12 +9,10 @@ IF(POLYCODE_BUILD_STATIC)
         ${FREETYPE_LIBRARIES}
         ${FREETYPE_LIBRARIES}
         ${PHYSFS_LIBRARY}
         ${PHYSFS_LIBRARY}
         ${VORBISFILE_LIBRARY}
         ${VORBISFILE_LIBRARY}
+        ${SDL_LIBRARY} 
+        ${SDLMAIN_LIBRARY}
     )
     )
-ENDIF(POLYCODE_BUILD_STATIC)
 
 
-# Only build if using SDL
-IF(SDL_FOUND)
-    LINK_LIBRARIES(${SDL_LIBRARY} ${SDLMAIN_LIBRARY})
     ADD_SUBDIRECTORY(2DShapes)
     ADD_SUBDIRECTORY(2DShapes)
     ADD_SUBDIRECTORY(2DTransforms)
     ADD_SUBDIRECTORY(2DTransforms)
     ADD_SUBDIRECTORY(3DAudio)
     ADD_SUBDIRECTORY(3DAudio)

+ 8 - 8
Examples/C++/ScreenEntities/CMakeLists.txt

@@ -1,11 +1,11 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(.)
 
 
-IF(POLYCODE_BUILD_SHARED)
-	ADD_EXECUTABLE(ScreenEntities ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(ScreenEntities Polycore)
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#	ADD_EXECUTABLE(ScreenEntities_dynamic ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+#	TARGET_LINK_LIBRARIES(ScreenEntities_dynamic Polycore_dynamic)
+#ENDIF(POLYCODE_BUILD_SHARED)
 
 
-IF(POLYCODE_BUILD_STATIC)
-	ADD_EXECUTABLE(ScreenEntities_static ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(ScreenEntities_static Polycore_static)
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_EXECUTABLE(ScreenEntities ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+TARGET_LINK_LIBRARIES(ScreenEntities Polycore)
+#ENDIF(POLYCODE_BUILD_STATIC)

+ 8 - 8
Examples/C++/ScreenSprites/CMakeLists.txt

@@ -1,11 +1,11 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(.)
 
 
-IF(POLYCODE_BUILD_SHARED)
-	ADD_EXECUTABLE(ScreenSprites ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(ScreenSprites Polycore)
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#	ADD_EXECUTABLE(ScreenSprites_dynamic ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+#	TARGET_LINK_LIBRARIES(ScreenSprites_dynamic Polycore_dynamic)
+#ENDIF(POLYCODE_BUILD_SHARED)
 
 
-IF(POLYCODE_BUILD_STATIC)
-	ADD_EXECUTABLE(ScreenSprites_static ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(ScreenSprites_static Polycore_static)
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_EXECUTABLE(ScreenSprites ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+TARGET_LINK_LIBRARIES(ScreenSprites Polycore)
+#ENDIF(POLYCODE_BUILD_STATIC)

+ 8 - 8
Examples/C++/SkeletalAnimation/CMakeLists.txt

@@ -1,11 +1,11 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(.)
 
 
-IF(POLYCODE_BUILD_SHARED)
-	ADD_EXECUTABLE(SkeletalAnimation ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(SkeletalAnimation Polycore)
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#	ADD_EXECUTABLE(SkeletalAnimation_dynamic ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+#	TARGET_LINK_LIBRARIES(SkeletalAnimation_dynamic Polycore_dynamic)
+#ENDIF(POLYCODE_BUILD_SHARED)
 
 
-IF(POLYCODE_BUILD_STATIC)
-	ADD_EXECUTABLE(SkeletalAnimation_static ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(SkeletalAnimation_static Polycore_static)
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_EXECUTABLE(SkeletalAnimation ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
+TARGET_LINK_LIBRARIES(SkeletalAnimation Polycore)
+#ENDIF(POLYCODE_BUILD_STATIC)

+ 14 - 15
Modules/Contents/2DPhysics/CMakeLists.txt

@@ -18,16 +18,15 @@ INCLUDE_DIRECTORIES(
 
 
 SET(CMAKE_DEBUG_POSTFIX "_d")
 SET(CMAKE_DEBUG_POSTFIX "_d")
 
 
-IF(POLYCODE_BUILD_SHARED)
-    LINK_LIBRARIES(${BOX2D_LIBRARIES})
-    ADD_LIBRARY(Polycode2DPhysics SHARED ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
-    TARGET_LINK_LIBRARIES(Polycode2DPhysics Polycore)
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+ADD_LIBRARY(Polycode2DPhysics SHARED ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
+TARGET_LINK_LIBRARIES(Polycode2DPhysics ${BOX2D_LIBRARIES})
+#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)
+#IF(POLYCODE_BUILD_STATIC)
+#    ADD_LIBRARY(Polycode2DPhysics_static ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
+#    TARGET_LINK_LIBRARIES(Polycode2DPhysics_static Polycore_static)
+#ENDIF(POLYCODE_BUILD_STATIC)
 
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
 IF(POLYCODE_INSTALL_FRAMEWORK)
     
     
@@ -35,11 +34,11 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
     INSTALL(FILES ${polycode2DPhysics_HDRS} DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/include)
     INSTALL(FILES ${polycode2DPhysics_HDRS} DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/include)
 
 
     # install libraries
     # install libraries
-    IF(POLYCODE_BUILD_SHARED)
-        INSTALL(TARGETS Polycode2DPhysics 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)
+#    IF(POLYCODE_BUILD_SHARED)
+    INSTALL(TARGETS Polycode2DPhysics 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)
     
     
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)

+ 17 - 18
Modules/Contents/3DPhysics/CMakeLists.txt

@@ -22,29 +22,28 @@ INCLUDE_DIRECTORIES(
 
 
 SET(CMAKE_DEBUG_POSTFIX "_d")
 SET(CMAKE_DEBUG_POSTFIX "_d")
 
 
-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_SHARED)
+ADD_LIBRARY(Polycode3DPhysics SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
+TARGET_LINK_LIBRARIES(Polycode3DPhysics ${BULLET_LIBRARIES})
+#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)
+#IF(POLYCODE_BUILD_STATIC)
+#    ADD_LIBRARY(Polycode3DPhysics_static ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
+#    TARGET_LINK_LIBRARIES(Polycode3DPhysics_static Polycore_static)
+#ENDIF(POLYCODE_BUILD_STATIC)
 
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
 IF(POLYCODE_INSTALL_FRAMEWORK)
     # install headers
     # install headers
     INSTALL(FILES ${polycode3DPhysics_HDRS} 
     INSTALL(FILES ${polycode3DPhysics_HDRS} 
         DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/include)
         DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/include)
 
 
-    # install libraries
-    IF(POLYCODE_BUILD_SHARED)
-        INSTALL(TARGETS Polycode3DPhysics 
-            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
-    ENDIF()
-    IF(POLYCODE_BUILD_STATIC)
-        INSTALL(TARGETS Polycode3DPhysics_static 
-            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
-    ENDIF()
+     # install libraries
+#    IF(POLYCODE_BUILD_SHARED)
+     INSTALL(TARGETS Polycode3DPhysics 
+         DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
+#    ENDIF()
+#    IF(POLYCODE_BUILD_STATIC)
+#        INSTALL(TARGETS Polycode3DPhysics_static 
+#            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
+#    ENDIF()
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)

+ 25 - 26
Player/Contents/CMakeLists.txt

@@ -24,15 +24,15 @@ IF(MSVC)
     
     
     INCLUDE_DIRECTORIES(../Build/MSVC/PolycodePlayer Include)
     INCLUDE_DIRECTORIES(../Build/MSVC/PolycodePlayer Include)
     
     
-    IF(POLYCODE_BUILD_SHARED)
-        ADD_EXECUTABLE(PolycodePlayer WIN32 ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
-        TARGET_LINK_LIBRARIES(PolycodePlayer Polycore PolycodeLua ${LUA_LIBRARY})
-    ENDIF(POLYCODE_BUILD_SHARED)
+ #   IF(POLYCODE_BUILD_SHARED)
+ #       ADD_EXECUTABLE(PolycodePlayer_dynamic WIN32 ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
+ #       TARGET_LINK_LIBRARIES(PolycodePlayer Polycore_dynamic PolycodeLua ${LUA_LIBRARY})
+ #   ENDIF(POLYCODE_BUILD_SHARED)
 
 
-    IF(POLYCODE_BUILD_STATIC)
-        ADD_EXECUTABLE(PolycodePlayer_static WIN32 ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
-        TARGET_LINK_LIBRARIES(PolycodePlayer_static Polycore_static PolycodeLua_static ${LUA_LIBRARY})
-    ENDIF(POLYCODE_BUILD_STATIC)
+ #   IF(POLYCODE_BUILD_STATIC)
+    ADD_EXECUTABLE(PolycodePlayer WIN32 ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
+    TARGET_LINK_LIBRARIES(PolycodePlayer Polycore PolycodeLua ${LUA_LIBRARY})
+ #   ENDIF(POLYCODE_BUILD_STATIC)
     
     
 ELSEIF(APPLE)
 ELSEIF(APPLE)
     SET(polycodeplayer_SRCS 
     SET(polycodeplayer_SRCS 
@@ -47,27 +47,26 @@ ELSEIF(APPLE)
     
     
     INCLUDE_DIRECTORIES(Include)
     INCLUDE_DIRECTORIES(Include)
     
     
-    IF(POLYCODE_BUILD_SHARED)
-        ADD_EXECUTABLE(PolycodePlayer MACOSX_BUNDLE ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
-        TARGET_LINK_LIBRARIES(PolycodePlayer Polycore PolycodeLua ${LUA_LIBRARY})
-    ENDIF(POLYCODE_BUILD_SHARED)
+#    IF(POLYCODE_BUILD_SHARED)
+#        ADD_EXECUTABLE(PolycodePlayer MACOSX_BUNDLE ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
+#        TARGET_LINK_LIBRARIES(PolycodePlayer Polycore PolycodeLua ${LUA_LIBRARY})
+#    ENDIF(POLYCODE_BUILD_SHARED)
 
 
-    IF(POLYCODE_BUILD_STATIC)
-        ADD_EXECUTABLE(PolycodePlayer_static MACOSX_BUNDLE ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
-        TARGET_LINK_LIBRARIES(PolycodePlayer_static Polycore_static PolycodeLua ${LUA_LIBRARY})
-    ENDIF(POLYCODE_BUILD_STATIC)
+#    IF(POLYCODE_BUILD_STATIC)
+    ADD_EXECUTABLE(PolycodePlayer MACOSX_BUNDLE ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
+    TARGET_LINK_LIBRARIES(PolycodePlayer Polycore PolycodeLua ${LUA_LIBRARY})
+#    ENDIF(POLYCODE_BUILD_STATIC)
 
 
 ENDIF(MSVC)
 ENDIF(MSVC)
 
 
 IF(POLYCODE_INSTALL_PLAYER)
 IF(POLYCODE_INSTALL_PLAYER)
-
-    IF(POLYCODE_BUILD_SHARED)
-        # install player
-        INSTALL(TARGETS PolycodePlayer 
-            DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
-    ENDIF()
-    IF(POLYCODE_BUILD_STATIC)
-        INSTALL(TARGETS PolycodePlayer_static 
-            DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
-    ENDIF()
+#    IF(POLYCODE_BUILD_SHARED)
+#        # install player
+#        INSTALL(TARGETS PolycodePlayer_dynamic
+#            DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
+#    ENDIF()
+#    IF(POLYCODE_BUILD_STATIC)
+    INSTALL(TARGETS PolycodePlayer 
+        DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
+#    ENDIF()
 ENDIF(POLYCODE_INSTALL_PLAYER)
 ENDIF(POLYCODE_INSTALL_PLAYER)

+ 14 - 14
Tools/Contents/polybuild/CMakeLists.txt

@@ -13,25 +13,25 @@ SET(minizip_SRCS
     ../../Dependencies/unzip11/zip.h
     ../../Dependencies/unzip11/zip.h
 )
 )
 
 
-IF(POLYCODE_BUILD_SHARED)
-    LINK_LIBRARIES(Polycore)
-    ADD_EXECUTABLE(polybuild ${minizip_SRCS} Source/polybuild.cpp Include/polybuild.h)
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#    LINK_LIBRARIES(Polycore)
+#    ADD_EXECUTABLE(polybuild ${minizip_SRCS} Source/polybuild.cpp Include/polybuild.h)
+#ENDIF(POLYCODE_BUILD_SHARED)
 
 
-IF(POLYCODE_BUILD_STATIC)
-    LINK_LIBRARIES(Polycore_static)
-    ADD_EXECUTABLE(polybuild_static ${minizip_SRCS} Source/polybuild.cpp Include/polybuild.h)
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_EXECUTABLE(polybuild ${minizip_SRCS} Source/polybuild.cpp Include/polybuild.h)
+TARGET_LINK_LIBRARIES(polybuild Polycore ${PHYSFS_LIBRARY})
+#ENDIF(POLYCODE_BUILD_STATIC)
 
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
 IF(POLYCODE_INSTALL_FRAMEWORK)
 
 
     # install exes
     # install exes
-    IF(POLYCODE_BUILD_SHARED)
-        INSTALL(TARGETS polybuild DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Tools)
-    ENDIF(POLYCODE_BUILD_SHARED)
+#    IF(POLYCODE_BUILD_SHARED)
+#        INSTALL(TARGETS polybuild_dynamic DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Tools)
+#    ENDIF(POLYCODE_BUILD_SHARED)
     
     
-    IF(POLYCODE_BUILD_STATIC)
-        INSTALL(TARGETS polybuild_static DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Tools)
-    ENDIF(POLYCODE_BUILD_STATIC)
+#    IF(POLYCODE_BUILD_STATIC)
+        INSTALL(TARGETS polybuild DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Tools)
+#    ENDIF(POLYCODE_BUILD_STATIC)
 
 
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)

+ 14 - 14
Tools/Contents/polyimport/CMakeLists.txt

@@ -7,25 +7,25 @@ INCLUDE_DIRECTORIES(
 
 
 SET(CMAKE_DEBUG_POSTFIX "_d")
 SET(CMAKE_DEBUG_POSTFIX "_d")
 
 
-IF(POLYCODE_BUILD_SHARED)
-    ADD_EXECUTABLE(polyimport Source/polyimport.cpp Include/polyimport.h)
-    TARGET_LINK_LIBRARIES(polyimport Polycore ${ASSIMP_LIBRARIES})
-ENDIF(POLYCODE_BUILD_SHARED)
+#IF(POLYCODE_BUILD_SHARED)
+#    ADD_EXECUTABLE(polyimport_dynamic Source/polyimport.cpp Include/polyimport.h)
+#    TARGET_LINK_LIBRARIES(polyimport_dynamic Polycore_dynamic ${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_LIBRARIES}})
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_STATIC)
+ADD_EXECUTABLE(polyimport Source/polyimport.cpp Include/polyimport.h)
+TARGET_LINK_LIBRARIES(polyimport Polycore ${PHYSFS_LIBRARY} ${ASSIMP_LIBRARIES}})
+#ENDIF(POLYCODE_BUILD_STATIC)
 
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
 IF(POLYCODE_INSTALL_FRAMEWORK)
 
 
     # install exes
     # install exes
-    IF(POLYCODE_BUILD_SHARED)
-        INSTALL(TARGETS polyimport DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Tools)
-    ENDIF(POLYCODE_BUILD_SHARED)
+#    IF(POLYCODE_BUILD_SHARED)
+#        INSTALL(TARGETS polyimport DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Tools)
+#    ENDIF(POLYCODE_BUILD_SHARED)
     
     
-    IF(POLYCODE_BUILD_STATIC)
-        INSTALL(TARGETS polyimport_static DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Tools)
-    ENDIF(POLYCODE_BUILD_STATIC)
+#    IF(POLYCODE_BUILD_STATIC)
+    INSTALL(TARGETS polyimport DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Tools)
+#    ENDIF(POLYCODE_BUILD_STATIC)
 
 
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)