Skip to content

Commit 6c7671e

Browse files
Merge branch 'develop' of github.com:febiosoftware/FEBioWarp into develop
2 parents 6127527 + f7b73bf commit 6c7671e

16 files changed

Lines changed: 14129 additions & 183 deletions

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ endif()
2424

2525
# Find FEBio SDK or git repo automatically
2626
if(WIN32)
27+
add_definitions(-DWIN32 -DFECORE_DLL)
2728
set(TEMP_PATHS ${CMAKE_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/../.. $ENV{HOMEPATH}/ $ENV{HOMEPATH}/source/repos $ENV{HOMEPATH}/*)
2829
else()
2930
set(TEMP_PATHS ${CMAKE_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/../.. $ENV{HOME}/ $ENV{HOME}/*)

Example/test1_v4.feb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13827,6 +13827,8 @@ Comments:
1382713827
<var type="warp-template"/>
1382813828
<var type="warp-target"/>
1382913829
<var type="warp-energy"/>
13830+
<var type="warp-force"/>
13831+
<var type="warp-diff"/>
1383013832
</plotfile>
1383113833
<logfile>
1383213834
<node_data data="ux" node_set="nodeset03"/>

0 commit comments

Comments
 (0)