dane/couch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add bullet thirdparty library"

Browse Source 
This reverts commit f1d5672818.
This commit is contained in:
Dane Johnson 2021-03-15 17:28:26 -05:00
parent f1d5672818
commit 176867d3e2
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -27,6 +27,7 @@ target_include_directories(couchlib
if(WIN32) if(WIN32)
target_link_libraries(couch glfw3dll) target_link_libraries(couch glfw3dll)
target_link_libraries(couch ssp) target_link_libraries(couch ssp)
set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
endif(WIN32) endif(WIN32)
install(TARGETS couch couchlib) install(TARGETS couch couchlib)

8
core/CMakeLists.txt
View File

@ -5,6 +5,9 @@ find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
find_package(glfw3 3.3 REQUIRED) find_package(glfw3 3.3 REQUIRED)
## Find Bullet
find_package(Bullet REQUIRED)
if (LUA_ENABLED) if (LUA_ENABLED)
## Find Lua ## Find Lua
find_package(Lua REQUIRED) find_package(Lua REQUIRED)
@ -78,12 +81,17 @@ target_include_directories(couchlib
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}) ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(couchlib
PUBLIC
${BULLET_INCLUDE_DIRS})
target_link_libraries(couchlib glfw) target_link_libraries(couchlib glfw)
target_link_libraries(couchlib OpenGL::GL) target_link_libraries(couchlib OpenGL::GL)
target_link_libraries(couchlib GLEW::GLEW) target_link_libraries(couchlib GLEW::GLEW)
if (LUA_ENABLED) if (LUA_ENABLED)
target_link_libraries(couchlib_luascripting ${LUA_LIBRARIES}) target_link_libraries(couchlib_luascripting ${LUA_LIBRARIES})
endif () endif ()
target_link_libraries(couchlib ${BULLET_LIBRARIES})
## Add documentation ## Add documentation
find_package(Doxygen REQUIRED find_package(Doxygen REQUIRED

7
thirdparty/CMakeLists.txt vendored
View File

@ -10,10 +10,3 @@ target_include_directories(couchlib
PUBLIC PUBLIC
assimp/include) assimp/include)
target_link_libraries(couchlib assimp::assimp) target_link_libraries(couchlib assimp::assimp)
## Bullet
add_subdirectory(bullet)
target_include_directories(couchlib
PUBLIC
bullet/src)
target_link_libraries(couchlib LinearMath Bullet3Common BulletCollision BulletDynamics)