From e7fe5f39fcaf8e3a2630bbf6b9e242372e809fc3 Mon Sep 17 00:00:00 2001 From: jaynus Date: Tue, 12 May 2015 11:39:12 -0700 Subject: [PATCH] Testing for nou. --- extensions/CMakeLists.txt | 5 ----- extensions/vd/CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt index eca7a5f456..137ee5f1e4 100644 --- a/extensions/CMakeLists.txt +++ b/extensions/CMakeLists.txt @@ -75,11 +75,6 @@ if(USE_BULLET) set_target_properties(LinearMath PROPERTIES FOLDER Bullet3) 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() if(USE_DIRECTX) add_definitions(-DUSE_DIRECTX) diff --git a/extensions/vd/CMakeLists.txt b/extensions/vd/CMakeLists.txt index 2a94fe3f59..f453550779 100644 --- a/extensions/vd/CMakeLists.txt +++ b/extensions/vd/CMakeLists.txt @@ -22,9 +22,9 @@ if(NOT USE_BULLET) endif() 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() - set(LINK_LIBS BulletDynamics BulletCollision LinaerMath) + set(LINK_LIBS BulletDynamics BulletCollision LinearMath) endif() target_link_libraries(${ACE_EXTENSION_NAME} ace_common ${LINK_LIBS})