diff --git a/package/bullet/README.md b/package/bullet/README.md index 3aa3ee4..c739b4c 100644 --- a/package/bullet/README.md +++ b/package/bullet/README.md @@ -6,13 +6,30 @@ tutorial application which requires it. To build the package, follow these steps. -You need Git, Visual Studio 2017 Command line tools, CMake, Chocolatey, and a text editor. - -- Clone or download https://github.com/bulletphysics/bullet3 -- Create a CMake build directory and run `cmake -G "Visual Studio 15 2017 Win64" PATH_TO_BULLET_SOURCE -DBUILD_SHARED_LIBS=ON -DUSE_DOUBLE_PRECISION=ON -DBUILD_CPU_DEMOS=OFF -DBUILD_BULLET2_DEMOS=OFF -DBUILD_OPENGL3_DEMOS=OFF -DBUILD_UNIT_TESTS=OFF -DBUILD_EXTRAS=OFF`. -- Run `msbuild ALL_BUILD.sln /p:Configuration=Release` -- Copy `Bullet*.lib` and `Bullet*.dll` located under `lib/Release` files to the package `lib/` directory. -- Run `msbuild ALL_BUILD.sln /p:Configuration=Debug` -- Copy `Bullet*_Debug.lib`, `Bullet*_Debug.dll` and `Bullet*_Debug.pdb` located under `lib/Debug` files to the package `lib/` directory. -- Run `choco pack`. -- Test the package and if it's good upload it somewhere your end users can reach it. +You need Git, Visual Studio 2019 Command line tools, CMake, Chocolatey, and a text editor. + +Building bullet from source on windows is difficult. +The vcpkg team has already done it, so run these commands to get vcpkg and make it build bullet. + +``` +git clone https://github.com/Microsoft/vcpkg.git --depth 1 -b 2022.02.23 +cd vcpkg +call bootstrap-vcpkg.bat +vcpkg install bullet3 +``` + +Copy all files from these directories to the directories of the same name in this repository `packages/bullet`. + +* `vcpkg\packages\bullet3_x86-windows\debug` +* `vcpkg\packages\bullet3_x86-windows\include` +* `vcpkg\packages\bullet3_x86-windows\lib` +* `vcpkg\packages\bullet3_x86-windows\share` + +Make the chocolately package + +``` +choco pack +``` + +There should now be a file called `bullet.3.17.nupkg` in the same directory. +Test the package and if it's good upload it somewhere your end users can reach it. diff --git a/package/bullet/bullet.nuspec b/package/bullet/bullet.nuspec index bcbc230..612fad6 100644 --- a/package/bullet/bullet.nuspec +++ b/package/bullet/bullet.nuspec @@ -26,7 +26,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe - 2.89.0 + 3.17 https://github.com/ros2/choco-packages/tree/latest/package/bullet Alejandro Hernández @@ -49,6 +49,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe + diff --git a/package/bullet/debug/.gitkeep b/package/bullet/debug/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/package/bullet/share/.gitkeep b/package/bullet/share/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/package/bullet/share/cmake/BulletConfig.cmake b/package/bullet/share/cmake/BulletConfig.cmake deleted file mode 100644 index f653175..0000000 --- a/package/bullet/share/cmake/BulletConfig.cmake +++ /dev/null @@ -1,78 +0,0 @@ -get_filename_component(_PREFIX "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) -set (BULLET_INCLUDE_DIRS "${_PREFIX}/include") - -set(BULLET_DYNAMICS_LIBRARY - debug - "${_PREFIX}/lib/Bullet3Dynamics_Debug.dll" - "${_PREFIX}/lib/Bullet3Dynamics_Debug.lib" - "${_PREFIX}/lib/BulletDynamics_Debug.dll" - "${_PREFIX}/lib/BulletDynamics_Debug.lib" - "${_PREFIX}/lib/BulletInverseDynamics_Debug.dll" - "${_PREFIX}/lib/BulletInverseDynamics_Debug.lib" - optimized - "${_PREFIX}/lib/Bullet3Dynamics.dll" - "${_PREFIX}/lib/BulletDynamics.dll" - "${_PREFIX}/lib/BulletDynamics.lib" - "${_PREFIX}/lib/BulletInverseDynamics.dll" - "${_PREFIX}/lib/BulletInverseDynamics.lib" -) - -set(BULLET_COLLISION_LIBRARY - debug - "${_PREFIX}/lib/Bullet3Collision_Debug.dll" - "${_PREFIX}/lib/Bullet3Collision_Debug.lib" - "${_PREFIX}/lib/BulletCollision_Debug.dll" - "${_PREFIX}/lib/BulletCollision_Debug.lib" - optimized - "${_PREFIX}/lib/Bullet3Collision.dll" - "${_PREFIX}/lib/Bullet3Collision.lib" - "${_PREFIX}/lib/BulletCollision.dll" - "${_PREFIX}/lib/BulletCollision.lib" -) - -set(BULLET_MATH_LIBRARY - debug - "${_PREFIX}/lib/LinearMath_Debug.dll" - "${_PREFIX}/lib/LinearMath_Debug.lib" - optimized - "${_PREFIX}/lib/LinearMath.dll" - "${_PREFIX}/lib/LinearMath.lib" -) - -set(BULLET_SOFTBODY_LIBRARY - debug - "${_PREFIX}/lib/BulletSoftBody_Debug.dll" - "${_PREFIX}/lib/BulletSoftBody_Debug.lib" - optimized - "${_PREFIX}/lib/BulletSoftBody.dll" - "${_PREFIX}/lib/BulletSoftBody.lib" -) - -set (BULLET_LIBRARIES - debug - "${_PREFIX}/lib/Bullet2FileLoader_Debug.dll" - "${_PREFIX}/lib/Bullet2FileLoader_Debug.lib" - - "${_PREFIX}/lib/Bullet3Common_Debug.dll" - "${_PREFIX}/lib/Bullet3Common_Debug.lib" - "${_PREFIX}/lib/Bullet3Geometry_Debug.dll" - "${_PREFIX}/lib/Bullet3Geometry_Debug.lib" - "${_PREFIX}/lib/Bullet3OpenCL_clew_Debug.dll" - "${_PREFIX}/lib/Bullet3OpenCL_clew_Debug.lib" - optimized - "${_PREFIX}/lib/Bullet2FileLoader.dll" - "${_PREFIX}/lib/Bullet2FileLoader.lib" - "${_PREFIX}/lib/Bullet3Common.dll" - "${_PREFIX}/lib/Bullet3Common.lib" - "${_PREFIX}/lib/Bullet3Geometry.dll" - "${_PREFIX}/lib/Bullet3Geometry.lib" - "${_PREFIX}/lib/Bullet3OpenCL_clew.dll" - "${_PREFIX}/lib/Bullet3OpenCL_clew.lib" -) - -set (BULLET_INCLUDE_DIR "${BULLET_INCLUDE_DIRS}") -set (BULLET_INCLUDE_DIRS "${BULLET_INCLUDE_DIRS}") -set (BULLET_INCLUDE_DIR "${BULLET_INCLUDE_DIRS}") -set (BULLET_LIBRARY "${BULLET_LIBRARIES}") -set (BULLET_LIBRARIES "${BULLET_LIBRARIES}") -set (BULLET_LIBRARY "${BULLET_LIBRARIES}")