From cbc6ae98d87a1f7040d178919a4f2439b0782f7a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 19 Feb 2015 13:22:33 -0800 Subject: [PATCH] groundwork for windows support in bullet external project --- cmake/externals/bullet/CMakeLists.txt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/cmake/externals/bullet/CMakeLists.txt b/cmake/externals/bullet/CMakeLists.txt index 3166c7b2f3..d82cbd5fad 100644 --- a/cmake/externals/bullet/CMakeLists.txt +++ b/cmake/externals/bullet/CMakeLists.txt @@ -1,15 +1,25 @@ set(EXTERNAL_NAME bullet) if (ANDROID) - set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19") + set(PLATFORM_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19") +elseif (WIN32) + set(PLATFORM_CMAKE_ARGS "-DUSE_MSVC_RUNTIME_LIBRARY_DLL=1") +endif () + +if (WIN32) + set(DOWNLOAD_URL https://bullet.googlecode.com/files/bullet-2.82-r2704.zip) + set(DOWNLOAD_MD5 f5e8914fc9064ad32e0d62d19d33d977) +else () + set(DOWNLOAD_URL http://bullet.googlecode.com/files/bullet-2.82-r2704.tgz) + set(DOWNLOAD_MD5 70b3c8d202dee91a0854b4cbc88173e8) endif () include(ExternalProject) ExternalProject_Add( ${EXTERNAL_NAME} - URL http://bullet.googlecode.com/files/bullet-2.82-r2704.tgz - URL_MD5 70b3c8d202dee91a0854b4cbc88173e8 - CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DINSTALL_LIBS=1 -DBUILD_DEMOS=0 -DBUILD_SHARED_LIBS=1 -DUSE_GLM=0 + URL ${DOWNLOAD_URL} + URL_MD5 ${DOWNLOAD_MD5} + CMAKE_ARGS ${PLATFORM_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DINSTALL_LIBS=1 -DBUILD_DEMOS=0 -DBUILD_SHARED_LIBS=1 -DUSE_GLM=0 LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1