Pārlūkot izejas kodu

fix mingw build

AlexVinS 11 gadi atpakaļ
vecāks
revīzija
c28b5f6633
3 mainītis faili ar 28 papildinājumiem un 20 dzēšanām
  1. 4 20
      lib/NetPacks.h
  2. 23 0
      lib/NetPacksLib.cpp
  3. 1 0
      lib/VCMI_lib.cbp

+ 4 - 20
lib/NetPacks.h

@@ -2130,16 +2130,8 @@ struct ELF_VISIBILITY SelectMap : public CPregamePackToPropagate
 	const CMapInfo *mapInfo;
 	bool free;
 
-	SelectMap(const CMapInfo &src)
-	{
-		mapInfo = &src;
-		free = false;
-	}
-	SelectMap()
-	{
-		mapInfo = nullptr;
-		free = true;
-	}
+	DLL_LINKAGE SelectMap(const CMapInfo &src);
+	DLL_LINKAGE SelectMap();
 	DLL_LINKAGE ~SelectMap();
 
 	void apply(CSelectionScreen *selScreen); //that functions are implemented in CPreGame.cpp
@@ -2158,16 +2150,8 @@ struct ELF_VISIBILITY UpdateStartOptions : public CPregamePackToPropagate
 
 	void apply(CSelectionScreen *selScreen); //that functions are implemented in CPreGame.cpp
 
-	UpdateStartOptions(StartInfo &src)
-	{
-		options = &src;
-		free = false;
-	}
-	UpdateStartOptions()
-	{
-		options = nullptr;
-		free = true;
-	}
+	DLL_LINKAGE UpdateStartOptions(StartInfo &src);
+	DLL_LINKAGE UpdateStartOptions();
 	DLL_LINKAGE ~UpdateStartOptions();
 
 	template <typename Handler> void serialize(Handler &h, const int version)

+ 23 - 0
lib/NetPacksLib.cpp

@@ -62,12 +62,35 @@ DLL_LINKAGE void SetSecSkill::applyGs( CGameState *gs )
 	hero->setSecSkillLevel(which, val, abs);
 }
 
+
+DLL_LINKAGE SelectMap::SelectMap(const CMapInfo &src)
+{
+	mapInfo = &src;
+	free = false;
+}
+DLL_LINKAGE SelectMap::SelectMap()
+{
+	mapInfo = nullptr;
+	free = true;
+}
+
 DLL_LINKAGE SelectMap::~SelectMap()
 {
 	if(free)
 		delete mapInfo;
 }
 
+DLL_LINKAGE  UpdateStartOptions::UpdateStartOptions(StartInfo &src)
+{
+	options = &src;
+	free = false;
+}
+DLL_LINKAGE  UpdateStartOptions::UpdateStartOptions()
+{
+	options = nullptr;
+	free = true;
+}
+
 DLL_LINKAGE UpdateStartOptions::~UpdateStartOptions()
 {
 	if(free)

+ 1 - 0
lib/VCMI_lib.cbp

@@ -128,6 +128,7 @@
 		<Unit filename="IGameCallback.cpp" />
 		<Unit filename="IGameCallback.h" />
 		<Unit filename="IGameEventsReceiver.h" />
+		<Unit filename="IHandlerBase.cpp" />
 		<Unit filename="IHandlerBase.h" />
 		<Unit filename="Interprocess.h" />
 		<Unit filename="JsonDetail.cpp" />