Merge pull request #183 from aquileia/VC_update

Update VC project
wesnoth · Jun 2, 2014 · deeaaa7 · deeaaa7
2 parents dd1f1cc + cd4dcbf
commit deeaaa7
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 4 deletions.
diff --git a/projectfiles/VC9/WML_tests.cmd b/projectfiles/VC9/WML_tests.cmd
@@ -8,10 +8,9 @@ setlocal enabledelayedexpansion
 set LoadFile=%~p0..\..\wml_test_schedule
 set binary=wesnoth.exe
 set opt=--log-strict=warning
-:: OutDir is necessary for VC debug configuration, defaults to wesnoth\
-if "%1"=="" ( set "OutDir=..\..\") else ( set "OutDir=%~p1")
+:: executable path can be set for VC debug configuration, defaults to wesnoth\
+if "%1"=="" ( cd ..\..\ ) else ( cd %~p1 )
 
-cd %OutDir%
 echo running WML tests:
 
 :: ignore lines beginning with #
@@ -28,12 +27,15 @@ for /f "eol=# tokens=1,2 delims= " %%G in (%LoadFile%) do (
             echo(
             echo WML_tests.cmd: Error WML1: Test '%%H' returned !ERRORLEVEL!, expected %%G
         )
+        set /a "fail_num+=1"
     )
     :: minimalistic progress bar
     <nul (set/p progress=.)
+    set /a "test_num+=1"
 )
 echo(
-echo WML tests completed
+if not DEFINED fail_num ( set "fail_num=none" )
+echo %test_num% WML tests completed, %fail_num% of them failed
 
 :: restore the state before execution
 cd %~p0

diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
@@ -19671,6 +19671,62 @@
 				RelativePath="..\..\src\sdl\exception.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\sdl\rect.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\SDL\"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\SDL\"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_with_VLD|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\SDL\"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Test_Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\SDL\"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Test_Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\SDL\"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseDEBUG|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\SDL\"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\sdl\rect.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\sdl\texture.cpp"
 				>
@@ -19852,6 +19908,14 @@
 			RelativePath="..\..\src\callable_objects.hpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\src\carryover.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\carryover.hpp"
+			>
+		</File>
 		<File
 			RelativePath="..\..\src\chat_events.hpp"
 			>