Fixed some windows compilation bugs - Still does not compile.
authorjimtla
Thu, 03 Jun 2010 11:08:17 -0400
changeset 4647be2250bb482b
parent 4646 eea1bf53effa
child 4648 0350b634c044
Fixed some windows compilation bugs - Still does not compile.
VisualC/SDL.sln
VisualC/SDL/SDL.vcproj
VisualC/SDLmain/SDLmain.vcproj
src/events/SDL_touch_c.h
     1.1 --- a/VisualC/SDL.sln	Tue Jun 01 02:54:33 2010 -0400
     1.2 +++ b/VisualC/SDL.sln	Thu Jun 03 11:08:17 2010 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4 -Microsoft Visual Studio Solution File, Format Version 9.00
     1.5 -# Visual C++ Express 2005
     1.6 +Microsoft Visual Studio Solution File, Format Version 10.00
     1.7 +# Visual Studio 2008
     1.8  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
     1.9  EndProject
    1.10  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
     2.1 --- a/VisualC/SDL/SDL.vcproj	Tue Jun 01 02:54:33 2010 -0400
     2.2 +++ b/VisualC/SDL/SDL.vcproj	Thu Jun 03 11:08:17 2010 -0400
     2.3 @@ -1,10 +1,11 @@
     2.4  <?xml version="1.0" encoding="Windows-1252"?>
     2.5  <VisualStudioProject
     2.6  	ProjectType="Visual C++"
     2.7 -	Version="8.00"
     2.8 +	Version="9.00"
     2.9  	Name="SDL"
    2.10  	ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
    2.11  	RootNamespace="SDL"
    2.12 +	TargetFrameworkVersion="131072"
    2.13  	>
    2.14  	<Platforms>
    2.15  		<Platform
    2.16 @@ -85,6 +86,8 @@
    2.17  				GenerateDebugInformation="true"
    2.18  				ProgramDatabaseFile=".\Debug/SDL.pdb"
    2.19  				SubSystem="2"
    2.20 +				RandomizedBaseAddress="1"
    2.21 +				DataExecutionPrevention="0"
    2.22  				ImportLibrary=".\Debug/SDL.lib"
    2.23  				CLRUnmanagedCodeCheck="false"
    2.24  			/>
    2.25 @@ -107,9 +110,6 @@
    2.26  				Name="VCAppVerifierTool"
    2.27  			/>
    2.28  			<Tool
    2.29 -				Name="VCWebDeploymentTool"
    2.30 -			/>
    2.31 -			<Tool
    2.32  				Name="VCPostBuildEventTool"
    2.33  			/>
    2.34  		</Configuration>
    2.35 @@ -185,6 +185,8 @@
    2.36  				IgnoreAllDefaultLibraries="true"
    2.37  				ProgramDatabaseFile=".\Release/SDL.pdb"
    2.38  				SubSystem="2"
    2.39 +				RandomizedBaseAddress="1"
    2.40 +				DataExecutionPrevention="0"
    2.41  				ImportLibrary=".\Release/SDL.lib"
    2.42  			/>
    2.43  			<Tool
    2.44 @@ -206,9 +208,6 @@
    2.45  				Name="VCAppVerifierTool"
    2.46  			/>
    2.47  			<Tool
    2.48 -				Name="VCWebDeploymentTool"
    2.49 -			/>
    2.50 -			<Tool
    2.51  				Name="VCPostBuildEventTool"
    2.52  			/>
    2.53  		</Configuration>
    2.54 @@ -929,6 +928,14 @@
    2.55  			>
    2.56  		</File>
    2.57  		<File
    2.58 +			RelativePath="..\..\src\events\SDL_touch.c"
    2.59 +			>
    2.60 +		</File>
    2.61 +		<File
    2.62 +			RelativePath="..\..\src\events\SDL_touch_c.h"
    2.63 +			>
    2.64 +		</File>
    2.65 +		<File
    2.66  			RelativePath="..\..\src\video\SDL_video.c"
    2.67  			>
    2.68  		</File>
     3.1 --- a/VisualC/SDLmain/SDLmain.vcproj	Tue Jun 01 02:54:33 2010 -0400
     3.2 +++ b/VisualC/SDLmain/SDLmain.vcproj	Thu Jun 03 11:08:17 2010 -0400
     3.3 @@ -1,9 +1,10 @@
     3.4  <?xml version="1.0" encoding="Windows-1252"?>
     3.5  <VisualStudioProject
     3.6  	ProjectType="Visual C++"
     3.7 -	Version="8.00"
     3.8 +	Version="9.00"
     3.9  	Name="SDLmain"
    3.10  	ProjectGUID="{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
    3.11 +	TargetFrameworkVersion="131072"
    3.12  	>
    3.13  	<Platforms>
    3.14  		<Platform
    3.15 @@ -25,7 +26,7 @@
    3.16  			<Tool
    3.17  				Name="VCPreBuildEventTool"
    3.18  				Description="Making sure basic SDL headers are in place..."
    3.19 -				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#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 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY"
    3.20 +				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#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 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
    3.21  			/>
    3.22  			<Tool
    3.23  				Name="VCCustomBuildTool"
    3.24 @@ -98,7 +99,7 @@
    3.25  			<Tool
    3.26  				Name="VCPreBuildEventTool"
    3.27  				Description="Making sure basic SDL headers are in place..."
    3.28 -				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#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 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY"
    3.29 +				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#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 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
    3.30  			/>
    3.31  			<Tool
    3.32  				Name="VCCustomBuildTool"
    3.33 @@ -171,7 +172,7 @@
    3.34  			<Tool
    3.35  				Name="VCPreBuildEventTool"
    3.36  				Description="Making sure basic SDL headers are in place..."
    3.37 -				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#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 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY"
    3.38 +				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#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 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
    3.39  			/>
    3.40  			<Tool
    3.41  				Name="VCCustomBuildTool"
     4.1 --- a/src/events/SDL_touch_c.h	Tue Jun 01 02:54:33 2010 -0400
     4.2 +++ b/src/events/SDL_touch_c.h	Thu Jun 03 11:08:17 2010 -0400
     4.3 @@ -64,8 +64,11 @@
     4.4  /* Shutdown the touch subsystem */
     4.5  extern void SDL_TouchQuit(void);
     4.6  
     4.7 -/* FIXME: Where do these functions go in this header? */
     4.8 -extern void SDL_ChangeEnd(int id, int end);
     4.9 +/* Get the index of a touch device */
    4.10 +extern int SDL_GetTouchIndexId(int id)
    4.11 +
    4.12 +
    4.13 +
    4.14  
    4.15  #endif /* _SDL_touch_c_h */
    4.16