Browse Source

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)
Partially reverting r3184: user-defined include/lib paths got uploaded

Michał W. Urbańczyk 12 năm trước cách đây
mục cha
commit
6ac70d6a0b
2 tập tin đã thay đổi với 2 bổ sung5 xóa
  1. 1 4
      VCMI_global_debug.props
  2. 1 1
      lib/RegisterTypes.h

+ 1 - 4
VCMI_global_debug.props

@@ -4,10 +4,7 @@
   <PropertyGroup Label="UserMacros">
     <VCMI_Out>$(SolutionDir)</VCMI_Out>
   </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>
+  <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+ 1 - 1
lib/RegisterTypes.h

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