Skip to content
Snippets Groups Projects
Commit 4626248f authored by Jonas Gesenhues's avatar Jonas Gesenhues
Browse files

-Removed project dependencies for SocketFMU_Generator.

-SocketFMU and SocketFMULinux need to be manually built before (see README)
-README updated
-Added bin/ dirs to .gitignore
parent a12f9736
No related branches found
No related tags found
No related merge requests found
......@@ -235,15 +235,7 @@ ModelManifest.xml
# FAKE - F# Make
.fake/
/SocketFMU/SocketFMU/bin/x86/Release
/SocketFMU/SocketFMU/bin/x86/Release
/SocketFMU/SocketDummy/bin/Release
/SocketFMU/SocketFMU/bin/x64/Release
/SocketFMU/SocketFmuLinux/bin/x64/Release/libSocketFmuLinux.so.1.0.recipe.merged
/SocketFMU/SocketFmuLinux/bin/x64/Release/libSocketFmuLinux.so.1.0.recipe
/SocketFMU/SocketFmuLinux/bin/x64/Release/SocketFmuLinuxx64.so
/SocketFMU/SocketFMU/bin/x64/Debug/SocketFMU.dll
/SocketFMU/SocketFMU/bin/x64/Debug/SocketFMU.pdb
/SocketFMU/SocketFmuLinux/bin/x64/Release/SocketFmuLinux.so
/SocketFMU/SocketFMU_Generator/bin/Release/SocketFMU.dll
/SocketFMU/SocketFMU_Generator/bin/Release/SocketFmuLinux.so
/SocketFMU/SocketFMU/bin/*
/SocketFMU/SocketDummy/bin/*
/SocketFMU/SocketFmuLinux/bin/*
/SocketFMU/SocketFMU_Generator/bin/*
......@@ -6,10 +6,12 @@
Output variables can only be received from the first client and will be updated on change.
## Wine compability
Ideally (not yet) WINSOCK and WINAPI only to provide best compability with wine.
Compile with Visual Studio 2013 or lower. Ideal is VS2010(x86).
## Build instruction
### SocketFMU
Boost precompiled libraries are needed [for Windows](https://sourceforge.net/projects/boost/files/boost-binaries/). Currently, Boost 1.74.0 for MSVC 14.1 is used. The project is configured that Boost sits at C:\local\boost_1_74_0 (the default install directory).
### SocketFMU_Generator
The project expects SocketFMU\bin\x64\Release\SocketFMU.dll and SocketFmuLinux\bin\x64\Release\SocketFmuLinux.so to be existent. So those projects need to be built first or, if they can not be built, a mockup dll/so file needs to be provided (the generator just copies the dll/so in the FMU).
## FMU Generator
Creates a FMU which contains the dll and xml.
Additionally a json is includeded in the resources folder which will be loaded by the dll and the generator tool to create the channels.
......

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.16
# Visual Studio Version 16
VisualStudioVersion = 16.0.30413.136
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SocketFMU", "SocketFMU\SocketFMU.vcxproj", "{FD5F465D-C791-4F8C-AC92-54DE5630737C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketFMU_Generator", "SocketFMU_Generator\SocketFMU_Generator.csproj", "{804BBE33-9031-4330-B579-B25E66094B20}"
ProjectSection(ProjectDependencies) = postProject
{30DAF33B-EF73-4C7F-8C30-951F6E95A57F} = {30DAF33B-EF73-4C7F-8C30-951F6E95A57F}
{FD5F465D-C791-4F8C-AC92-54DE5630737C} = {FD5F465D-C791-4F8C-AC92-54DE5630737C}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketDummy", "SocketDummy\SocketDummy.csproj", "{BA371F45-F3AC-419B-994E-57610E5862D5}"
EndProject
......
......@@ -102,13 +102,13 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SOCKETFMU_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>C:\boost_1_65_1;%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\local\boost_1_74_0;%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
<AdditionalOptions> -DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>C:\boost_1_65_1\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>C:\local\boost_1_74_0\lib64-msvc-14.1;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
......@@ -118,13 +118,13 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;SOCKETFMU_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>C:\boost_1_65_1;%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\local\boost_1_74_0;%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
<AdditionalOptions> -DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>C:\boost_1_65_1\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>C:\local\boost_1_74_0\lib64-msvc-14.1;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -136,7 +136,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SOCKETFMU_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>C:\boost_1_65_1;%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\local\boost_1_74_0;%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
<AdditionalOptions> -DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
......@@ -144,7 +144,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>C:\boost_1_65_1\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>C:\local\boost_1_74_0\lib64-msvc-14.1;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
......@@ -156,7 +156,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;SOCKETFMU_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>C:\boost_1_65_1;%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\local\boost_1_74_0;%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
<AdditionalOptions> -DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
......@@ -164,7 +164,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>C:\boost_1_65_1\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>C:\local\boost_1_74_0\lib64-msvc-14.1;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment