Patch from Ken Rogoway:
authorSam Lantinga <slouken@libsdl.org>
Mon, 14 Feb 2011 00:45:16 -0800
changeset 5295b88d05603e4b
parent 5294 4801b8bede31
child 5296 48067bfc300c
Patch from Ken Rogoway:
Migrate all of the recent changes into the SDL VS2005 project file.
Fix missing return value in SDL_pixels.c
Fix compile error in testscale.c, variable was incorrectly named.
Added VS2005 project file for testscale
VisualC/SDL/SDL_VS2005.vcproj
VisualC/tests/testscale/testscale_VS2005.vcproj
src/video/SDL_pixels.c
test/testscale.c
     1.1 --- a/VisualC/SDL/SDL_VS2005.vcproj	Sun Feb 13 23:09:18 2011 -0800
     1.2 +++ b/VisualC/SDL/SDL_VS2005.vcproj	Mon Feb 14 00:45:16 2011 -0800
     1.3 @@ -29,7 +29,7 @@
     1.4  			<Tool
     1.5  				Name="VCPreBuildEventTool"
     1.6  				Description="Making sure basic SDL headers are in place..."
     1.7 -				CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
     1.8 +				CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;xcopy /d /q /y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
     1.9  			/>
    1.10  			<Tool
    1.11  				Name="VCCustomBuildTool"
    1.12 @@ -207,7 +207,7 @@
    1.13  			<Tool
    1.14  				Name="VCPreBuildEventTool"
    1.15  				Description="Making sure basic SDL headers are in place..."
    1.16 -				CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
    1.17 +				CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;xcopy /d /q /y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
    1.18  			/>
    1.19  			<Tool
    1.20  				Name="VCCustomBuildTool"
    1.21 @@ -399,6 +399,10 @@
    1.22  				>
    1.23  			</File>
    1.24  			<File
    1.25 +				RelativePath="..\..\include\SDL_blendmode.h"
    1.26 +				>
    1.27 +			</File>
    1.28 +			<File
    1.29  				RelativePath="..\..\include\SDL_clipboard.h"
    1.30  				>
    1.31  			</File>
    1.32 @@ -435,10 +439,22 @@
    1.33  				>
    1.34  			</File>
    1.35  			<File
    1.36 +				RelativePath="..\..\include\SDL_gesture.h"
    1.37 +				>
    1.38 +			</File>
    1.39 +			<File
    1.40  				RelativePath="..\..\include\SDL_haptic.h"
    1.41  				>
    1.42  			</File>
    1.43  			<File
    1.44 +				RelativePath="..\..\include\SDL_hints.h"
    1.45 +				>
    1.46 +			</File>
    1.47 +			<File
    1.48 +				RelativePath="..\..\include\SDL_input.h"
    1.49 +				>
    1.50 +			</File>
    1.51 +			<File
    1.52  				RelativePath="..\..\include\SDL_joystick.h"
    1.53  				>
    1.54  			</File>
    1.55 @@ -455,6 +471,10 @@
    1.56  				>
    1.57  			</File>
    1.58  			<File
    1.59 +				RelativePath="..\..\include\SDL_log.h"
    1.60 +				>
    1.61 +			</File>
    1.62 +			<File
    1.63  				RelativePath="..\..\include\SDL_main.h"
    1.64  				>
    1.65  			</File>
    1.66 @@ -499,6 +519,10 @@
    1.67  				>
    1.68  			</File>
    1.69  			<File
    1.70 +				RelativePath="..\..\include\SDL_render.h"
    1.71 +				>
    1.72 +			</File>
    1.73 +			<File
    1.74  				RelativePath="..\..\include\SDL_revision.h"
    1.75  				>
    1.76  			</File>
    1.77 @@ -531,6 +555,10 @@
    1.78  				>
    1.79  			</File>
    1.80  			<File
    1.81 +				RelativePath="..\..\include\SDL_touch.h"
    1.82 +				>
    1.83 +			</File>
    1.84 +			<File
    1.85  				RelativePath="..\..\include\SDL_types.h"
    1.86  				>
    1.87  			</File>
    1.88 @@ -596,7 +624,7 @@
    1.89  			>
    1.90  		</File>
    1.91  		<File
    1.92 -			RelativePath="..\..\src\video\mmx.h"
    1.93 +			RelativePath="..\..\src\render\mmx.h.h"
    1.94  			>
    1.95  		</File>
    1.96  		<File
    1.97 @@ -632,10 +660,6 @@
    1.98  			>
    1.99  		</File>
   1.100  		<File
   1.101 -			RelativePath="..\..\src\video\SDL_alphamult.c"
   1.102 -			>
   1.103 -		</File>
   1.104 -		<File
   1.105  			RelativePath="..\..\src\video\SDL_alphamult.h"
   1.106  			>
   1.107  		</File>
   1.108 @@ -676,19 +700,27 @@
   1.109  			>
   1.110  		</File>
   1.111  		<File
   1.112 -			RelativePath="..\..\src\video\SDL_blendfillrect.c"
   1.113 +			RelativePath="..\..\src\render\software\SDL_blendfillrect.c"
   1.114 +			>
   1.115 +		</File>
   1.116 +		<File
   1.117 +			RelativePath="..\..\src\render\software\SDL_blendfillrect.h"
   1.118  			>
   1.119  		</File>
   1.120  		<File
   1.121 -			RelativePath="..\..\src\video\SDL_blendline.c"
   1.122 +			RelativePath="..\..\src\render\software\SDL_blendline.c"
   1.123  			>
   1.124  		</File>
   1.125  		<File
   1.126 -			RelativePath="..\..\src\video\SDL_blendpoint.c"
   1.127 +			RelativePath="..\..\src\render\software\SDL_blendline.h"
   1.128  			>
   1.129  		</File>
   1.130  		<File
   1.131 -			RelativePath="..\..\src\video\SDL_blendrect.c"
   1.132 +			RelativePath="..\..\src\render\software\SDL_blendpoint.c"
   1.133 +			>
   1.134 +		</File>
   1.135 +		<File
   1.136 +			RelativePath="..\..\src\render\software\SDL_blendpoint.h"
   1.137  			>
   1.138  		</File>
   1.139  		<File
   1.140 @@ -764,14 +796,6 @@
   1.141  			>
   1.142  		</File>
   1.143  		<File
   1.144 -			RelativePath="..\..\src\video\windows\SDL_d3drender.c"
   1.145 -			>
   1.146 -		</File>
   1.147 -		<File
   1.148 -			RelativePath="..\..\src\video\windows\SDL_d3drender.h"
   1.149 -			>
   1.150 -		</File>
   1.151 -		<File
   1.152  			RelativePath="..\..\src\audio\windib\SDL_dibaudio.c"
   1.153  			>
   1.154  		</File>
   1.155 @@ -788,19 +812,23 @@
   1.156  			>
   1.157  		</File>
   1.158  		<File
   1.159 -			RelativePath="..\..\src\video\SDL_draw.h"
   1.160 +			RelativePath="..\..\src\render\software\SDL_draw.h"
   1.161 +			>
   1.162 +		</File>
   1.163 +		<File
   1.164 +			RelativePath="..\..\src\render\software\SDL_drawline.c"
   1.165  			>
   1.166  		</File>
   1.167  		<File
   1.168 -			RelativePath="..\..\src\video\SDL_drawline.c"
   1.169 +			RelativePath="..\..\src\render\software\SDL_drawline.h"
   1.170  			>
   1.171  		</File>
   1.172  		<File
   1.173 -			RelativePath="..\..\src\video\SDL_drawpoint.c"
   1.174 +			RelativePath="..\..\src\render\software\SDL_drawpoint.c"
   1.175  			>
   1.176  		</File>
   1.177  		<File
   1.178 -			RelativePath="..\..\src\video\SDL_drawrect.c"
   1.179 +			RelativePath="..\..\src\render\software\SDL_drawpoint.h"
   1.180  			>
   1.181  		</File>
   1.182  		<File
   1.183 @@ -852,10 +880,6 @@
   1.184  			>
   1.185  		</File>
   1.186  		<File
   1.187 -			RelativePath="..\..\src\video\SDL_gamma.c"
   1.188 -			>
   1.189 -		</File>
   1.190 -		<File
   1.191  			RelativePath="..\..\src\events\SDL_gesture.c"
   1.192  			>
   1.193  		</File>
   1.194 @@ -880,6 +904,10 @@
   1.195  			>
   1.196  		</File>
   1.197  		<File
   1.198 +			RelativePath="..\..\src\SDL_hints.c"
   1.199 +			>
   1.200 +		</File>
   1.201 +		<File
   1.202  			RelativePath="..\..\src\stdlib\SDL_iconv.c"
   1.203  			>
   1.204  		</File>
   1.205 @@ -900,6 +928,10 @@
   1.206  			>
   1.207  		</File>
   1.208  		<File
   1.209 +			RelativePath="..\..\src\SDL_log.c"
   1.210 +			>
   1.211 +		</File>
   1.212 +		<File
   1.213  			RelativePath="..\..\src\stdlib\SDL_malloc.c"
   1.214  			>
   1.215  		</File>
   1.216 @@ -952,11 +984,11 @@
   1.217  			>
   1.218  		</File>
   1.219  		<File
   1.220 -			RelativePath="..\..\src\video\dummy\SDL_nullrender.c"
   1.221 +			RelativePath="..\..\src\video\dummy\SDL_nullframebuffer.c"
   1.222  			>
   1.223  		</File>
   1.224  		<File
   1.225 -			RelativePath="..\..\src\video\dummy\SDL_nullrender_c.h"
   1.226 +			RelativePath="..\..\src\video\dummy\SDL_nullframebuffer_c.h"
   1.227  			>
   1.228  		</File>
   1.229  		<File
   1.230 @@ -996,19 +1028,23 @@
   1.231  			>
   1.232  		</File>
   1.233  		<File
   1.234 -			RelativePath="..\..\src\video\SDL_renderer_gl.c"
   1.235 +			RelativePath="..\..\src\render\SDL_render.c"
   1.236 +			>
   1.237 +		</File>
   1.238 +		<File
   1.239 +			RelativePath="..\..\src\render\direct3d\SDL_render_d3d.c"
   1.240  			>
   1.241  		</File>
   1.242  		<File
   1.243 -			RelativePath="..\..\src\video\SDL_renderer_gl.h"
   1.244 +			RelativePath="..\..\src\render\opengl\SDL_render_gl.c"
   1.245  			>
   1.246  		</File>
   1.247  		<File
   1.248 -			RelativePath="..\..\src\video\SDL_renderer_sw.c"
   1.249 +			RelativePath="..\..\src\render\software\SDL_render_sw.c"
   1.250  			>
   1.251  		</File>
   1.252  		<File
   1.253 -			RelativePath="..\..\src\video\SDL_renderer_sw.h"
   1.254 +			RelativePath="..\..\src\render\software\SDL_render_sw_c.h"
   1.255  			>
   1.256  		</File>
   1.257  		<File
   1.258 @@ -1024,6 +1060,14 @@
   1.259  			>
   1.260  		</File>
   1.261  		<File
   1.262 +			RelativePath="..\..\src\render\opengl\SDL_shaders_gl.c"
   1.263 +			>
   1.264 +		</File>
   1.265 +		<File
   1.266 +			RelativePath="..\..\src\render\opengl\SDL_shaders_gl.h"
   1.267 +			>
   1.268 +		</File>
   1.269 +		<File
   1.270  			RelativePath="..\..\src\video\SDL_shape.c"
   1.271  			>
   1.272  		</File>
   1.273 @@ -1084,6 +1128,10 @@
   1.274  			>
   1.275  		</File>
   1.276  		<File
   1.277 +			RelativePath="..\..\src\render\SDL_sysrender.h"
   1.278 +			>
   1.279 +		</File>
   1.280 +		<File
   1.281  			RelativePath="..\..\src\thread\windows\SDL_syssem.c"
   1.282  			>
   1.283  		</File>
   1.284 @@ -1184,11 +1232,11 @@
   1.285  			>
   1.286  		</File>
   1.287  		<File
   1.288 -			RelativePath="..\..\src\video\windows\SDL_windowsgamma.c"
   1.289 +			RelativePath="..\..\src\video\windows\SDL_windowsframebuffer.c"
   1.290  			>
   1.291  		</File>
   1.292  		<File
   1.293 -			RelativePath="..\..\src\video\windows\SDL_windowsgamma.h"
   1.294 +			RelativePath="..\..\src\video\windows\SDL_windowsframebuffer.h"
   1.295  			>
   1.296  		</File>
   1.297  		<File
   1.298 @@ -1248,15 +1296,15 @@
   1.299  			>
   1.300  		</File>
   1.301  		<File
   1.302 -			RelativePath="..\..\src\video\SDL_yuv_mmx.c"
   1.303 +			RelativePath="..\..\src\render\SDL_yuv_mmx.c"
   1.304  			>
   1.305  		</File>
   1.306  		<File
   1.307 -			RelativePath="..\..\src\video\SDL_yuv_sw.c"
   1.308 +			RelativePath="..\..\src\render\SDL_yuv_sw.c"
   1.309  			>
   1.310  		</File>
   1.311  		<File
   1.312 -			RelativePath="..\..\src\video\SDL_yuv_sw_c.h"
   1.313 +			RelativePath="..\..\src\render\SDL_yuv_sw_c.h"
   1.314  			>
   1.315  		</File>
   1.316  		<File
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/VisualC/tests/testscale/testscale_VS2005.vcproj	Mon Feb 14 00:45:16 2011 -0800
     2.3 @@ -0,0 +1,221 @@
     2.4 +<?xml version="1.0" encoding="Windows-1252"?>
     2.5 +<VisualStudioProject
     2.6 +	ProjectType="Visual C++"
     2.7 +	Version="8.00"
     2.8 +	Name="testscale"
     2.9 +	ProjectGUID="{845BAD86-9FBE-4052-ADEE-CE84EA3978D0}"
    2.10 +	>
    2.11 +	<Platforms>
    2.12 +		<Platform
    2.13 +			Name="Win32"
    2.14 +		/>
    2.15 +	</Platforms>
    2.16 +	<ToolFiles>
    2.17 +	</ToolFiles>
    2.18 +	<Configurations>
    2.19 +		<Configuration
    2.20 +			Name="Debug|Win32"
    2.21 +			OutputDirectory=".\Debug"
    2.22 +			IntermediateDirectory=".\Debug"
    2.23 +			ConfigurationType="1"
    2.24 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
    2.25 +			UseOfMFC="0"
    2.26 +			ATLMinimizesCRunTimeLibraryUsage="false"
    2.27 +			>
    2.28 +			<Tool
    2.29 +				Name="VCPreBuildEventTool"
    2.30 +			/>
    2.31 +			<Tool
    2.32 +				Name="VCCustomBuildTool"
    2.33 +			/>
    2.34 +			<Tool
    2.35 +				Name="VCXMLDataGeneratorTool"
    2.36 +			/>
    2.37 +			<Tool
    2.38 +				Name="VCWebServiceProxyGeneratorTool"
    2.39 +			/>
    2.40 +			<Tool
    2.41 +				Name="VCMIDLTool"
    2.42 +				PreprocessorDefinitions="_DEBUG"
    2.43 +				MkTypLibCompatible="true"
    2.44 +				SuppressStartupBanner="true"
    2.45 +				TargetEnvironment="1"
    2.46 +				TypeLibraryName=".\Debug/testscale.tlb"
    2.47 +			/>
    2.48 +			<Tool
    2.49 +				Name="VCCLCompilerTool"
    2.50 +				Optimization="0"
    2.51 +				AdditionalIncludeDirectories="..\..\..\include"
    2.52 +				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
    2.53 +				RuntimeLibrary="2"
    2.54 +				UsePrecompiledHeader="0"
    2.55 +				PrecompiledHeaderFile=".\Debug/testscale.pch"
    2.56 +				AssemblerListingLocation=".\Debug/"
    2.57 +				ObjectFile=".\Debug/"
    2.58 +				ProgramDataBaseFileName=".\Debug/"
    2.59 +				WarningLevel="3"
    2.60 +				SuppressStartupBanner="true"
    2.61 +				DebugInformationFormat="4"
    2.62 +				CompileAs="0"
    2.63 +			/>
    2.64 +			<Tool
    2.65 +				Name="VCManagedResourceCompilerTool"
    2.66 +			/>
    2.67 +			<Tool
    2.68 +				Name="VCResourceCompilerTool"
    2.69 +				PreprocessorDefinitions="_DEBUG"
    2.70 +				Culture="1033"
    2.71 +			/>
    2.72 +			<Tool
    2.73 +				Name="VCPreLinkEventTool"
    2.74 +			/>
    2.75 +			<Tool
    2.76 +				Name="VCLinkerTool"
    2.77 +				AdditionalOptions="/MACHINE:I386"
    2.78 +				OutputFile=".\Debug/testscale.exe"
    2.79 +				LinkIncremental="2"
    2.80 +				SuppressStartupBanner="true"
    2.81 +				GenerateDebugInformation="true"
    2.82 +				ProgramDatabaseFile=".\Debug/testscale.pdb"
    2.83 +				SubSystem="2"
    2.84 +			/>
    2.85 +			<Tool
    2.86 +				Name="VCALinkTool"
    2.87 +			/>
    2.88 +			<Tool
    2.89 +				Name="VCManifestTool"
    2.90 +			/>
    2.91 +			<Tool
    2.92 +				Name="VCXDCMakeTool"
    2.93 +			/>
    2.94 +			<Tool
    2.95 +				Name="VCBscMakeTool"
    2.96 +			/>
    2.97 +			<Tool
    2.98 +				Name="VCFxCopTool"
    2.99 +			/>
   2.100 +			<Tool
   2.101 +				Name="VCAppVerifierTool"
   2.102 +			/>
   2.103 +			<Tool
   2.104 +				Name="VCWebDeploymentTool"
   2.105 +			/>
   2.106 +			<Tool
   2.107 +				Name="VCPostBuildEventTool"
   2.108 +			/>
   2.109 +		</Configuration>
   2.110 +		<Configuration
   2.111 +			Name="Release|Win32"
   2.112 +			OutputDirectory=".\Release"
   2.113 +			IntermediateDirectory=".\Release"
   2.114 +			ConfigurationType="1"
   2.115 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
   2.116 +			UseOfMFC="0"
   2.117 +			ATLMinimizesCRunTimeLibraryUsage="false"
   2.118 +			>
   2.119 +			<Tool
   2.120 +				Name="VCPreBuildEventTool"
   2.121 +			/>
   2.122 +			<Tool
   2.123 +				Name="VCCustomBuildTool"
   2.124 +			/>
   2.125 +			<Tool
   2.126 +				Name="VCXMLDataGeneratorTool"
   2.127 +			/>
   2.128 +			<Tool
   2.129 +				Name="VCWebServiceProxyGeneratorTool"
   2.130 +			/>
   2.131 +			<Tool
   2.132 +				Name="VCMIDLTool"
   2.133 +				PreprocessorDefinitions="NDEBUG"
   2.134 +				MkTypLibCompatible="true"
   2.135 +				SuppressStartupBanner="true"
   2.136 +				TargetEnvironment="1"
   2.137 +				TypeLibraryName=".\Release/testscale.tlb"
   2.138 +			/>
   2.139 +			<Tool
   2.140 +				Name="VCCLCompilerTool"
   2.141 +				InlineFunctionExpansion="1"
   2.142 +				AdditionalIncludeDirectories="..\..\..\include"
   2.143 +				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
   2.144 +				StringPooling="true"
   2.145 +				RuntimeLibrary="2"
   2.146 +				EnableFunctionLevelLinking="true"
   2.147 +				UsePrecompiledHeader="0"
   2.148 +				PrecompiledHeaderFile=".\Release/testscale.pch"
   2.149 +				AssemblerListingLocation=".\Release/"
   2.150 +				ObjectFile=".\Release/"
   2.151 +				ProgramDataBaseFileName=".\Release/"
   2.152 +				WarningLevel="3"
   2.153 +				SuppressStartupBanner="true"
   2.154 +				CompileAs="0"
   2.155 +			/>
   2.156 +			<Tool
   2.157 +				Name="VCManagedResourceCompilerTool"
   2.158 +			/>
   2.159 +			<Tool
   2.160 +				Name="VCResourceCompilerTool"
   2.161 +				PreprocessorDefinitions="NDEBUG"
   2.162 +				Culture="1033"
   2.163 +			/>
   2.164 +			<Tool
   2.165 +				Name="VCPreLinkEventTool"
   2.166 +			/>
   2.167 +			<Tool
   2.168 +				Name="VCLinkerTool"
   2.169 +				AdditionalOptions="/MACHINE:I386"
   2.170 +				OutputFile=".\Release/testscale.exe"
   2.171 +				LinkIncremental="1"
   2.172 +				SuppressStartupBanner="true"
   2.173 +				ProgramDatabaseFile=".\Release/testscale.pdb"
   2.174 +				SubSystem="2"
   2.175 +			/>
   2.176 +			<Tool
   2.177 +				Name="VCALinkTool"
   2.178 +			/>
   2.179 +			<Tool
   2.180 +				Name="VCManifestTool"
   2.181 +			/>
   2.182 +			<Tool
   2.183 +				Name="VCXDCMakeTool"
   2.184 +			/>
   2.185 +			<Tool
   2.186 +				Name="VCBscMakeTool"
   2.187 +			/>
   2.188 +			<Tool
   2.189 +				Name="VCFxCopTool"
   2.190 +			/>
   2.191 +			<Tool
   2.192 +				Name="VCAppVerifierTool"
   2.193 +			/>
   2.194 +			<Tool
   2.195 +				Name="VCWebDeploymentTool"
   2.196 +			/>
   2.197 +			<Tool
   2.198 +				Name="VCPostBuildEventTool"
   2.199 +			/>
   2.200 +		</Configuration>
   2.201 +	</Configurations>
   2.202 +	<References>
   2.203 +	</References>
   2.204 +	<Files>
   2.205 +		<File
   2.206 +			RelativePath="..\..\..\test\common.c"
   2.207 +			>
   2.208 +		</File>
   2.209 +		<File
   2.210 +			RelativePath="..\..\Sdl\Debug\SDL.lib"
   2.211 +			>
   2.212 +		</File>
   2.213 +		<File
   2.214 +			RelativePath="..\..\SDLmain\Debug\SDLmain.lib"
   2.215 +			>
   2.216 +		</File>
   2.217 +		<File
   2.218 +			RelativePath="..\..\..\Test\testscale.c"
   2.219 +			>
   2.220 +		</File>
   2.221 +	</Files>
   2.222 +	<Globals>
   2.223 +	</Globals>
   2.224 +</VisualStudioProject>
     3.1 --- a/src/video/SDL_pixels.c	Sun Feb 13 23:09:18 2011 -0800
     3.2 +++ b/src/video/SDL_pixels.c	Mon Feb 14 00:45:16 2011 -0800
     3.3 @@ -549,6 +549,8 @@
     3.4      if (format->palette) {
     3.5          ++format->palette->refcount;
     3.6      }
     3.7 +
     3.8 +    return 0;
     3.9  }
    3.10  
    3.11  int
     4.1 --- a/test/testscale.c	Sun Feb 13 23:09:18 2011 -0800
     4.2 +++ b/test/testscale.c	Mon Feb 14 00:45:16 2011 -0800
     4.3 @@ -83,7 +83,6 @@
     4.4  Draw(DrawState *s)
     4.5  {
     4.6      int w, h;
     4.7 -    SDL_Rect rect;
     4.8  
     4.9      SDL_GetWindowSize(s->window, &w, &h);
    4.10  
    4.11 @@ -177,7 +176,7 @@
    4.12          printf("%2.2f frames per second\n", fps);
    4.13      }
    4.14  
    4.15 -    SDL_stack_free(drawstate);
    4.16 +    SDL_stack_free(drawstates);
    4.17  
    4.18      quit(0);
    4.19      return 0;