Updated Visual C++ project
authorSam Lantinga <slouken@libsdl.org>
Sun, 10 Feb 2008 05:14:28 +0000
changeset 2312bcec4b189f5b
parent 2311 54e21acfec5a
child 2313 012ec5192dfa
Updated Visual C++ project
VisualC/SDL/SDL.vcproj
VisualC/tests/checkkeys/checkkeys.dsp
VisualC/tests/checkkeys/checkkeys.vcproj
VisualC/tests/tests.sln
src/video/win32/SDL_win32events.c
     1.1 --- a/VisualC/SDL/SDL.vcproj	Sat Feb 09 22:28:27 2008 +0000
     1.2 +++ b/VisualC/SDL/SDL.vcproj	Sun Feb 10 05:14:28 2008 +0000
     1.3 @@ -417,6 +417,14 @@
     1.4  			>
     1.5  		</File>
     1.6  		<File
     1.7 +			RelativePath="..\..\src\video\SDL_blit_auto.c"
     1.8 +			>
     1.9 +		</File>
    1.10 +		<File
    1.11 +			RelativePath="..\..\src\video\SDL_blit_auto.h"
    1.12 +			>
    1.13 +		</File>
    1.14 +		<File
    1.15  			RelativePath="..\..\src\video\SDL_blit_copy.c"
    1.16  			>
    1.17  		</File>
    1.18 @@ -429,6 +437,10 @@
    1.19  			>
    1.20  		</File>
    1.21  		<File
    1.22 +			RelativePath="..\..\src\video\SDL_blit_slow.c"
    1.23 +			>
    1.24 +		</File>
    1.25 +		<File
    1.26  			RelativePath="..\..\src\video\SDL_bmp.c"
    1.27  			>
    1.28  		</File>
    1.29 @@ -513,6 +525,10 @@
    1.30  			>
    1.31  		</File>
    1.32  		<File
    1.33 +			RelativePath="..\..\src\video\SDL_fill.c"
    1.34 +			>
    1.35 +		</File>
    1.36 +		<File
    1.37  			RelativePath="..\..\src\video\SDL_gamma.c"
    1.38  			>
    1.39  		</File>
    1.40 @@ -649,14 +665,6 @@
    1.41  			>
    1.42  		</File>
    1.43  		<File
    1.44 -			RelativePath="..\..\src\video\SDL_rendercopy.c"
    1.45 -			>
    1.46 -		</File>
    1.47 -		<File
    1.48 -			RelativePath="..\..\src\video\SDL_rendercopy.h"
    1.49 -			>
    1.50 -		</File>
    1.51 -		<File
    1.52  			RelativePath="..\..\src\video\SDL_renderer_gl.c"
    1.53  			>
    1.54  		</File>
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/VisualC/tests/checkkeys/checkkeys.dsp	Sun Feb 10 05:14:28 2008 +0000
     2.3 @@ -0,0 +1,102 @@
     2.4 +# Microsoft Developer Studio Project File - Name="checkkeys" - Package Owner=<4>
     2.5 +# Microsoft Developer Studio Generated Build File, Format Version 5.00
     2.6 +# ** DO NOT EDIT **
     2.7 +
     2.8 +# TARGTYPE "Win32 (x86) Application" 0x0101
     2.9 +
    2.10 +CFG=checkkeys - Win32 Debug
    2.11 +!MESSAGE This is not a valid makefile. To build this project using NMAKE,
    2.12 +!MESSAGE use the Export Makefile command and run
    2.13 +!MESSAGE 
    2.14 +!MESSAGE NMAKE /f "checkkeys.mak".
    2.15 +!MESSAGE 
    2.16 +!MESSAGE You can specify a configuration when running NMAKE
    2.17 +!MESSAGE by defining the macro CFG on the command line. For example:
    2.18 +!MESSAGE 
    2.19 +!MESSAGE NMAKE /f "checkkeys.mak" CFG="checkkeys - Win32 Debug"
    2.20 +!MESSAGE 
    2.21 +!MESSAGE Possible choices for configuration are:
    2.22 +!MESSAGE 
    2.23 +!MESSAGE "checkkeys - Win32 Release" (based on "Win32 (x86) Application")
    2.24 +!MESSAGE "checkkeys - Win32 Debug" (based on "Win32 (x86) Application")
    2.25 +!MESSAGE 
    2.26 +
    2.27 +# Begin Project
    2.28 +# PROP Scc_ProjName ""
    2.29 +# PROP Scc_LocalPath ""
    2.30 +CPP=cl.exe
    2.31 +MTL=midl.exe
    2.32 +RSC=rc.exe
    2.33 +
    2.34 +!IF  "$(CFG)" == "checkkeys - Win32 Release"
    2.35 +
    2.36 +# PROP BASE Use_MFC 0
    2.37 +# PROP BASE Use_Debug_Libraries 0
    2.38 +# PROP BASE Output_Dir "Release"
    2.39 +# PROP BASE Intermediate_Dir "Release"
    2.40 +# PROP BASE Target_Dir ""
    2.41 +# PROP Use_MFC 0
    2.42 +# PROP Use_Debug_Libraries 0
    2.43 +# PROP Output_Dir "Release"
    2.44 +# PROP Intermediate_Dir "Release"
    2.45 +# PROP Ignore_Export_Lib 0
    2.46 +# PROP Target_Dir ""
    2.47 +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
    2.48 +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
    2.49 +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
    2.50 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
    2.51 +# ADD BASE RSC /l 0x409 /d "NDEBUG"
    2.52 +# ADD RSC /l 0x409 /d "NDEBUG"
    2.53 +BSC32=bscmake.exe
    2.54 +# ADD BASE BSC32 /nologo
    2.55 +# ADD BSC32 /nologo
    2.56 +LINK32=link.exe
    2.57 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386
    2.58 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /machine:I386
    2.59 +
    2.60 +!ELSEIF  "$(CFG)" == "checkkeys - Win32 Debug"
    2.61 +
    2.62 +# PROP BASE Use_MFC 0
    2.63 +# PROP BASE Use_Debug_Libraries 1
    2.64 +# PROP BASE Output_Dir "Debug"
    2.65 +# PROP BASE Intermediate_Dir "Debug"
    2.66 +# PROP BASE Target_Dir ""
    2.67 +# PROP Use_MFC 0
    2.68 +# PROP Use_Debug_Libraries 1
    2.69 +# PROP Output_Dir "Debug"
    2.70 +# PROP Intermediate_Dir "Debug"
    2.71 +# PROP Ignore_Export_Lib 0
    2.72 +# PROP Target_Dir ""
    2.73 +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
    2.74 +# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
    2.75 +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
    2.76 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
    2.77 +# ADD BASE RSC /l 0x409 /d "_DEBUG"
    2.78 +# ADD RSC /l 0x409 /d "_DEBUG"
    2.79 +BSC32=bscmake.exe
    2.80 +# ADD BASE BSC32 /nologo
    2.81 +# ADD BSC32 /nologo
    2.82 +LINK32=link.exe
    2.83 +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
    2.84 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
    2.85 +
    2.86 +!ENDIF 
    2.87 +
    2.88 +# Begin Target
    2.89 +
    2.90 +# Name "checkkeys - Win32 Release"
    2.91 +# Name "checkkeys - Win32 Debug"
    2.92 +# Begin Source File
    2.93 +
    2.94 +SOURCE=..\..\..\test\checkkeys.c
    2.95 +# End Source File
    2.96 +# Begin Source File
    2.97 +
    2.98 +SOURCE=..\..\Sdl\Debug\SDL.lib
    2.99 +# End Source File
   2.100 +# Begin Source File
   2.101 +
   2.102 +SOURCE=..\..\SDLmain\Debug\SDLmain.lib
   2.103 +# End Source File
   2.104 +# End Target
   2.105 +# End Project
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/VisualC/tests/checkkeys/checkkeys.vcproj	Sun Feb 10 05:14:28 2008 +0000
     3.3 @@ -0,0 +1,217 @@
     3.4 +<?xml version="1.0" encoding="Windows-1252"?>
     3.5 +<VisualStudioProject
     3.6 +	ProjectType="Visual C++"
     3.7 +	Version="8.00"
     3.8 +	Name="checkkeys"
     3.9 +	ProjectGUID="{26828762-C95D-4637-9CB1-7F0979523813}"
    3.10 +	>
    3.11 +	<Platforms>
    3.12 +		<Platform
    3.13 +			Name="Win32"
    3.14 +		/>
    3.15 +	</Platforms>
    3.16 +	<ToolFiles>
    3.17 +	</ToolFiles>
    3.18 +	<Configurations>
    3.19 +		<Configuration
    3.20 +			Name="Debug|Win32"
    3.21 +			OutputDirectory=".\Debug"
    3.22 +			IntermediateDirectory=".\Debug"
    3.23 +			ConfigurationType="1"
    3.24 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
    3.25 +			UseOfMFC="0"
    3.26 +			ATLMinimizesCRunTimeLibraryUsage="false"
    3.27 +			>
    3.28 +			<Tool
    3.29 +				Name="VCPreBuildEventTool"
    3.30 +			/>
    3.31 +			<Tool
    3.32 +				Name="VCCustomBuildTool"
    3.33 +			/>
    3.34 +			<Tool
    3.35 +				Name="VCXMLDataGeneratorTool"
    3.36 +			/>
    3.37 +			<Tool
    3.38 +				Name="VCWebServiceProxyGeneratorTool"
    3.39 +			/>
    3.40 +			<Tool
    3.41 +				Name="VCMIDLTool"
    3.42 +				PreprocessorDefinitions="_DEBUG"
    3.43 +				MkTypLibCompatible="true"
    3.44 +				SuppressStartupBanner="true"
    3.45 +				TargetEnvironment="1"
    3.46 +				TypeLibraryName=".\Debug/checkkeys.tlb"
    3.47 +			/>
    3.48 +			<Tool
    3.49 +				Name="VCCLCompilerTool"
    3.50 +				Optimization="0"
    3.51 +				AdditionalIncludeDirectories="..\..\..\include"
    3.52 +				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
    3.53 +				RuntimeLibrary="2"
    3.54 +				UsePrecompiledHeader="0"
    3.55 +				PrecompiledHeaderFile=".\Debug/checkkeys.pch"
    3.56 +				AssemblerListingLocation=".\Debug/"
    3.57 +				ObjectFile=".\Debug/"
    3.58 +				ProgramDataBaseFileName=".\Debug/"
    3.59 +				WarningLevel="3"
    3.60 +				SuppressStartupBanner="true"
    3.61 +				DebugInformationFormat="4"
    3.62 +				CompileAs="0"
    3.63 +			/>
    3.64 +			<Tool
    3.65 +				Name="VCManagedResourceCompilerTool"
    3.66 +			/>
    3.67 +			<Tool
    3.68 +				Name="VCResourceCompilerTool"
    3.69 +				PreprocessorDefinitions="_DEBUG"
    3.70 +				Culture="1033"
    3.71 +			/>
    3.72 +			<Tool
    3.73 +				Name="VCPreLinkEventTool"
    3.74 +			/>
    3.75 +			<Tool
    3.76 +				Name="VCLinkerTool"
    3.77 +				AdditionalOptions="/MACHINE:I386"
    3.78 +				OutputFile=".\Debug/checkkeys.exe"
    3.79 +				LinkIncremental="2"
    3.80 +				SuppressStartupBanner="true"
    3.81 +				GenerateDebugInformation="true"
    3.82 +				ProgramDatabaseFile=".\Debug/checkkeys.pdb"
    3.83 +				SubSystem="2"
    3.84 +			/>
    3.85 +			<Tool
    3.86 +				Name="VCALinkTool"
    3.87 +			/>
    3.88 +			<Tool
    3.89 +				Name="VCManifestTool"
    3.90 +			/>
    3.91 +			<Tool
    3.92 +				Name="VCXDCMakeTool"
    3.93 +			/>
    3.94 +			<Tool
    3.95 +				Name="VCBscMakeTool"
    3.96 +			/>
    3.97 +			<Tool
    3.98 +				Name="VCFxCopTool"
    3.99 +			/>
   3.100 +			<Tool
   3.101 +				Name="VCAppVerifierTool"
   3.102 +			/>
   3.103 +			<Tool
   3.104 +				Name="VCWebDeploymentTool"
   3.105 +			/>
   3.106 +			<Tool
   3.107 +				Name="VCPostBuildEventTool"
   3.108 +			/>
   3.109 +		</Configuration>
   3.110 +		<Configuration
   3.111 +			Name="Release|Win32"
   3.112 +			OutputDirectory=".\Release"
   3.113 +			IntermediateDirectory=".\Release"
   3.114 +			ConfigurationType="1"
   3.115 +			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
   3.116 +			UseOfMFC="0"
   3.117 +			ATLMinimizesCRunTimeLibraryUsage="false"
   3.118 +			>
   3.119 +			<Tool
   3.120 +				Name="VCPreBuildEventTool"
   3.121 +			/>
   3.122 +			<Tool
   3.123 +				Name="VCCustomBuildTool"
   3.124 +			/>
   3.125 +			<Tool
   3.126 +				Name="VCXMLDataGeneratorTool"
   3.127 +			/>
   3.128 +			<Tool
   3.129 +				Name="VCWebServiceProxyGeneratorTool"
   3.130 +			/>
   3.131 +			<Tool
   3.132 +				Name="VCMIDLTool"
   3.133 +				PreprocessorDefinitions="NDEBUG"
   3.134 +				MkTypLibCompatible="true"
   3.135 +				SuppressStartupBanner="true"
   3.136 +				TargetEnvironment="1"
   3.137 +				TypeLibraryName=".\Release/checkkeys.tlb"
   3.138 +			/>
   3.139 +			<Tool
   3.140 +				Name="VCCLCompilerTool"
   3.141 +				InlineFunctionExpansion="1"
   3.142 +				AdditionalIncludeDirectories="..\..\..\include"
   3.143 +				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
   3.144 +				StringPooling="true"
   3.145 +				RuntimeLibrary="2"
   3.146 +				EnableFunctionLevelLinking="true"
   3.147 +				UsePrecompiledHeader="0"
   3.148 +				PrecompiledHeaderFile=".\Release/checkkeys.pch"
   3.149 +				AssemblerListingLocation=".\Release/"
   3.150 +				ObjectFile=".\Release/"
   3.151 +				ProgramDataBaseFileName=".\Release/"
   3.152 +				WarningLevel="3"
   3.153 +				SuppressStartupBanner="true"
   3.154 +				CompileAs="0"
   3.155 +			/>
   3.156 +			<Tool
   3.157 +				Name="VCManagedResourceCompilerTool"
   3.158 +			/>
   3.159 +			<Tool
   3.160 +				Name="VCResourceCompilerTool"
   3.161 +				PreprocessorDefinitions="NDEBUG"
   3.162 +				Culture="1033"
   3.163 +			/>
   3.164 +			<Tool
   3.165 +				Name="VCPreLinkEventTool"
   3.166 +			/>
   3.167 +			<Tool
   3.168 +				Name="VCLinkerTool"
   3.169 +				AdditionalOptions="/MACHINE:I386"
   3.170 +				OutputFile=".\Release/checkkeys.exe"
   3.171 +				LinkIncremental="1"
   3.172 +				SuppressStartupBanner="true"
   3.173 +				ProgramDatabaseFile=".\Release/checkkeys.pdb"
   3.174 +				SubSystem="2"
   3.175 +			/>
   3.176 +			<Tool
   3.177 +				Name="VCALinkTool"
   3.178 +			/>
   3.179 +			<Tool
   3.180 +				Name="VCManifestTool"
   3.181 +			/>
   3.182 +			<Tool
   3.183 +				Name="VCXDCMakeTool"
   3.184 +			/>
   3.185 +			<Tool
   3.186 +				Name="VCBscMakeTool"
   3.187 +			/>
   3.188 +			<Tool
   3.189 +				Name="VCFxCopTool"
   3.190 +			/>
   3.191 +			<Tool
   3.192 +				Name="VCAppVerifierTool"
   3.193 +			/>
   3.194 +			<Tool
   3.195 +				Name="VCWebDeploymentTool"
   3.196 +			/>
   3.197 +			<Tool
   3.198 +				Name="VCPostBuildEventTool"
   3.199 +			/>
   3.200 +		</Configuration>
   3.201 +	</Configurations>
   3.202 +	<References>
   3.203 +	</References>
   3.204 +	<Files>
   3.205 +		<File
   3.206 +			RelativePath="..\..\..\test\checkkeys.c"
   3.207 +			>
   3.208 +		</File>
   3.209 +		<File
   3.210 +			RelativePath="..\..\Sdl\Debug\SDL.lib"
   3.211 +			>
   3.212 +		</File>
   3.213 +		<File
   3.214 +			RelativePath="..\..\SDLmain\Debug\SDLmain.lib"
   3.215 +			>
   3.216 +		</File>
   3.217 +	</Files>
   3.218 +	<Globals>
   3.219 +	</Globals>
   3.220 +</VisualStudioProject>
     4.1 --- a/VisualC/tests/tests.sln	Sat Feb 09 22:28:27 2008 +0000
     4.2 +++ b/VisualC/tests/tests.sln	Sun Feb 10 05:14:28 2008 +0000
     4.3 @@ -26,6 +26,8 @@
     4.4  EndProject
     4.5  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgl2", "testgl2\testgl2.vcproj", "{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}"
     4.6  EndProject
     4.7 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "checkkeys", "checkkeys\checkkeys.vcproj", "{26828762-C95D-4637-9CB1-7F0979523813}"
     4.8 +EndProject
     4.9  Global
    4.10  	GlobalSection(SolutionConfigurationPlatforms) = preSolution
    4.11  		Debug|Win32 = Debug|Win32
    4.12 @@ -84,6 +86,10 @@
    4.13  		{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Debug|Win32.Build.0 = Debug|Win32
    4.14  		{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.ActiveCfg = Release|Win32
    4.15  		{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}.Release|Win32.Build.0 = Release|Win32
    4.16 +		{26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.ActiveCfg = Debug|Win32
    4.17 +		{26828762-C95D-4637-9CB1-7F0979523813}.Debug|Win32.Build.0 = Debug|Win32
    4.18 +		{26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.ActiveCfg = Release|Win32
    4.19 +		{26828762-C95D-4637-9CB1-7F0979523813}.Release|Win32.Build.0 = Release|Win32
    4.20  	EndGlobalSection
    4.21  	GlobalSection(SolutionProperties) = preSolution
    4.22  		HideSolutionNode = FALSE
     5.1 --- a/src/video/win32/SDL_win32events.c	Sat Feb 09 22:28:27 2008 +0000
     5.2 +++ b/src/video/win32/SDL_win32events.c	Sun Feb 10 05:14:28 2008 +0000
     5.3 @@ -54,7 +54,7 @@
     5.4         We try to provide USB scancodes, so undo this mapping.
     5.5       */
     5.6      if (wParam >= 'A' && wParam <= 'Z') {
     5.7 -        BYTE scancode = (lParam >> 16) & 0xFF;
     5.8 +        BYTE scancode = (BYTE)((lParam >> 16) & 0xFF);
     5.9          int i;
    5.10  
    5.11          if (scancode != alpha_scancodes[wParam - 'A']) {