Ver Fonte

Still WIP. Got most externals installing to Release and Debug directories. Ogg Vorbis doesn't want to play though.

Cameron Hart há 14 anos atrás
pai
commit
c739a4a92c

+ 14 - 6
CMake/ExternalAssimp.cmake

@@ -13,9 +13,17 @@ ExternalProject_Add(assimp
 # install built files
 ExternalProject_Get_Property(assimp install_dir)
 
-INSTALL(DIRECTORY ${install_dir}/include 
-    DESTINATION ${POLYCODE_EXTERNALS_TOOLS_PREFIX})
-#INSTALL(DIRECTORY ${install_dir}/bin
-#    DESTINATION ${POLYCODE_EXTERNALS_TOOLS_PREFIX})
-INSTALL(DIRECTORY ${install_dir}/lib
-    DESTINATION ${POLYCODE_EXTERNALS_TOOLS_PREFIX})
+# install includes
+INSTALL(DIRECTORY ${install_dir}/include/
+    DESTINATION ${POLYCODE_EXTERNALS_TOOLS_PREFIX}/Include)
+
+# install debug lib
+INSTALL(FILES ${install_dir}/lib/assimp${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_TOOLS_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug
+    RENAME assimpd${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+# install release lib
+INSTALL(FILES ${install_dir}/lib/assimp${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_TOOLS_PREFIX}/Lib/Release
+    CONFIGURATIONS Release)

+ 21 - 6
CMake/ExternalBox2D.cmake

@@ -7,6 +7,13 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
     SET(box2d_CXX_ARGS -DCMAKE_CXX_FLAGS=-fPIC)
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
+SET(box2d_CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    -DBOX2D_INSTALL=ON 
+    -DBOX2D_BUILD_EXAMPLES=OFF 
+    ${box2d_CXX_ARGS}
+)
+
 ExternalProject_Add(box2d
     PREFIX ${box2d_PREFIX}
     
@@ -21,10 +28,18 @@ ExternalProject_Add(box2d
 ExternalProject_Get_Property(box2d install_dir)
 
 # install built files
-INSTALL(DIRECTORY ${install_dir}/include 
-    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}
+INSTALL(DIRECTORY ${install_dir}/include/
+    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}/Include
     FILES_MATCHING PATTERN "*.h")
-#INSTALL(DIRECTORY ${install_dir}/bin
-#    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX})
-INSTALL(DIRECTORY ${install_dir}/lib
-    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX})
+    
+# install debug lib
+INSTALL(FILES ${install_dir}/lib/Box2D${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug
+    RENAME Box2D_d${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+# install release lib
+INSTALL(FILES ${install_dir}/lib/Box2D${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}/Lib/Release
+    CONFIGURATIONS Release)
+

+ 41 - 7
CMake/ExternalBullet.cmake

@@ -26,11 +26,45 @@ ExternalProject_Add(bullet
 
 ExternalProject_Get_Property(bullet install_dir)
 
-# install built files
-INSTALL(DIRECTORY ${install_dir}/include 
-    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}
+# install includes
+INSTALL(DIRECTORY ${install_dir}/include/
+    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}/Include
     FILES_MATCHING PATTERN "*.h")
-#INSTALL(DIRECTORY ${install_dir}/bin
-#    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX})
-INSTALL(DIRECTORY ${install_dir}/lib
-    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX})
+
+# install debug libs
+INSTALL(FILES ${install_dir}/lib/BulletDynamics${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug
+    RENAME BulletDynamics_d${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+INSTALL(FILES ${install_dir}/lib/BulletCollision${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug
+    RENAME BulletCollision_d${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+INSTALL(FILES ${install_dir}/lib/BulletSoftBody${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug
+    RENAME BulletSoftBody_d${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+INSTALL(FILES ${install_dir}/lib/LinearMath${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug
+    RENAME LinearMath_d${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+# install release libs
+INSTALL(FILES ${install_dir}/lib/BulletDynamics${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}/Lib/Release
+    CONFIGURATIONS Release)
+
+INSTALL(FILES ${install_dir}/lib/BulletCollision${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}/Lib/Release
+    CONFIGURATIONS Release)
+
+INSTALL(FILES ${install_dir}/lib/BulletSoftBody${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}/Lib/Release
+    CONFIGURATIONS Release)
+
+INSTALL(FILES ${install_dir}/lib/LinearMath${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_MODULES_PREFIX}/Lib/Release
+    CONFIGURATIONS Release)

+ 27 - 14
CMake/ExternalFreetype.cmake

@@ -7,11 +7,20 @@ SET(freetype_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/freetype)
 # TODO add other platforms
 IF(MSVC10)
     SET(platform_dir "win32/vc2010")
+ELSEIF(MSVC9)
+    SET(platform_dir "win32/vc2008")
 ELSE()
     MESSAGE(ERROR "Generator support not implemented yet.")
 ENDIF(MSVC10)
 
-BUILD_COMMAND(build_TEMP 
+IF(DEFINED CMAKE_CFG_INTDIR)
+    SET(freetype_CONFIG ${CMAKE_CFG_INTDIR})
+ELSEIF(DEFINED CMAKE_BUILD_TYPE)
+    SET(freetype_CONFIG ${CMAKE_CFG_INTDIR})
+ENDIF()
+
+BUILD_COMMAND(build_TEMP
+    CONFIGURATION ${freetype_CONFIG}
     TARGET builds/${platform_dir}/freetype)
 
 # split build command string into list
@@ -23,10 +32,11 @@ ExternalProject_Add(freetype
     PREFIX ${freetype_PREFIX}
     URL http://download.savannah.gnu.org/releases/freetype/freetype-2.4.5.tar.gz
     URL_MD5 0e67460b312df905dc1cc1586690e7b2
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E echo "Skipping configure step"
+    CONFIGURE_COMMAND ""
     BUILD_IN_SOURCE 1
     BUILD_COMMAND ${freetype_BUILD}
-    INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Skipping install step"
+    INSTALL_COMMAND ""
+    #INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_if_different <SOURCE_DIR>/objs/${platform_dir}/freetype245${CMAKE_STATIC_LIBRARY_SUFFIX} <INSTALL_DIR>/lib/freetype245${CMAKE_STATIC_LIBRARY_SUFFIX}
 )
 
 # get the source dir for in source build
@@ -35,15 +45,18 @@ ExternalProject_Get_Property(freetype source_dir)
 MESSAGE(DEBUG ${source_dir})
 
 # install built files
-INSTALL(DIRECTORY ${source_dir}/include 
-    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}
+INSTALL(DIRECTORY ${source_dir}/include/
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Include
     FILES_MATCHING PATTERN "*.h")
-INSTALL(DIRECTORY ${source_dir}/objs/${platform_dir}/
-    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/lib/
-    FILES_MATCHING PATTERN "*${CMAKE_LINK_LIBRARY_SUFFIX}")
-    
-#ExternalProject_Add_Step(freetype install_headers
-#    COMMAND ${CMAKE_COMMAND} -E echo e1
-#    DEPENDEES build
-#    DEPENDERS install
-#)
+
+ExternalProject_Get_Property(freetype install_dir)
+
+# install debug lib
+INSTALL(FILES ${source_dir}/objs/${platform_dir}/freetype245_D${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug)
+
+# install release lib
+INSTALL(FILES ${source_dir}/objs/${platform_dir}/freetype245${CMAKE_STATIC_LIBRARY_SUFFIX}
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Release
+    CONFIGURATIONS Release)

+ 24 - 6
CMake/ExternalOpenAL.cmake

@@ -13,10 +13,28 @@ ExternalProject_Add(openal
 ExternalProject_Get_Property(openal install_dir)
 
 # install built files
-INSTALL(DIRECTORY ${install_dir}/include 
-    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}
+INSTALL(DIRECTORY ${install_dir}/include/
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Include
     FILES_MATCHING PATTERN "*.h")
-INSTALL(DIRECTORY ${install_dir}/bin
-    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX})
-INSTALL(DIRECTORY ${install_dir}/lib
-    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX})
+
+# install debug lib
+INSTALL(FILES ${install_dir}/lib/OpenAL32${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug
+    RENAME OpenAL32d${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+# install release lib
+INSTALL(FILES ${install_dir}/lib/OpenAL32${CMAKE_STATIC_LIBRARY_SUFFIX}
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Release
+    CONFIGURATIONS Release)
+
+# install debug shared library
+INSTALL(FILES ${install_dir}/bin/OpenAL32${CMAKE_SHARED_LIBRARY_SUFFIX}
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug
+    RENAME OpenAL32d${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+# install release shared library
+INSTALL(FILES ${install_dir}/bin/OpenAL32${CMAKE_SHARED_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Bin/Release
+    CONFIGURATIONS Release)

+ 36 - 6
CMake/ExternalPNG.cmake

@@ -24,12 +24,42 @@ EXTERNALPROJECT_ADD(libpng
 ExternalProject_Get_Property(libpng install_dir)
 
 # install built files
-INSTALL(DIRECTORY ${install_dir}/include 
-    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}
+INSTALL(DIRECTORY ${install_dir}/include/
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Include
     FILES_MATCHING PATTERN "*.h")
-INSTALL(DIRECTORY ${install_dir}/bin
-    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX})
-INSTALL(DIRECTORY ${install_dir}/lib
-    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX})
 
+# install debug libs
+INSTALL(FILES ${install_dir}/lib/zlibd${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug)
 
+INSTALL(FILES ${install_dir}/lib/libpng15d${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug)
+
+# install release lib
+INSTALL(FILES ${install_dir}/lib/zlib${CMAKE_STATIC_LIBRARY_SUFFIX}
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Release
+    CONFIGURATIONS Release)
+
+INSTALL(FILES ${install_dir}/lib/libpng15${CMAKE_STATIC_LIBRARY_SUFFIX}
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Release
+    CONFIGURATIONS Release)
+
+# install debug shared library
+INSTALL(FILES ${install_dir}/bin/zlibd1${CMAKE_SHARED_LIBRARY_SUFFIX}
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug)
+
+INSTALL(FILES ${install_dir}/bin/libpng15d${CMAKE_SHARED_LIBRARY_SUFFIX}
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug)
+
+# install release shared library
+INSTALL(FILES ${install_dir}/bin/zlib1${CMAKE_SHARED_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Bin/Release
+    CONFIGURATIONS Release)
+
+INSTALL(FILES ${install_dir}/bin/libpng15${CMAKE_SHARED_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Bin/Release
+    CONFIGURATIONS Release)

+ 32 - 6
CMake/ExternalPhysFS.cmake

@@ -13,12 +13,38 @@ ExternalProject_Add(physfs
 ExternalProject_Get_Property(physfs install_dir)
 
 # install built files
-INSTALL(DIRECTORY ${install_dir}/include 
-    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}
+INSTALL(DIRECTORY ${install_dir}/include/
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Include
     FILES_MATCHING PATTERN "*.h")
-INSTALL(DIRECTORY ${install_dir}/bin
-    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX})
-INSTALL(DIRECTORY ${install_dir}/lib
-    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX})
+
+# install debug lib
+INSTALL(FILES ${install_dir}/lib/physfs${CMAKE_STATIC_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug
+    RENAME physfsd${CMAKE_STATIC_LIBRARY_SUFFIX})
+
+# install release lib
+INSTALL(FILES ${install_dir}/lib/physfs${CMAKE_STATIC_LIBRARY_SUFFIX}
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Release
+    CONFIGURATIONS Release)
+
+# install debug shared library
+INSTALL(FILES ${install_dir}/bin/physfs${CMAKE_SHARED_LIBRARY_SUFFIX}
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Lib/Debug
+    CONFIGURATIONS Debug
+    RENAME physfsd${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+# install release shared library
+INSTALL(FILES ${install_dir}/bin/physfs${CMAKE_SHARED_LIBRARY_SUFFIX} 
+    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX}/Bin/Release
+    CONFIGURATIONS Release)
+
+
+#INSTALL(DIRECTORY ${install_dir}/bin
+#    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX})
+#INSTALL(DIRECTORY ${install_dir}/lib
+#    DESTINATION ${POLYCODE_EXTERNALS_CORE_PREFIX})
+
+