A bunch more small fixes.

Bindings/Contents/CMakeLists.txt

@@ -19,15 +19,18 @@ SET(polycodeLua_HDRS
 
 SET(CMAKE_DEBUG_POSTFIX "_d")
 
-IF(POLYCODE_BUILD_SHARED)
-    ADD_LIBRARY(PolycodeLua SHARED ${polycodeLua_SRCS} ${polycodeLua_HDRS})
-    TARGET_LINK_LIBRARIES(PolycodeLua PolyCore ${LUA_LIBRARY})
-ENDIF(POLYCODE_BUILD_SHARED)
-
-IF(POLYCODE_BUILD_STATIC)
-    ADD_LIBRARY(PolycodeLua_static ${polycodeLua_SRCS} ${polycodeLua_HDRS})
-    TARGET_LINK_LIBRARIES(PolycodeLua_static PolyCore_static)
-ENDIF(POLYCODE_BUILD_STATIC)
+#IF(POLYCODE_BUILD_SHARED)
+#    ADD_LIBRARY(PolycodeLua SHARED ${polycodeLua_SRCS} ${polycodeLua_HDRS})
+#    TARGET_LINK_LIBRARIES(PolycodeLua Polycore ${LUA_LIBRARY})
+#ENDIF(POLYCODE_BUILD_SHARED)
+
+#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})
+TARGET_LINK_LIBRARIES(PolycodeLua)
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
     

CMake/libogg.cmake

@@ -24,7 +24,7 @@ ENDIF(MSVC)
 ADD_LIBRARY(libogg_dynamic SHARED ${libogg_SRCS} ${libogg_HDRS})
 ADD_LIBRARY(libogg_static ${libogg_SRCS} ${libogg_HDRS})
 
-SET_TARGET_PROPERTIES(libogg_dynamic libogg_static 
+SET_TARGET_PROPERTIES(libogg_dynamic #libogg_static 
     PROPERTIES OUTPUT_NAME libogg)
 
 INSTALL(TARGETS libogg_dynamic libogg_static

CMake/libvorbis.cmake

@@ -113,10 +113,10 @@ ADD_LIBRARY(libvorbisfile_static lib/vorbisfile.c include/vorbis/vorbisfile.h)
 
 TARGET_LINK_LIBRARIES(libvorbisfile_dynamic libvorbis_dynamic ${OGG_LIBRARY})
 
-SET_TARGET_PROPERTIES(libvorbis_dynamic libvorbis_static 
+SET_TARGET_PROPERTIES(libvorbis_dynamic #libvorbis_static
     PROPERTIES OUTPUT_NAME libvorbis)
 
-SET_TARGET_PROPERTIES(libvorbisfile_dynamic libvorbisfile_static 
+SET_TARGET_PROPERTIES(libvorbisfile_dynamic #libvorbisfile_static 
     PROPERTIES OUTPUT_NAME libvorbisfile)
 
 INSTALL(TARGETS 

CMakeLists.txt

@@ -18,6 +18,7 @@ OPTION(POLYCODE_BUILD_PLAYER "Build Polycode standalone player" ON)
 OPTION(POLYCODE_BUILD_TOOLS "Build Polycode tools" ON)
 
 OPTION(POLYCODE_INSTALL_FRAMEWORK "Install Polycode Core, Modules and Tools" ON)
+OPTION(POLYCODE_INSTALL_PLAYER "Install Polycode Player" ON)
 
 # Some non-standard CMake modules
 SET(CMAKE_MODULE_PATH ${Polycode_SOURCE_DIR}/CMake)

Core/Contents/CMakeLists.txt

@@ -220,8 +220,8 @@ ELSE(MSVC)
 ENDIF(MSVC)
 
 IF(POLYCODE_BUILD_SHARED)
-    ADD_LIBRARY(PolyCore SHARED ${polycore_SRCS} ${polycore_HDRS})
-    TARGET_LINK_LIBRARIES(PolyCore
+    ADD_LIBRARY(Polycore SHARED ${polycore_SRCS} ${polycore_HDRS})
+    TARGET_LINK_LIBRARIES(Polycore
         ${OPENGL_LIBRARIES}
         ${OPENAL_LIBRARY}
         ${PNG_LIBRARIES}
@@ -234,7 +234,7 @@ IF(POLYCODE_BUILD_SHARED)
 ENDIF(POLYCODE_BUILD_SHARED)
 
 IF(POLYCODE_BUILD_STATIC)
-    ADD_LIBRARY(PolyCore_static ${polycore_SRCS} ${polycore_HDRS})
+    ADD_LIBRARY(Polycore_static ${polycore_SRCS} ${polycore_HDRS})
 ENDIF(POLYCODE_BUILD_STATIC)
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
@@ -243,10 +243,17 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
 
     # install libraries
     IF(POLYCODE_BUILD_SHARED)
-        INSTALL(TARGETS PolyCore EXPORT PolyCore-targets DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/Lib)
+        INSTALL(TARGETS Polycore 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 DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/Lib)
+        INSTALL(TARGETS Polycore_static EXPORT Polycore-targets DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/Lib)
     ENDIF(POLYCODE_BUILD_STATIC)
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)
+
+IF(POLYCODE_INSTALL_PLAYER AND POLYCODE_BUILD_SHARED)
+    # install required libs
+    INSTALL(TARGETS Polycore DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
+    INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/Bin/ 
+        DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
+ENDIF()

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

@@ -2,10 +2,10 @@ INCLUDE_DIRECTORIES(.)
 
 IF(POLYCODE_BUILD_SHARED)
     ADD_EXECUTABLE(2DShapes ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-    TARGET_LINK_LIBRARIES(2DShapes PolyCore)
+    TARGET_LINK_LIBRARIES(2DShapes Polycore)
 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)
+	TARGET_LINK_LIBRARIES(2DShapes_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)

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

@@ -2,11 +2,11 @@ INCLUDE_DIRECTORIES(.)
 
 IF(POLYCODE_BUILD_SHARED)
 	ADD_EXECUTABLE(2DTransforms ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(2DTransforms PolyCore)
+	TARGET_LINK_LIBRARIES(2DTransforms Polycore)
 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)
+	TARGET_LINK_LIBRARIES(2DTransforms_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)
 

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

@@ -2,11 +2,11 @@ INCLUDE_DIRECTORIES(.)
 
 IF(POLYCODE_BUILD_SHARED)
 	ADD_EXECUTABLE(3DAudio ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(3DAudio PolyCore)
+	TARGET_LINK_LIBRARIES(3DAudio Polycore)
 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)
+	TARGET_LINK_LIBRARIES(3DAudio_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)
 

Examples/C++/AdvancedLighting/CMakeLists.txt

@@ -2,11 +2,11 @@ INCLUDE_DIRECTORIES(.)
 
 IF(POLYCODE_BUILD_SHARED)
 	ADD_EXECUTABLE(AdvancedLighting ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(AdvancedLighting PolyCore)
+	TARGET_LINK_LIBRARIES(AdvancedLighting Polycore)
 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)
+	TARGET_LINK_LIBRARIES(AdvancedLighting_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)
 

Examples/C++/BasicImage/CMakeLists.txt

@@ -2,11 +2,11 @@ INCLUDE_DIRECTORIES(.)
 
 IF(POLYCODE_BUILD_SHARED)
 	ADD_EXECUTABLE(BasicImage ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(BasicImage PolyCore)
+	TARGET_LINK_LIBRARIES(BasicImage Polycore)
 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)
+	TARGET_LINK_LIBRARIES(BasicImage_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)
 

Examples/C++/BasicLighting/CMakeLists.txt

@@ -2,10 +2,10 @@ INCLUDE_DIRECTORIES(.)
 
 IF(POLYCODE_BUILD_SHARED)
 	ADD_EXECUTABLE(BasicLighting ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(BasicLighting PolyCore)
+	TARGET_LINK_LIBRARIES(BasicLighting Polycore)
 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)
+	TARGET_LINK_LIBRARIES(BasicLighting_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)

Examples/C++/BasicText/CMakeLists.txt

@@ -2,10 +2,10 @@ INCLUDE_DIRECTORIES(.)
 
 IF(POLYCODE_BUILD_SHARED)
 	ADD_EXECUTABLE(BasicText ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(BasicText PolyCore)
+	TARGET_LINK_LIBRARIES(BasicText Polycore)
 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)
+	TARGET_LINK_LIBRARIES(BasicText_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)

Examples/C++/ScreenEntities/CMakeLists.txt

@@ -2,10 +2,10 @@ INCLUDE_DIRECTORIES(.)
 
 IF(POLYCODE_BUILD_SHARED)
 	ADD_EXECUTABLE(ScreenEntities ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(ScreenEntities PolyCore)
+	TARGET_LINK_LIBRARIES(ScreenEntities Polycore)
 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)
+	TARGET_LINK_LIBRARIES(ScreenEntities_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)

Examples/C++/ScreenSprites/CMakeLists.txt

@@ -2,10 +2,10 @@ INCLUDE_DIRECTORIES(.)
 
 IF(POLYCODE_BUILD_SHARED)
 	ADD_EXECUTABLE(ScreenSprites ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(ScreenSprites PolyCore)
+	TARGET_LINK_LIBRARIES(ScreenSprites Polycore)
 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)
+	TARGET_LINK_LIBRARIES(ScreenSprites_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)

Examples/C++/SkeletalAnimation/CMakeLists.txt

@@ -2,10 +2,10 @@ INCLUDE_DIRECTORIES(.)
 
 IF(POLYCODE_BUILD_SHARED)
 	ADD_EXECUTABLE(SkeletalAnimation ../main.cpp HelloPolycodeApp.cpp HelloPolycodeApp.h)
-	TARGET_LINK_LIBRARIES(SkeletalAnimation PolyCore)
+	TARGET_LINK_LIBRARIES(SkeletalAnimation Polycore)
 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)
+	TARGET_LINK_LIBRARIES(SkeletalAnimation_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)

Modules/Contents/2DPhysics/CMakeLists.txt

@@ -21,12 +21,12 @@ 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)
+    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)
+    TARGET_LINK_LIBRARIES(Polycode2DPhysics_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)
 
 IF(POLYCODE_INSTALL_FRAMEWORK)

Modules/Contents/3DPhysics/CMakeLists.txt

@@ -25,12 +25,12 @@ 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)
+    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)
+    TARGET_LINK_LIBRARIES(Polycode3DPhysics_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)
 
 IF(POLYCODE_INSTALL_FRAMEWORK)

Player/Contents/CMakeLists.txt

@@ -9,12 +9,14 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 
 IF(MSVC)
     SET(polycodeplayer_SRCS
+        ../Build/MSVC/PolycodePlayer/player_icon.ico
         ../Build/MSVC/PolycodePlayer/main.cpp
         ../Build/MSVC/PolycodePlayer/PolycodePlayerView.cpp
         Source/PolycodePlayer.cpp
         Source/PolycodeWindowsPlayer.cpp
     )
-    SET(polycodeplayer_HDRS 
+    SET(polycodeplayer_HDRS
+        ../Build/MSVC/PolycodePlayer/resource.h
         ../Build/MSVC/PolycodePlayer/PolycodePlayerView.h
         Include/PolycodePlayer.h 
         Include/PolycodeWindowsPlayer.h
@@ -24,12 +26,12 @@ IF(MSVC)
     
     IF(POLYCODE_BUILD_SHARED)
         ADD_EXECUTABLE(PolycodePlayer WIN32 ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
-        TARGET_LINK_LIBRARIES(PolycodePlayer PolyCore PolycodeLua ${LUA_LIBRARY})
+        TARGET_LINK_LIBRARIES(PolycodePlayer Polycore 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})
+        TARGET_LINK_LIBRARIES(PolycodePlayer_static Polycore_static PolycodeLua_static ${LUA_LIBRARY})
     ENDIF(POLYCODE_BUILD_STATIC)
     
 ELSEIF(APPLE)
@@ -47,13 +49,23 @@ ELSEIF(APPLE)
     
     IF(POLYCODE_BUILD_SHARED)
         ADD_EXECUTABLE(PolycodePlayer MACOSX_BUNDLE ${polycodeplayer_SRCS} ${polycodeplayer_HDRS})
-        TARGET_LINK_LIBRARIES(PolycodePlayer PolyCore PolycodeLua ${LUA_LIBRARY})
+        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_static ${LUA_LIBRARY})
+        TARGET_LINK_LIBRARIES(PolycodePlayer_static Polycore_static PolycodeLua ${LUA_LIBRARY})
     ENDIF(POLYCODE_BUILD_STATIC)
 
 ENDIF(MSVC)
 
+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()
+ENDIF(POLYCODE_INSTALL_PLAYER)

Tools/Contents/polybuild/CMakeLists.txt

@@ -15,11 +15,11 @@ SET(minizip_SRCS
 )
 
 IF(POLYCODE_BUILD_SHARED)
-    LINK_LIBRARIES(PolyCore)
+    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)
+    LINK_LIBRARIES(Polycore_static)
     ADD_EXECUTABLE(polybuild_static ${minizip_SRCS} Source/polybuild.cpp Include/polybuild.h)
 ENDIF(POLYCODE_BUILD_STATIC)

Tools/Contents/polyimport/CMakeLists.txt

@@ -10,12 +10,12 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
 
 IF(POLYCODE_BUILD_SHARED)
     ADD_EXECUTABLE(polyimport Source/polyimport.cpp Include/polyimport.h)
-    TARGET_LINK_LIBRARIES(polyimport PolyCore ${ASSIMP_LIBRARY_RELEASE})
+    TARGET_LINK_LIBRARIES(polyimport Polycore ${ASSIMP_LIBRARY_RELEASE})
 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_LIBRARY_RELEASE})
+    TARGET_LINK_LIBRARIES(polyimport_static Polycore_static ${PHYSFS_LIBRARY} ${ASSIMP_LIBRARY_RELEASE})
 ENDIF(POLYCODE_BUILD_STATIC)
 
 IF(POLYCODE_INSTALL_FRAMEWORK)