Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cmake changes #266

Merged
merged 1 commit into from
Jan 19, 2022
Merged

cmake changes #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion newton-4.00/sdk/dCollision/ndBodyKinematic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ndSkeletonContainer;
class ndJointBilateralConstraint;

D_MSV_NEWTON_ALIGN_32
class ndBodyKinematic: public ndBody
class ndBodyKinematic : public ndBody
{
class ndContactkey
{
Expand Down
4 changes: 2 additions & 2 deletions newton-4.00/sdk/dCore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ endif()

if (MSVC)
if(CMAKE_VS_MSBUILD_COMMAND OR CMAKE_VS_DEVENV_COMMAND)
set_target_properties(${projectName} PROPERTIES COMPILE_FLAGS "/YudCoreStdAfx.h")
set_source_files_properties(dCoreStdAfx.cpp PROPERTIES COMPILE_FLAGS "/YcdCoreStdAfx.h")
set_target_properties(${projectName} PROPERTIES COMPILE_FLAGS "/YundCoreStdAfx.h")
set_source_files_properties(ndCoreStdAfx.cpp PROPERTIES COMPILE_FLAGS "/YcndCoreStdAfx.h")
endif()

if (NEWTON_BUILD_TEST AND NEWTON_BUILD_SHARED_LIBS)
Expand Down
2 changes: 1 addition & 1 deletion newton-4.00/sdk/dCore/ndAabbPolygonSoup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* 3. This notice may not be removed or altered from any source distribution.
*/

#include "ndCoreStdafx.h"
#include "ndCoreStdAfx.h"
#include "ndTypes.h"
#include "ndHeap.h"
#include "ndStack.h"
Expand Down
2 changes: 1 addition & 1 deletion newton-4.00/sdk/dCore/ndCoreStdafx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* 3. This notice may not be removed or altered from any source distribution.
*/

#include "ndCoreStdafx.h"
#include "ndCoreStdAfx.h"

#ifdef _D_CORE_DLL
#include "ndTypes.h"
Expand Down
4 changes: 4 additions & 0 deletions newton-4.00/sdk/dExtensions/dAvx2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ if(UNIX)
add_library(${projectName} SHARED ${CPP_SOURCE})
endif()

if(MSVC OR MINGW)
target_link_options(${projectName} PUBLIC "/DEBUG")
endif()

install(TARGETS ${projectName}
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
Expand Down
5 changes: 4 additions & 1 deletion newton-4.00/sdk/dNewton/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ if(NEWTON_BUILD_SHARED_LIBS)
add_definitions(-D_D_NEWTON_EXPORT_DLL)
add_library(${projectName} SHARED ${CPP_SOURCE})

target_link_libraries (${projectName} ndAvx2Solver)

if(MSVC OR MINGW)
target_link_options(${projectName} PUBLIC "/DEBUG")
Expand Down Expand Up @@ -106,6 +105,10 @@ if (MSVC)
endif(MSVC)

target_link_libraries(${projectName} ndTinyxml ndCore ndCollision)
if(NEWTON_ENABLE_AVX2_SOLVER)
target_link_libraries(${projectName} ndSolverAvx2)
endif()


install(TARGETS ${projectName}
LIBRARY DESTINATION lib
Expand Down