Merge branch 'cmake-deps' of github.com:bitshifter/Polycode into cmake-deps

Conflicts:
	CMake/ExternalAssimp.cmake

Bindings/Contents/CMakeLists.txt

@@ -17,27 +17,32 @@ SET(polycodeLua_HDRS
     LUA/Include/PolycodeLUA2D.h
 )
 
-IF(POLYCODE_BUILD_SHARED)
-    ADD_LIBRARY(PolycodeLua SHARED ${polycodeLua_SRCS} ${polycodeLua_HDRS})
-    TARGET_LINK_LIBRARIES(PolycodeLua PolyCore ${LUA_LIBRARY})
-ENDIF(POLYCODE_BUILD_SHARED)
+SET(CMAKE_DEBUG_POSTFIX "_d")
 
-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)
     
     # install headers
-    INSTALL(FILES ${polycodeLua_HDRS} DESTINATION Framework/Modules/Include)
+    INSTALL(FILES ${polycodeLua_HDRS} DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/Include)
 
     # install libraries
     IF(POLYCODE_BUILD_SHARED)
-        INSTALL(TARGETS PolycodeLua DESTINATION Framework/Modules/Lib/${CMAKE_BUILD_TYPE})
+        INSTALL(TARGETS PolycodeLua DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/Lib)
     ENDIF(POLYCODE_BUILD_SHARED)
     IF(POLYCODE_BUILD_STATIC)
-        INSTALL(TARGETS PolycodeLua_static DESTINATION Framework/Modules/Lib/${CMAKE_BUILD_TYPE})
+        INSTALL(TARGETS PolycodeLua_static DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/Lib)
     ENDIF(POLYCODE_BUILD_STATIC)
     
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)

CMake/ExternalAssimp.cmake

@@ -23,11 +23,11 @@ INSTALL(DIRECTORY ${install_dir}/include/
 
 # install debug lib
 INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}assimp${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_TOOLS_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_TOOLS_PREFIX}/Lib
     CONFIGURATIONS Debug
     RENAME assimpd${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 # install release lib
 INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}assimp${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_TOOLS_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_TOOLS_PREFIX}/Lib
     CONFIGURATIONS Release)

CMake/ExternalBox2D.cmake

@@ -36,12 +36,12 @@ INSTALL(DIRECTORY ${install_dir}/include/
     
 # install debug lib
 INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}Box2D${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
     CONFIGURATIONS Debug
     RENAME Box2D_d${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 # install release lib
 INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}Box2D${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
     CONFIGURATIONS Release)
 

CMake/ExternalBullet.cmake

@@ -35,38 +35,38 @@ INSTALL(DIRECTORY ${install_dir}/include/
 
 # install debug libs
 INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletDynamics${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
     CONFIGURATIONS Debug
     RENAME BulletDynamics_d${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletCollision${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
     CONFIGURATIONS Debug
     RENAME BulletCollision_d${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletSoftBody${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
     CONFIGURATIONS Debug
     RENAME BulletSoftBody_d${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LinearMath${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
     CONFIGURATIONS Debug
     RENAME LinearMath_d${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 # install release libs
 INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletDynamics${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
     CONFIGURATIONS Release)
 
 INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletCollision${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
     CONFIGURATIONS Release)
 
 INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}BulletSoftBody${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
     CONFIGURATIONS Release)
 
 INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}LinearMath${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_MODULES_PREFIX}/Lib
     CONFIGURATIONS Release)

CMake/ExternalFreetype.cmake

@@ -23,11 +23,11 @@ INSTALL(DIRECTORY ${install_dir}/include/
     FILES_MATCHING PATTERN "*.h")
 
 # install debug libs
-INSTALL(FILES ${install_dir}/lib/freetyped${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+INSTALL(FILES ${install_dir}/lib/freetype_d${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Debug)
 
 # install release lib
 INSTALL(FILES ${install_dir}/lib/freetype${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Release)

CMake/ExternalOggVorbis.cmake

@@ -39,52 +39,52 @@ INSTALL(DIRECTORY ${install_dir}/include/
 
 # install debug libs
 INSTALL(FILES ${install_dir}/lib/liboggd${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Debug)
 
 INSTALL(FILES ${install_dir}/lib/libvorbisd${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Debug)
 
 INSTALL(FILES ${install_dir}/lib/libvorbisfiled${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Debug)
 
 # install release lib
 INSTALL(FILES ${install_dir}/lib/libogg${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Release)
 
 INSTALL(FILES ${install_dir}/lib/libvorbis${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Release)
 
 INSTALL(FILES ${install_dir}/lib/libvorbisfile${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Release)
 
 # install debug shared library
 INSTALL(FILES ${install_dir}/bin/liboggd${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Debug)
 
 INSTALL(FILES ${install_dir}/bin/libvorbisd${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Debug)
 
 INSTALL(FILES ${install_dir}/bin/libvorbisfiled${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Debug)
 
 # install release shared library
 INSTALL(FILES ${install_dir}/bin/libogg${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Release)
 
 INSTALL(FILES ${install_dir}/bin/libvorbis${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Release)
 
 INSTALL(FILES ${install_dir}/bin/libvorbisfile${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Release)

CMake/ExternalOpenAL.cmake

@@ -21,23 +21,23 @@ INSTALL(DIRECTORY ${install_dir}/include/
     FILES_MATCHING PATTERN "*.h")
 
 # install debug lib
-INSTALL(FILES ${install_dir}/lib/OpenAL32${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}OpenAL32${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Debug
     RENAME OpenAL32d${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 # install release lib
-INSTALL(FILES ${install_dir}/lib/OpenAL32${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Release
+INSTALL(FILES ${install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}OpenAL32${CMAKE_STATIC_LIBRARY_SUFFIX}
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Release)
 
 # install debug shared library
-INSTALL(FILES ${install_dir}/bin/OpenAL32${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
+INSTALL(FILES ${install_dir}/bin/${CMAKE_SHARED_LIBRARY_PREFIX}OpenAL32${CMAKE_SHARED_LIBRARY_SUFFIX}
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Debug
     RENAME OpenAL32d${CMAKE_SHARED_LIBRARY_SUFFIX})
 
 # install release shared library
-INSTALL(FILES ${install_dir}/bin/OpenAL32${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Release
+INSTALL(FILES ${install_dir}/bin/${CMAKE_SHARED_LIBRARY_PREFIX}OpenAL32${CMAKE_SHARED_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Release)

CMake/ExternalPNG.cmake

@@ -37,36 +37,36 @@ INSTALL(DIRECTORY ${install_dir}/include/
 
 # install debug libs
 INSTALL(FILES ${install_dir}/lib/zlibd${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Debug)
 
 INSTALL(FILES ${install_dir}/lib/libpng15d${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Debug)
 
 # install release lib
 INSTALL(FILES ${install_dir}/lib/zlib${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Release)
 
 INSTALL(FILES ${install_dir}/lib/libpng15${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Release)
 
 # install debug shared library
 INSTALL(FILES ${install_dir}/bin/zlibd1${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Debug)
 
 INSTALL(FILES ${install_dir}/bin/libpng15d${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Debug)
 
 # install release shared library
 INSTALL(FILES ${install_dir}/bin/zlib1${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Release)
 
 INSTALL(FILES ${install_dir}/bin/libpng15${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Release)

CMake/ExternalPhysFS.cmake

@@ -23,32 +23,26 @@ INSTALL(DIRECTORY ${install_dir}/include/
 
 # install debug lib
 INSTALL(FILES ${install_dir}/lib/physfs${CMAKE_STATIC_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Debug
     RENAME physfsd${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 # install release lib
 INSTALL(FILES ${install_dir}/lib/physfs${CMAKE_STATIC_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Lib
     CONFIGURATIONS Release)
 
 # install debug shared library
 INSTALL(FILES ${install_dir}/bin/physfs${CMAKE_SHARED_LIBRARY_SUFFIX}
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Debug
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Debug
     RENAME physfsd${CMAKE_SHARED_LIBRARY_SUFFIX})
 
 # install release shared library
 INSTALL(FILES ${install_dir}/bin/physfs${CMAKE_SHARED_LIBRARY_SUFFIX} 
-    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin/Release
+    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX}/Bin
     CONFIGURATIONS Release)
 
 
-#INSTALL(DIRECTORY ${install_dir}/bin
-#    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX})
-#INSTALL(DIRECTORY ${install_dir}/lib
-#    DESTINATION ${POLYCODE_DEPS_CORE_PREFIX})
-
-
 
 

CMake/FindBox2D.cmake

@@ -15,9 +15,18 @@ FIND_PATH(BOX2D_INCLUDE_DIR Box2D/Box2D.h
   PATH_SUFFIXES include
 )
 
-SET(BOX2D_NAMES box2d Box2d BOX2D Box2D)
-FIND_LIBRARY(BOX2D_LIBRARY NAMES ${BOX2D_NAMES})
-MARK_AS_ADVANCED(BOX2D_LIBRARY BOX2D_INCLUDE_DIR)
+FIND_LIBRARY(BOX2D_RELEASE_LIBRARY NAMES box2d Box2d BOX2D Box2D)
+FIND_LIBRARY(BOX2D_DEBUG_LIBRARY NAMES box2d_d Box2d_d BOX2D_d Box2D_d)
+
+IF(BOX2D_RELEASE_LIBRARY)
+    IF(BOX2D_DEBUG_LIBRARY)
+        SET(BOX2D_LIBRARY optimized "${BOX2D_RELEASE_LIBRARY}" debug "${BOX2D_DEBUG_LIBRARY}")
+    ELSE()
+        SET(BOX2D_LIBRARY "${BOX2D_RELEASE_LIBRARY}")        # Could add "general" keyword, but it is optional
+    ENDIF()
+ENDIF()
+
+MARK_AS_ADVANCED(BOX2D_LIBRARY BOX2D_RELEASE_LIBRARY BOX2D_DEBUG_LIBRARY BOX2D_INCLUDE_DIR)
 
 # Per-recommendation
 SET(BOX2D_INCLUDE_DIRS "${BOX2D_INCLUDE_DIR}")

CMake/FindOgg.cmake

@@ -0,0 +1,84 @@
+# Copied from http://code.google.com/p/osgaudio/source/browse/trunk/CMakeModules/FindOGG.cmake
+# Locate OGG
+# This module defines XXX_FOUND, XXX_INCLUDE_DIRS and XXX_LIBRARIES standard variables
+#
+# $OGGDIR is an environment variable that would
+# correspond to the ./configure --prefix=$OGGDIR
+# used in building OGG.
+
+SET(OGG_SEARCH_PATHS
+	~/Library/Frameworks
+	/Library/Frameworks
+	/usr/local
+	/usr
+	/sw # Fink
+	/opt/local # DarwinPorts
+	/opt/csw # Blastwave
+	/opt
+)
+
+SET(MSVC_YEAR_NAME)
+IF (MSVC_VERSION GREATER 1599)		# >= 1600
+	SET(MSVC_YEAR_NAME VS2010)
+ELSEIF(MSVC_VERSION GREATER 1499)	# >= 1500
+	SET(MSVC_YEAR_NAME VS2008)
+ELSEIF(MSVC_VERSION GREATER 1399)	# >= 1400
+	SET(MSVC_YEAR_NAME VS2005)
+ELSEIF(MSVC_VERSION GREATER 1299)	# >= 1300
+	SET(MSVC_YEAR_NAME VS2003)
+ELSEIF(MSVC_VERSION GREATER 1199)	# >= 1200
+	SET(MSVC_YEAR_NAME VS6)
+ENDIF()
+
+FIND_PATH(OGG_INCLUDE_DIR
+	NAMES ogg/ogg.h ogg/os_types.h
+	HINTS
+	$ENV{OGGDIR}
+	$ENV{OGG_PATH}
+	PATH_SUFFIXES include
+	PATHS ${OGG_SEARCH_PATHS}
+)
+
+FIND_LIBRARY(OGG_LIBRARY 
+	NAMES ogg libogg
+	HINTS
+	$ENV{OGGDIR}
+	$ENV{OGG_PATH}
+	PATH_SUFFIXES lib lib64 win32/Dynamic_Release "Win32/${MSVC_YEAR_NAME}/x64/Release" "Win32/${MSVC_YEAR_NAME}/Win32/Release"
+	PATHS ${OGG_SEARCH_PATHS}
+)
+
+# First search for d-suffixed libs
+FIND_LIBRARY(OGG_LIBRARY_DEBUG 
+	NAMES oggd ogg_d liboggd libogg_d
+	HINTS
+	$ENV{OGGDIR}
+	$ENV{OGG_PATH}
+	PATH_SUFFIXES lib lib64 win32/Dynamic_Debug "Win32/${MSVC_YEAR_NAME}/x64/Debug" "Win32/${MSVC_YEAR_NAME}/Win32/Debug"
+	PATHS ${OGG_SEARCH_PATHS}
+)
+
+IF(NOT OGG_LIBRARY_DEBUG)
+	# Then search for non suffixed libs if necessary, but only in debug dirs
+	FIND_LIBRARY(OGG_LIBRARY_DEBUG 
+		NAMES ogg libogg
+		HINTS
+		$ENV{OGGDIR}
+		$ENV{OGG_PATH}
+		PATH_SUFFIXES win32/Dynamic_Debug "Win32/${MSVC_YEAR_NAME}/x64/Debug" "Win32/${MSVC_YEAR_NAME}/Win32/Debug"
+		PATHS ${OGG_SEARCH_PATHS}
+	)
+ENDIF()
+
+
+IF(OGG_LIBRARY)
+	IF(OGG_LIBRARY_DEBUG)
+		SET(OGG_LIBRARIES optimized "${OGG_LIBRARY}" debug "${OGG_LIBRARY_DEBUG}")
+	ELSE()
+		SET(OGG_LIBRARIES "${OGG_LIBRARY}")		# Could add "general" keyword, but it is optional
+	ENDIF()
+ENDIF()
+
+# handle the QUIETLY and REQUIRED arguments and set XXX_FOUND to TRUE if all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OGG DEFAULT_MSG OGG_LIBRARIES OGG_INCLUDE_DIR)

CMake/FindVorbis.cmake

@@ -0,0 +1,84 @@
+# Copied from http://code.google.com/p/osgaudio/source/browse/trunk/CMakeModules/FindVorbis.cmake
+# Locate Vorbis
+# This module defines XXX_FOUND, XXX_INCLUDE_DIRS and XXX_LIBRARIES standard variables
+#
+# $VORBISDIR is an environment variable that would
+# correspond to the ./configure --prefix=$VORBISDIR
+# used in building Vorbis.
+
+SET(VORBIS_SEARCH_PATHS
+	~/Library/Frameworks
+	/Library/Frameworks
+	/usr/local
+	/usr
+	/sw # Fink
+	/opt/local # DarwinPorts
+	/opt/csw # Blastwave
+	/opt
+)
+
+SET(MSVC_YEAR_NAME)
+IF (MSVC_VERSION GREATER 1599)		# >= 1600
+	SET(MSVC_YEAR_NAME VS2010)
+ELSEIF(MSVC_VERSION GREATER 1499)	# >= 1500
+	SET(MSVC_YEAR_NAME VS2008)
+ELSEIF(MSVC_VERSION GREATER 1399)	# >= 1400
+	SET(MSVC_YEAR_NAME VS2005)
+ELSEIF(MSVC_VERSION GREATER 1299)	# >= 1300
+	SET(MSVC_YEAR_NAME VS2003)
+ELSEIF(MSVC_VERSION GREATER 1199)	# >= 1200
+	SET(MSVC_YEAR_NAME VS6)
+ENDIF()
+
+FIND_PATH(VORBIS_INCLUDE_DIR
+	NAMES vorbis/codec.h
+	HINTS
+	$ENV{VORBISDIR}
+	$ENV{VORBIS_PATH}
+	PATH_SUFFIXES include
+	PATHS ${VORBIS_SEARCH_PATHS}
+)
+
+FIND_LIBRARY(VORBIS_LIBRARY 
+	NAMES vorbis libvorbis
+	HINTS
+	$ENV{VORBISDIR}
+	$ENV{VORBIS_PATH}
+	PATH_SUFFIXES lib lib64 win32/Vorbis_Dynamic_Release "Win32/${MSVC_YEAR_NAME}/x64/Release" "Win32/${MSVC_YEAR_NAME}/Win32/Release"
+	PATHS ${VORBIS_SEARCH_PATHS}
+)
+
+# First search for d-suffixed libs
+FIND_LIBRARY(VORBIS_LIBRARY_DEBUG 
+	NAMES vorbisd vorbis_d libvorbisd libvorbis_d
+	HINTS
+	$ENV{VORBISDIR}
+	$ENV{VORBIS_PATH}
+	PATH_SUFFIXES lib lib64 win32/Vorbis_Dynamic_Debug "Win32/${MSVC_YEAR_NAME}/x64/Debug" "Win32/${MSVC_YEAR_NAME}/Win32/Debug"
+	PATHS ${VORBIS_SEARCH_PATHS}
+)
+
+IF(NOT VORBIS_LIBRARY_DEBUG)
+	# Then search for non suffixed libs if necessary, but only in debug dirs
+	FIND_LIBRARY(VORBIS_LIBRARY_DEBUG 
+		NAMES vorbis libvorbis
+		HINTS
+		$ENV{VORBISDIR}
+		$ENV{VORBIS_PATH}
+		PATH_SUFFIXES win32/Vorbis_Dynamic_Debug "Win32/${MSVC_YEAR_NAME}/x64/Debug" "Win32/${MSVC_YEAR_NAME}/Win32/Debug"
+		PATHS ${VORBIS_SEARCH_PATHS}
+	)
+ENDIF()
+
+
+IF(VORBIS_LIBRARY)
+	IF(VORBIS_LIBRARY_DEBUG)
+		SET(VORBIS_LIBRARIES optimized "${VORBIS_LIBRARY}" debug "${VORBIS_LIBRARY_DEBUG}")
+	ELSE()
+		SET(VORBIS_LIBRARIES "${VORBIS_LIBRARY}")		# Could add "general" keyword, but it is optional
+	ENDIF()
+ENDIF()
+
+# handle the QUIETLY and REQUIRED arguments and set XXX_FOUND to TRUE if all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBIS DEFAULT_MSG VORBIS_LIBRARIES VORBIS_INCLUDE_DIR)

CMake/PolycodeIncludes.cmake

@@ -1,17 +1,17 @@
 # platform specific defines and include directories for win and sdl
 IF(MSVC)
     ADD_DEFINITIONS(/D_UNICODE /DUNICODE)
-    INCLUDE_DIRECTORIES(${PolyCode_SOURCE_DIR}/Core/Build/MSVC/Polycore)
+    INCLUDE_DIRECTORIES(${Polycode_SOURCE_DIR}/Core/Build/MSVC/Polycore)
 ELSEIF(APPLE)
     ADD_DEFINITIONS(-DGL_GLEXT_PROTOTYPES)
 ELSE(MSVC)
     ADD_DEFINITIONS(-DGL_GLEXT_PROTOTYPES)
-    INCLUDE_DIRECTORIES(${PolyCode_SOURCE_DIR}/Core/Build/Linux)
+    INCLUDE_DIRECTORIES(${Polycode_SOURCE_DIR}/Core/Build/Linux)
 ENDIF(MSVC)
 
 # Set up common include directories
 INCLUDE_DIRECTORIES(
-    ${PolyCode_SOURCE_DIR}/Core/Contents/Include
+    ${Polycode_SOURCE_DIR}/Core/Contents/Include
     ${OPENGL_INCLUDE_DIR}
     ${OPENAL_INCLUDE_DIR}
     ${FREETYPE_INCLUDE_DIR}

CMake/freetype.cmake

@@ -9,7 +9,7 @@ IF(NOT CMAKE_BUILD_TYPE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
 # to distinguish between debug and release lib
-SET(CMAKE_DEBUG_POSTFIX "d")
+SET(CMAKE_DEBUG_POSTFIX "_d")
 
 SET(freetype_SRCS
     src/autofit/autofit.c

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)
@@ -55,7 +56,7 @@ IF(POLYCODE_BUILD_PLAYER)
 ENDIF(POLYCODE_BUILD_PLAYER)
 
 IF(POLYCODE_BUILD_TOOLS)
-    ADD_SUBDIRECTORY(Tools)
+    ADD_SUBDIRECTORY(Tools/Contents)
 ENDIF(POLYCODE_BUILD_TOOLS)
 
 # Install assets and dependencies

Core/Contents/CMakeLists.txt

@@ -3,6 +3,8 @@ FIND_PACKAGE(PNG REQUIRED)
 FIND_PACKAGE(PhysFS REQUIRED)
 FIND_PACKAGE(OpenAL REQUIRED)
 FIND_PACKAGE(Freetype REQUIRED)
+FIND_PACKAGE(Ogg REQUIRED)
+FIND_PACKAGE(Vorbis REQUIRED)
 FIND_PACKAGE(VorbisFile REQUIRED)
 
 # Use SDL on non-Apple unixes
@@ -192,6 +194,8 @@ SET(polycore_HDRS
     Include/tinyxml.h
 )
 
+SET(CMAKE_DEBUG_POSTFIX "_d")
+
 # TODO: iPhone
 #    Include/PolyiPhoneCore.h
 #    Include/Poly_iPhone.h
@@ -216,20 +220,21 @@ ELSE(MSVC)
 ENDIF(MSVC)
 
 IF(POLYCODE_BUILD_SHARED)
-    LINK_LIBRARIES(
+    ADD_LIBRARY(Polycore SHARED ${polycore_SRCS} ${polycore_HDRS})
+    TARGET_LINK_LIBRARIES(Polycore
         ${OPENGL_LIBRARIES}
         ${OPENAL_LIBRARY}
         ${PNG_LIBRARIES}
         ${FREETYPE_LIBRARIES}
         ${PHYSFS_LIBRARY}
-        ${VORBISFILE_LIBRARY}
-        ${SDL_LIBRARY}
-    )
-    ADD_LIBRARY(PolyCore SHARED ${polycore_SRCS} ${polycore_HDRS})
+        ${OGG_LIBRARIES}
+        ${VORBIS_LIBRARIES}
+        ${VORBISFILE_LIBRARIES}
+        ${SDL_LIBRARY})
 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)
@@ -238,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/${CMAKE_BUILD_TYPE})
+        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/${CMAKE_BUILD_TYPE})
+        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

@@ -16,28 +16,30 @@ INCLUDE_DIRECTORIES(
     Include
 )
 
+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)
     
     # install headers
-    INSTALL(FILES ${polycode2DPhysics_HDRS} DESTINATION Framework/Modules/Include)
+    INSTALL(FILES ${polycode2DPhysics_HDRS} DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/Include)
 
     # install libraries
     IF(POLYCODE_BUILD_SHARED)
-        INSTALL(TARGETS Polycode2DPhysics DESTINATION Framework/Modules/Lib/${CMAKE_BUILD_TYPE})
+        INSTALL(TARGETS Polycode2DPhysics DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/Lib)
     ENDIF(POLYCODE_BUILD_SHARED)
     IF(POLYCODE_BUILD_STATIC)
-        INSTALL(TARGETS Polycode2DPhysics_static DESTINATION Framework/Modules/Lib/${CMAKE_BUILD_TYPE})
+        INSTALL(TARGETS Polycode2DPhysics_static DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/Lib)
     ENDIF(POLYCODE_BUILD_STATIC)
     
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)

Modules/Contents/3DPhysics/CMakeLists.txt

@@ -20,26 +20,28 @@ INCLUDE_DIRECTORIES(
     Include
 )
 
+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)
+    LINK_LIBRARIES(${BULLET_LIBRARIES})
+    ADD_LIBRARY(Polycode3DPhysics SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
+    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)
+    ADD_LIBRARY(Polycode3DPhysics_static ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
+    TARGET_LINK_LIBRARIES(Polycode3DPhysics_static Polycore_static)
 ENDIF(POLYCODE_BUILD_STATIC)
 
 IF(POLYCODE_INSTALL_FRAMEWORK)
     # install headers
-    INSTALL(FILES ${polycode3DPhysics_HDRS} DESTINATION Framework/Modules/Include)
+    INSTALL(FILES ${polycode3DPhysics_HDRS} DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/Include)
 
     # install libraries
     IF(POLYCODE_BUILD_SHARED)
-        INSTALL(TARGETS Polycode3DPhysics DESTINATION Framework/Modules/Lib/${CMAKE_BUILD_TYPE})
+        INSTALL(TARGETS Polycode3DPhysics DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/Lib)
     ENDIF()
     IF(POLYCODE_BUILD_STATIC)
-        INSTALL(TARGETS Polycode3DPhysics_static DESTINATION Framework/Modules/Lib/${CMAKE_BUILD_TYPE})
+        INSTALL(TARGETS Polycode3DPhysics_static DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/Lib)
     ENDIF()
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)

Player/Contents/CMakeLists.txt

@@ -5,14 +5,18 @@ INCLUDE_DIRECTORIES(
     ${Polycode_SOURCE_DIR}/Bindings/Contents/LUA/Include
 )
 
+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
@@ -22,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)
@@ -45,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

@@ -6,25 +6,27 @@ INCLUDE_DIRECTORIES(
     ${ASSIMP_INCLUDE_DIR} 
     Include)
 
+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)
 
     # install exes
     IF(POLYCODE_BUILD_SHARED)
-        INSTALL(TARGETS polyimport DESTINATION Framework/Tools)
+        INSTALL(TARGETS polyimport DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Tools)
     ENDIF(POLYCODE_BUILD_SHARED)
     
     IF(POLYCODE_BUILD_STATIC)
-        INSTALL(TARGETS polyimport_static DESTINATION Framework/Tools)
+        INSTALL(TARGETS polyimport_static DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Tools)
     ENDIF(POLYCODE_BUILD_STATIC)
 
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)