Fix wesnothd and campaignd link errors

wesnoth · Mar 5, 2018 · b02e735 · b02e735
1 parent b0559eb
commit b02e735
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/projectfiles/VC12/wesnoth.vcxproj b/projectfiles/VC12/wesnoth.vcxproj
@@ -744,6 +744,7 @@
     <ClCompile Include="..\..\src\controller_base.cpp" />
     <ClCompile Include="..\..\src\countdown_clock.cpp" />
     <ClCompile Include="..\..\src\cursor.cpp" />
+    <ClCompile Include="..\..\src\deprecation.cpp" />
     <ClCompile Include="..\..\src\desktop\clipboard.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Desktop\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Desktop\</ObjectFileName>
@@ -3581,6 +3582,7 @@
     <ClInclude Include="..\..\src\controller_base.hpp" />
     <ClInclude Include="..\..\src\countdown_clock.hpp" />
     <ClInclude Include="..\..\src\cursor.hpp" />
+    <ClInclude Include="..\..\src\deprecation.hpp" />
     <ClInclude Include="..\..\src\desktop\clipboard.hpp" />
     <ClInclude Include="..\..\src\desktop\notifications.hpp" />
     <ClInclude Include="..\..\src\desktop\open.hpp" />

diff --git a/projectfiles/VC12/wesnoth.vcxproj.filters b/projectfiles/VC12/wesnoth.vcxproj.filters
@@ -1558,6 +1558,7 @@
     <ClCompile Include="..\..\src\gui\dialogs\surrender_quit.cpp">
       <Filter>Gui\Dialogs</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\deprecation.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\addon\client.hpp">
@@ -3025,6 +3026,7 @@
     <ClInclude Include="..\..\src\gui\dialogs\surrender_quit.hpp">
       <Filter>Gui\Dialogs</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\deprecation.hpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\tests\test_sdl_utils.hpp">

diff --git a/projectfiles/VC12/wesnothlib.vcxproj b/projectfiles/VC12/wesnothlib.vcxproj
@@ -138,7 +138,6 @@
     <ClCompile Include="..\..\src\color_range.cpp" />
     <ClCompile Include="..\..\src\config.cpp" />
     <ClCompile Include="..\..\src\config_attribute_value.cpp" />
-    <ClCompile Include="..\..\src\deprecation.cpp" />
     <ClCompile Include="..\..\src\filesystem_boost.cpp" />
     <ClCompile Include="..\..\src\filesystem_common.cpp" />
     <ClCompile Include="..\..\src\font\constants.cpp" />

diff --git a/projectfiles/VC12/wesnothlib.vcxproj.filters b/projectfiles/VC12/wesnothlib.vcxproj.filters
@@ -71,7 +71,6 @@
     <ClCompile Include="..\..\src\formula\string_utils.cpp">
       <Filter>Formula</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\deprecation.cpp" />
     <ClCompile Include="..\..\src\bcrypt\bcrypt.c">
       <Filter>Bcrypt</Filter>
     </ClCompile>

diff --git a/src/campaign_server/campaign_server.cpp b/src/campaign_server/campaign_server.cpp
@@ -930,6 +930,3 @@ int main()
 
 	return 0;
 }
-
-void deprecated_message(const std::string&, int, const version_info&, const std::string&);
-void deprecated_message(const std::string&, int, const version_info&, const std::string&) {}
diff --git a/src/server/server.cpp b/src/server/server.cpp
@@ -2832,6 +2832,3 @@ int main(int argc, char** argv) {
 
 	return 0;
 }
-
-void deprecated_message(const std::string&, int, const version_info&, const std::string&);
-void deprecated_message(const std::string&, int, const version_info&, const std::string&) {}
diff --git a/src/server/server_base.cpp b/src/server/server_base.cpp
@@ -207,3 +207,10 @@ void async_send_message(socket_ptr socket, const std::string& msg)
 
 	async_send_doc(socket, doc);
 }
+
+// This is just here to get it to build without the deprecation_message function
+#include "version.hpp"
+#include "deprecation.hpp"
+
+std::string deprecated_message(const std::string&, DEP_LEVEL, const version_info&, const std::string&);
+std::string deprecated_message(const std::string&, DEP_LEVEL, const version_info&, const std::string&) {return "";}