From 8de35cf01cc4c6024c3732852dd1b1bad63365d3 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Tue, 29 Nov 2016 09:09:35 -0800 Subject: [PATCH] remove prefix/postfix from pybullet, so it becomes pybullet.so and pybullet_d.so in debug mode (and on Windows, pybullet.pyd and pybullet_d.pyd) fix build_cmake_pybullet_win32.bat, so it links against correct version of pythonx.lib pythonx_d.lib. Still, I would prefer using premake on Windows, it has more native Visual Studio features. --- build_cmake_pybullet_win32.bat | 2 +- examples/pybullet/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build_cmake_pybullet_win32.bat b/build_cmake_pybullet_win32.bat index 33317f2c1..f3e672899 100644 --- a/build_cmake_pybullet_win32.bat +++ b/build_cmake_pybullet_win32.bat @@ -1,4 +1,4 @@ mkdir cm cd cm -cmake -DBUILD_PYBULLET=ON -DCMAKE_BUILD_TYPE=Release -DPYTHON_INCLUDE_DIR=c:\python-3.5.2\include -DPYTHON_LIBRARY=c:\python-3.5.2\libs\python35_d.lib .. +cmake -DBUILD_PYBULLET=ON -DCMAKE_BUILD_TYPE=Release -DPYTHON_INCLUDE_DIR=c:\python-3.5.2\include -DPYTHON_LIBRARY=c:\python-3.5.2\libs\python35.lib -DPYTHON_DEBUG_LIBRARY=c:\python-3.5.2\libs\python35_d.lib .. start . diff --git a/examples/pybullet/CMakeLists.txt b/examples/pybullet/CMakeLists.txt index 8d95cc67e..85de30a69 100644 --- a/examples/pybullet/CMakeLists.txt +++ b/examples/pybullet/CMakeLists.txt @@ -110,6 +110,9 @@ ELSE(BUILD_PYBULLET_ENET) ADD_LIBRARY(pybullet SHARED ${pybullet_SRCS}) ENDIF(BUILD_PYBULLET_ENET) +SET_TARGET_PROPERTIES(pybullet PROPERTIES PREFIX "") +SET_TARGET_PROPERTIES(pybullet PROPERTIES POSTFIX "") + SET_TARGET_PROPERTIES(pybullet PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(pybullet PROPERTIES SOVERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(pybullet PROPERTIES DEBUG_POSTFIX "_d")