Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Testing for nou.

Browse Source
This commit is contained in:
jaynus 2015-05-12 11:39:12 -07:00
parent b0424f985d
commit e7fe5f39fc
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/CMakeLists.txt
View File

@ -75,11 +75,6 @@ if(USE_BULLET)
set_target_properties(LinearMath PROPERTIES FOLDER Bullet3) set_target_properties(LinearMath PROPERTIES FOLDER Bullet3)
include_directories(BEFORE "lib/bullet3/src") include_directories(BEFORE "lib/bullet3/src")
set(BULLET_LIBS_DEBUG "BulletCollision BulletDynamics LinearMath")
set(BULLET_LIBS "BulletCollision BulletDynamics LinearMath")
else()
set(BULLET_LIBS_DEBUG "")
set(BULLET_LIBS "")
endif() endif()
if(USE_DIRECTX) if(USE_DIRECTX)
add_definitions(-DUSE_DIRECTX) add_definitions(-DUSE_DIRECTX)

4
extensions/vd/CMakeLists.txt
View File

@ -22,9 +22,9 @@ if(NOT USE_BULLET)
endif() endif()
if(DEVEL AND USE_DIRECTX) if(DEVEL AND USE_DIRECTX)
set(LINK_LIBS directxtk BulletDynamics BulletCollision LinaerMath ${DirectX_D3DX11_LIBRARY} ${DirectX_D3D11_LIBRARY} ${DirectX_D3D11_1_LIBRARY} ${DirectX_D3D11_2_LIBRARY}) set(LINK_LIBS directxtk BulletDynamics BulletCollision LinearMath ${DirectX_D3DX11_LIBRARY} ${DirectX_D3D11_LIBRARY} ${DirectX_D3D11_1_LIBRARY} ${DirectX_D3D11_2_LIBRARY})
else() else()
set(LINK_LIBS BulletDynamics BulletCollision LinaerMath) set(LINK_LIBS BulletDynamics BulletCollision LinearMath)
endif() endif()
target_link_libraries(${ACE_EXTENSION_NAME} ace_common ${LINK_LIBS}) target_link_libraries(${ACE_EXTENSION_NAME} ace_common ${LINK_LIBS})