Fixed canonicial conversion.

Updated submodule.

FMU-Core @ c01a5086

-Subproject commit 1e4dd7925bff81cb2fe141c9d4df70fd9cd8b6a4
+Subproject commit c01a50864e38b3592f881e784e9c38848023c816

Files/FmuFile.cpp

@@ -44,35 +44,35 @@ namespace Files
 
 	std::string FmuFile::GetBinaryPath()
 	{
-		fs::path xmlPath = fs::path(_unzippedPath) / "modelDescription.xml";
+		std::string xmlPath = _unzippedPath + "/modelDescription.xml";
 		// Create a property tree from modelDescription.xml
 		pt::ptree desc;
-		pt::read_xml(xmlPath.generic_string(), desc);
+		pt::read_xml(xmlPath, desc);
 		std::string modelName = desc.get<std::string>("fmiModelDescription.CoSimulation.<xmlattr>.modelIdentifier");
-		fs::path binaryPath = fs::path(_unzippedPath) / "binaries";
+		std::string binaryPath = _unzippedPath + "/binaries";
 
 #ifdef __linux__
 #ifdef __x86_64__ || __ppc64__
-		binaryPath /= "linux64";
+		binaryPath += "/linux64";
 #else
-		binaryPath /= "linux32";
+		binaryPath += "/linux32";
 #endif
 #elif _WIN64
-		binaryPath /= "win64";
+		binaryPath += "/win64";
 #elif _WIN32
-		binaryPath /= "win32";
+		binaryPath += "/win32";
 #else
 #error define your compiler
 #endif
-		binaryPath /= (modelName);
-		return fs::canonical(binaryPath).generic_string();
+		binaryPath += "/" + modelName;
+		return fs::weakly_canonical(binaryPath).generic_string();
 	}
 	std::string FmuFile::GetGUID()
 	{
-		auto xmlPath = fs::path(_unzippedPath) / "modelDescription.xml";
+		std::string xmlPath = _unzippedPath + "/modelDescription.xml";
 		// Create a property tree from modelDescription.xml
 		pt::ptree desc;
-		pt::read_xml(xmlPath.generic_string(), desc);
+		pt::read_xml(xmlPath, desc);
 		return desc.get<std::string>("fmiModelDescription.<xmlattr>.guid");
 	}
 	std::string FmuFile::GetResourceUri()
@@ -80,8 +80,8 @@ namespace Files
 		// Create prefix
 		std::string prefix = "file:///";	// mandatory according to the fmi doc
 		// Create path object
-		fs::path resourceDir = fs::absolute(_unzippedPath) / "resources";
+		std::string resourceDir = _unzippedPath + "/resources";
 		// Append absolute path of the mod		
-		return prefix + resourceDir.generic_string();;
+		return prefix + resourceDir;
 	}
 }
\ No newline at end of file

MC_Backend_Linux/MC_Backend_Linux.vcxproj

@@ -39,21 +39,27 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
+    <UseOfStl>libstdc++_static</UseOfStl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
+    <UseOfStl>libstdc++_static</UseOfStl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
+    <UseOfStl>libstdc++_static</UseOfStl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
+    <UseOfStl>libstdc++_static</UseOfStl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
+    <UseOfStl>libstdc++_static</UseOfStl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
+    <UseOfStl>libstdc++_static</UseOfStl>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
@@ -96,6 +102,7 @@
       <AdditionalLibraryDirectories>/usr/boost165/stage/lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
+      <AdditionalOptions>-static %(AdditionalOptions)</AdditionalOptions>
     </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>
@@ -108,6 +115,7 @@
       <AdditionalLibraryDirectories>/usr/boost165/stage/lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
+      <AdditionalOptions>-static %(AdditionalOptions)</AdditionalOptions>
     </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>
@@ -120,6 +128,7 @@
       <AdditionalLibraryDirectories>/usr/boost165/stage/lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
+      <AdditionalOptions>-static %(AdditionalOptions)</AdditionalOptions>
     </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>
@@ -136,6 +145,7 @@
       <AdditionalLibraryDirectories>/usr/boost165/stage/lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
+      <AdditionalOptions>-static %(AdditionalOptions)</AdditionalOptions>
     </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>
@@ -152,6 +162,7 @@
       <AdditionalLibraryDirectories>/usr/boost165/stage/lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
+      <AdditionalOptions>-static %(AdditionalOptions)</AdditionalOptions>
     </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>
@@ -164,6 +175,7 @@
       <AdditionalLibraryDirectories>/usr/boost165/stage/lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <LibraryDependencies>dl;pthread;boost_filesystem;boost_system;boost_program_options</LibraryDependencies>
+      <AdditionalOptions>-static %(AdditionalOptions)</AdditionalOptions>
     </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>