diff --git a/ModeliRpc/ModeliRpcNative/IRpcFrontend.h b/ModeliRpc/ModeliRpcNative/IRpcFrontend.h index e8599038affbd702fe7717d6459af7f6a0ea99d1..a830cd0f07b6c6c1052c9018cfe1839c009d6248 100644 --- a/ModeliRpc/ModeliRpcNative/IRpcFrontend.h +++ b/ModeliRpc/ModeliRpcNative/IRpcFrontend.h @@ -54,5 +54,6 @@ public: /// Returns fmi2Status virtual int setValues(ValuesStruct values) = 0; }; -// Factory signature -extern "C" __declspec(dllexport) IRpcFrontend* createRpcFrontend(); \ No newline at end of file + +// Export a function of this type +typedef IRpcFrontend* (*createRpcFrontendType)(); \ No newline at end of file diff --git a/ModeliRpc/ModeliRpcNative/ModeliRpcNative.vcxproj b/ModeliRpc/ModeliRpcNative/ModeliRpcNative.vcxproj index 39aa961b7f1c62300e6a5fdf110001a715c207af..51988ea612bac91468b818280934003fdf7a84b1 100644 --- a/ModeliRpc/ModeliRpcNative/ModeliRpcNative.vcxproj +++ b/ModeliRpc/ModeliRpcNative/ModeliRpcNative.vcxproj @@ -71,15 +71,21 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> + <OutDir>$(Platform)\$(Configuration)\</OutDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <IntDir>$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <IntDir>$(Platform)\$(Configuration)\</IntDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> + <OutDir>$(Platform)\$(Configuration)\</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> diff --git a/ModeliRpc/ModeliRpcNative/RpcFrontend.h b/ModeliRpc/ModeliRpcNative/RpcFrontend.h index d81fe702c15963d8da35c385c2dbae420de3ba4e..8b514da0c16219df7d59ecdbb8d44ce63c98503c 100644 --- a/ModeliRpc/ModeliRpcNative/RpcFrontend.h +++ b/ModeliRpc/ModeliRpcNative/RpcFrontend.h @@ -33,8 +33,7 @@ private: }; /// Factory method that returns an implementation of IRpcFrontend. -IRpcFrontend* createRpcFrontend() +extern "C" __declspec(dllexport) IRpcFrontend* createRpcFrontend() { return new RpcFrontend(); -} - +} \ No newline at end of file