MSVC fixups

wesnoth · Mar 29, 2016 · 41095c1 · 41095c1
1 parent 7c5c79a
commit 41095c1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
@@ -14824,47 +14824,47 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\utils"
+						ObjectFile="$(IntDir)\utils\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\utils"
+						ObjectFile="$(IntDir)\utils\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug_with_VLD|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\utils"
+						ObjectFile="$(IntDir)\utils\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Test_Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\utils"
+						ObjectFile="$(IntDir)\utils\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Test_Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\utils"
+						ObjectFile="$(IntDir)\utils\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="ReleaseDEBUG|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\utils"
+						ObjectFile="$(IntDir)\utils\"
 					/>
 				</FileConfiguration>
 			</File>
@@ -14884,47 +14884,47 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\utils"
+						ObjectFile="$(IntDir)\utils\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\utils"
+						ObjectFile="$(IntDir)\utils\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug_with_VLD|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\utils"
+						ObjectFile="$(IntDir)\utils\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Test_Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\utils"
+						ObjectFile="$(IntDir)\utils\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Test_Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\utils"
+						ObjectFile="$(IntDir)\utils\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="ReleaseDEBUG|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\utils"
+						ObjectFile="$(IntDir)\utils\"
 					/>
 				</FileConfiguration>
 			</File>

diff --git a/src/ai/lua/lua_object.cpp b/src/ai/lua/lua_object.cpp
@@ -35,6 +35,9 @@ namespace ai {
 		// empty
 	}
 
+	// MSVC fails to compile without this line
+	template class lua_object<aspect_attacks_lua_filter>;
+
 	template <>
 	boost::shared_ptr<aspect_attacks_lua_filter> lua_object<aspect_attacks_lua_filter>::to_type(lua_State *L, int n)
 	{