games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-05-13 22:06:58 +02:00
Code Issues Releases Activity

Partially reverting r3191: DLL_LINKAGE on registerTypes def breaks compilation for MSVC. The function definition cannot be marked as dll import (and that happened, when it was included in CGameHandler.cpp)

Browse Source 
Partially reverting r3184: user-defined include/lib paths got uploaded
This commit is contained in:
Michał W. Urbańczyk 2013-02-12 12:51:31 +00:00
parent 5a8787b74d
commit 6ac70d6a0b
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
VCMI_global_debug.props
View File

@ -4,10 +4,7 @@
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<VCMI_Out>$(SolutionDir)</VCMI_Out> <VCMI_Out>$(SolutionDir)</VCMI_Out>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup />
<IncludePath>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;$(IncludePath)</IncludePath>
<LibraryPath>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib;G:\boost\SDL_mixer-1.2.11\lib;G:\boost\zlib125-dll\lib;G:\boost\SDL-1.2.14\lib;G:\boost\SDL_image-1.2.10\lib;G:\boost\SDL_ttf-2.0.10\lib;G:\boost\boost_1_51_0\stage\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

2
lib/RegisterTypes.h
View File

@ -253,7 +253,7 @@ void registerTypes4(Serializer &s)
} }
template<typename Serializer> template<typename Serializer>
DLL_LINKAGE void registerTypes(Serializer &s) void registerTypes(Serializer &s)
{ {
registerTypes1(s); registerTypes1(s);
registerTypes2(s); registerTypes2(s);