Commit 48a126b5 authored by Nicolas Docquier's avatar Nicolas Docquier
Browse files

Merge branch 'static_userfct_link' into 'Release_1.9.4'

correct sattic linkage userfctR

Solving issue #57 : linkage of userfcrtR was not working in Windows if using symbolic functions like *mbs_sensor*

@habra

See merge request !88
parents c855c8cc 1457c609
......@@ -52,7 +52,6 @@ if( FLAG_SHARED_LIB OR FLAG_SEPARATE_SYMBOLIC )
add_library(Project_symbolic SHARED ${SOURCE_FILES})
else()
add_library(Project_symbolic STATIC ${SOURCE_FILES})
add_definitions( -DPROJECT_SYMBOLIC_STATIC_DEFINE)
add_definitions( -DPROJECT_USERFCT_STATIC_DEFINE)
# some symbolic routines call user functions (ext_forces, accelred, ...)
......
......@@ -86,6 +86,7 @@ if( FLAG_SHARED_LIB OR FLAG_SEPARATE_USER_FCT )
else()
add_library(Project_userfct STATIC ${SOURCE_FILES})
add_definitions( -DMBSYSC_UTILITIES_STATIC_DEFINE)
add_definitions( -DPROJECT_SYMBOLIC_STATIC_DEFINE)
target_link_libraries (Project_userfct ${LIB_MBSYSC_REALTIME} ${LIB_MBSYSC_UTILITIES})
endif()
......
......@@ -52,7 +52,6 @@ if( FLAG_SHARED_LIB OR FLAG_SEPARATE_SYMBOLIC )
add_library(Project_symbolic SHARED ${SOURCE_FILES})
else()
add_library(Project_symbolic STATIC ${SOURCE_FILES})
add_definitions( -DPROJECT_SYMBOLIC_STATIC_DEFINE)
add_definitions( -DPROJECT_USERFCT_STATIC_DEFINE)
# some symbolic routines call user functions (ext_forces, accelred, ...)
......
......@@ -86,6 +86,7 @@ if( FLAG_SHARED_LIB OR FLAG_SEPARATE_USER_FCT )
else()
add_library(Project_userfct STATIC ${SOURCE_FILES})
add_definitions( -DMBSYSC_UTILITIES_STATIC_DEFINE)
add_definitions( -DPROJECT_SYMBOLIC_STATIC_DEFINE)
target_link_libraries (Project_userfct ${LIB_MBSYSC_REALTIME} ${LIB_MBSYSC_UTILITIES})
endif()
......
......@@ -58,7 +58,6 @@ if( FLAG_SHARED_LIB OR FLAG_SEPARATE_SYMBOLIC )
add_library(Project_symbolic SHARED ${SOURCE_FILES})
else()
add_library(Project_symbolic STATIC ${SOURCE_FILES})
add_definitions( -DPROJECT_SYMBOLIC_STATIC_DEFINE)
add_definitions( -DPROJECT_USERFCT_STATIC_DEFINE)
# some symbolic routines call user functions (ext_forces, accelred, ...)
......
......@@ -92,6 +92,7 @@ if( FLAG_SHARED_LIB OR FLAG_SEPARATE_USER_FCT )
else()
add_library(Project_userfct STATIC ${SOURCE_FILES})
add_definitions( -DMBSYSC_UTILITIES_STATIC_DEFINE)
add_definitions( -DPROJECT_SYMBOLIC_STATIC_DEFINE)
target_link_libraries (Project_userfct ${LIB_MBSYSC_REALTIME} ${LIB_MBSYSC_UTILITIES})
endif()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment