From 8282897d15eccd40bafd5c6ccc04412d2ef2dd48 Mon Sep 17 00:00:00 2001
From: Tim Uebelhoer <tim.uebelhoer@rwth-aachen.de>
Date: Mon, 16 Oct 2017 15:30:12 +0200
Subject: [PATCH] Using shared libraries so we don't have any troubles using
dlopen
---
MC_Backend_Linux/MC_Backend_Linux.vcxproj | 48 +++++++++++------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/MC_Backend_Linux/MC_Backend_Linux.vcxproj b/MC_Backend_Linux/MC_Backend_Linux.vcxproj
index 6d474ea..1e4fb7f 100644
--- a/MC_Backend_Linux/MC_Backend_Linux.vcxproj
+++ b/MC_Backend_Linux/MC_Backend_Linux.vcxproj
@@ -39,27 +39,27 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
- <UseOfStl>libstdc++_static</UseOfStl>
+ <UseOfStl>libstdc++_shared</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
- <UseOfStl>libstdc++_static</UseOfStl>
+ <UseOfStl>libstdc++_shared</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
- <UseOfStl>libstdc++_static</UseOfStl>
+ <UseOfStl>libstdc++_shared</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
- <UseOfStl>libstdc++_static</UseOfStl>
+ <UseOfStl>libstdc++_shared</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
- <UseOfStl>libstdc++_static</UseOfStl>
+ <UseOfStl>libstdc++_shared</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
- <UseOfStl>libstdc++_static</UseOfStl>
+ <UseOfStl>libstdc++_shared</UseOfStl>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
@@ -99,39 +99,39 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Link>
- <AdditionalLibraryDirectories>/usr/boost165/stage/lib</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>/usr/boost_1_65_1/stage/lib</AdditionalLibraryDirectories>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
- <AdditionalOptions>-static %(AdditionalOptions)</AdditionalOptions>
+ <SharedLibrarySearchPath>$ORIGIN;%(SharedLibrarySearchPath)</SharedLibrarySearchPath>
</Link>
<ClCompile>
- <AdditionalIncludeDirectories>/usr/boost164;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;/usr/boost164;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;../AdditionalIncludes/MC_Protocol;../AdditionalIncludes/flatbuffers;../FMU-Core/NativeFmuShared;../Files</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>/usr/boost_1_65_1;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;</AdditionalIncludeDirectories>
<AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB </AdditionalOptions>
<CppLanguageStandard>c++1y</CppLanguageStandard>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<Link>
- <AdditionalLibraryDirectories>/usr/boost165/stage/lib</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>/usr/boost_1_65_1/stage/lib</AdditionalLibraryDirectories>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
- <AdditionalOptions>-static %(AdditionalOptions)</AdditionalOptions>
+ <SharedLibrarySearchPath>$ORIGIN;%(SharedLibrarySearchPath)</SharedLibrarySearchPath>
</Link>
<ClCompile>
- <AdditionalIncludeDirectories>/usr/boost164;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;/usr/boost164;../Simulation;../AdditionalIncludes;../AdditionalIncludes/MC_Protocol;../AdditionalIncludes/flatbuffers;../FMU-Core/NativeFmuShared;../Files</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>/usr/boost_1_65_1;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;</AdditionalIncludeDirectories>
<AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB </AdditionalOptions>
<CppLanguageStandard>c++1y</CppLanguageStandard>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Link>
- <AdditionalLibraryDirectories>/usr/boost165/stage/lib</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>/usr/boost_1_65_1/stage/lib</AdditionalLibraryDirectories>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
- <AdditionalOptions>-static %(AdditionalOptions)</AdditionalOptions>
+ <SharedLibrarySearchPath>$ORIGIN;%(SharedLibrarySearchPath)</SharedLibrarySearchPath>
</Link>
<ClCompile>
- <AdditionalIncludeDirectories>/usr/boost165;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;/usr/boost164;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;../FMU-Core/NativeFmuShared;../Files</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>/usr/boost_1_65_1;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;</AdditionalIncludeDirectories>
<AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB</AdditionalOptions>
<CppLanguageStandard>c++1y</CppLanguageStandard>
</ClCompile>
@@ -142,13 +142,13 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Link>
- <AdditionalLibraryDirectories>/usr/boost165/stage/lib</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>/usr/boost_1_65_1/stage/lib</AdditionalLibraryDirectories>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
- <AdditionalOptions>-static %(AdditionalOptions)</AdditionalOptions>
+ <SharedLibrarySearchPath>$ORIGIN;%(SharedLibrarySearchPath)</SharedLibrarySearchPath>
</Link>
<ClCompile>
- <AdditionalIncludeDirectories>/usr/boost165;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;C:\boost_1_64_0;../Simulation;../AdditionalIncludes;../FMU-Core/NativeFmuShared;../Files</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>/usr/boost_1_65_1;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;</AdditionalIncludeDirectories>
<AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB</AdditionalOptions>
<CppLanguageStandard>c++1y</CppLanguageStandard>
</ClCompile>
@@ -159,26 +159,26 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<Link>
- <AdditionalLibraryDirectories>/usr/boost165/stage/lib</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>/usr/boost_1_65_1/stage/lib</AdditionalLibraryDirectories>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
- <AdditionalOptions>-static %(AdditionalOptions)</AdditionalOptions>
+ <SharedLibrarySearchPath>$ORIGIN;%(SharedLibrarySearchPath)</SharedLibrarySearchPath>
</Link>
<ClCompile>
- <AdditionalIncludeDirectories>/usr/boost164;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;/usr/boost164;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;../AdditionalIncludes/MC_Protocol;../AdditionalIncludes/flatbuffers;../FMU-Core/NativeFmuShared;../Files</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>/usr/boost_1_65_1;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;</AdditionalIncludeDirectories>
<AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB</AdditionalOptions>
<CppLanguageStandard>c++1y</CppLanguageStandard>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
<Link>
- <AdditionalLibraryDirectories>/usr/boost165/stage/lib</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>/usr/boost_1_65_1/stage/lib</AdditionalLibraryDirectories>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
- <AdditionalOptions>-static %(AdditionalOptions)</AdditionalOptions>
+ <SharedLibrarySearchPath>$ORIGIN;%(SharedLibrarySearchPath)</SharedLibrarySearchPath>
</Link>
<ClCompile>
- <AdditionalIncludeDirectories>/usr/boost164;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;/usr/boost164;../Simulation;../AdditionalIncludes;../AdditionalIncludes/MC_Protocol;../AdditionalIncludes/flatbuffers;../FMU-Core/NativeFmuShared;../Files</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>/usr/boost_1_65_1;../FMU-Core/NativeFmuShared;../Network;../Files;../Simulation;../AdditionalIncludes/flatbuffers;../AdditionalIncludes/MC_Protocol;</AdditionalIncludeDirectories>
<AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB</AdditionalOptions>
<CppLanguageStandard>c++1y</CppLanguageStandard>
</ClCompile>
--
GitLab