pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug #925

Browse source 
Changed "win32" to "windows"

--HG--
rename : include/SDL_config_win32.h => include/SDL_config_windows.h
rename : src/events/scancodes_win32.h => src/events/scancodes_windows.h
rename : src/haptic/win32/SDL_syshaptic.c => src/haptic/windows/SDL_syshaptic.c
rename : src/joystick/win32/SDL_dxjoystick.c => src/joystick/windows/SDL_dxjoystick.c
rename : src/joystick/win32/SDL_dxjoystick_c.h => src/joystick/windows/SDL_dxjoystick_c.h
rename : src/joystick/win32/SDL_mmjoystick.c => src/joystick/windows/SDL_mmjoystick.c
rename : src/loadso/win32/SDL_sysloadso.c => src/loadso/windows/SDL_sysloadso.c
rename : src/main/win32/SDL_win32_main.c => src/main/windows/SDL_windows_main.c
rename : src/main/win32/version.rc => src/main/windows/version.rc
rename : src/thread/win32/SDL_sysmutex.c => src/thread/windows/SDL_sysmutex.c
rename : src/thread/win32/SDL_syssem.c => src/thread/windows/SDL_syssem.c
rename : src/thread/win32/SDL_systhread.c => src/thread/windows/SDL_systhread.c
rename : src/thread/win32/SDL_systhread_c.h => src/thread/windows/SDL_systhread_c.h
rename : src/thread/win32/win_ce_semaphore.c => src/thread/windows/win_ce_semaphore.c
rename : src/thread/win32/win_ce_semaphore.h => src/thread/windows/win_ce_semaphore.h
rename : src/timer/win32/SDL_systimer.c => src/timer/windows/SDL_systimer.c
rename : src/video/win32/SDL_ceddrawrender.c => src/video/windows/SDL_ceddrawrender.c
rename : src/video/win32/SDL_ceddrawrender.h => src/video/windows/SDL_ceddrawrender.h
rename : src/video/win32/SDL_d3drender.c => src/video/windows/SDL_d3drender.c
rename : src/video/win32/SDL_d3drender.h => src/video/windows/SDL_d3drender.h
rename : src/video/win32/SDL_gapirender.c => src/video/windows/SDL_gapirender.c
rename : src/video/win32/SDL_gapirender.h => src/video/windows/SDL_gapirender.h
rename : src/video/win32/SDL_gapirender_c.h => src/video/windows/SDL_gapirender_c.h
rename : src/video/win32/SDL_gdirender.c => src/video/windows/SDL_gdirender.c
rename : src/video/win32/SDL_gdirender.h => src/video/windows/SDL_gdirender.h
rename : src/video/win32/SDL_msctf.h => src/video/windows/SDL_msctf.h
rename : src/video/win32/SDL_vkeys.h => src/video/windows/SDL_vkeys.h
rename : src/video/win32/SDL_win32clipboard.c => src/video/windows/SDL_windowsclipboard.c
rename : src/video/win32/SDL_win32clipboard.h => src/video/windows/SDL_windowsclipboard.h
rename : src/video/win32/SDL_win32events.c => src/video/windows/SDL_windowsevents.c
rename : src/video/win32/SDL_win32events.h => src/video/windows/SDL_windowsevents.h
rename : src/video/win32/SDL_win32gamma.c => src/video/windows/SDL_windowsgamma.c
rename : src/video/win32/SDL_win32gamma.h => src/video/windows/SDL_windowsgamma.h
rename : src/video/win32/SDL_win32keyboard.c => src/video/windows/SDL_windowskeyboard.c
rename : src/video/win32/SDL_win32keyboard.h => src/video/windows/SDL_windowskeyboard.h
rename : src/video/win32/SDL_win32modes.c => src/video/windows/SDL_windowsmodes.c
rename : src/video/win32/SDL_win32modes.h => src/video/windows/SDL_windowsmodes.h
rename : src/video/win32/SDL_win32mouse.c => src/video/windows/SDL_windowsmouse.c
rename : src/video/win32/SDL_win32mouse.h => src/video/windows/SDL_windowsmouse.h
rename : src/video/win32/SDL_win32opengl.c => src/video/windows/SDL_windowsopengl.c
rename : src/video/win32/SDL_win32opengl.h => src/video/windows/SDL_windowsopengl.h
rename : src/video/win32/SDL_win32shape.c => src/video/windows/SDL_windowsshape.c
rename : src/video/win32/SDL_win32shape.h => src/video/windows/SDL_windowsshape.h
rename : src/video/win32/SDL_win32video.c => src/video/windows/SDL_windowsvideo.c
rename : src/video/win32/SDL_win32video.h => src/video/windows/SDL_windowsvideo.h
rename : src/video/win32/SDL_win32window.c => src/video/windows/SDL_windowswindow.c
rename : src/video/win32/SDL_win32window.h => src/video/windows/SDL_windowswindow.h
rename : src/video/win32/wmmsg.h => src/video/windows/wmmsg.h
This commit is contained in:
Sam Lantinga 2011-01-20 18:04:05 -08:00
parent ee1f71dd63
commit 9d25ba272a
82 changed files with 382 additions and 375 deletions
Download patch file Download diff file Expand all files Collapse all files

76
VisualC/SDL/SDL_VS2005.vcproj
View file

@ -29,7 +29,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
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;" CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -207,7 +207,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
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;" CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -411,7 +411,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_config_win32.h" RelativePath="..\..\include\SDL_config_windows.h"
> >
</File> </File>
<File <File
@ -768,11 +768,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_d3drender.c" RelativePath="..\..\src\video\windows\SDL_d3drender.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_d3drender.h" RelativePath="..\..\src\video\windows\SDL_d3drender.h"
> >
</File> </File>
<File <File
@ -824,7 +824,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\joystick\win32\SDL_dxjoystick.c" RelativePath="..\..\src\joystick\windows\SDL_dxjoystick.c"
> >
</File> </File>
<File <File
@ -860,11 +860,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_gdirender.c" RelativePath="..\..\src\video\windows\SDL_gdirender.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_gdirender.h" RelativePath="..\..\src\video\windows\SDL_gdirender.h"
> >
</File> </File>
<File <File
@ -948,7 +948,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\joystick\win32\SDL_mmjoystick.c" RelativePath="..\..\src\joystick\windows\SDL_mmjoystick.c"
> >
</File> </File>
<File <File
@ -1072,7 +1072,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\haptic\win32\SDL_syshaptic.c" RelativePath="..\..\src\haptic\windows\SDL_syshaptic.c"
> >
</File> </File>
<File <File
@ -1084,11 +1084,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\loadso\win32\SDL_sysloadso.c" RelativePath="..\..\src\loadso\windows\SDL_sysloadso.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\win32\SDL_sysmutex.c" RelativePath="..\..\src\thread\windows\SDL_sysmutex.c"
> >
</File> </File>
<File <File
@ -1096,11 +1096,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\win32\SDL_syssem.c" RelativePath="..\..\src\thread\windows\SDL_syssem.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\win32\SDL_systhread.c" RelativePath="..\..\src\thread\windows\SDL_systhread.c"
> >
</File> </File>
<File <File
@ -1108,11 +1108,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\win32\SDL_systhread_c.h" RelativePath="..\..\src\thread\windows\SDL_systhread_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\timer\win32\SDL_systimer.c" RelativePath="..\..\src\timer\windows\SDL_systimer.c"
> >
</File> </File>
<File <File
@ -1152,7 +1152,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_vkeys.h" RelativePath="..\..\src\video\windows\SDL_vkeys.h"
> >
</File> </File>
<File <File
@ -1164,83 +1164,83 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32clipboard.c" RelativePath="..\..\src\video\windows\SDL_windowsclipboard.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32clipboard.h" RelativePath="..\..\src\video\windows\SDL_windowsclipboard.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32events.c" RelativePath="..\..\src\video\windows\SDL_windowsevents.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32events.h" RelativePath="..\..\src\video\windows\SDL_windowsevents.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32gamma.c" RelativePath="..\..\src\video\windows\SDL_windowsgamma.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32gamma.h" RelativePath="..\..\src\video\windows\SDL_windowsgamma.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32keyboard.c" RelativePath="..\..\src\video\windows\SDL_windowskeyboard.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32keyboard.h" RelativePath="..\..\src\video\windows\SDL_windowskeyboard.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32modes.c" RelativePath="..\..\src\video\windows\SDL_windowsmodes.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32modes.h" RelativePath="..\..\src\video\windows\SDL_windowsmodes.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32mouse.c" RelativePath="..\..\src\video\windows\SDL_windowsmouse.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32mouse.h" RelativePath="..\..\src\video\windows\SDL_windowsmouse.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32opengl.c" RelativePath="..\..\src\video\windows\SDL_windowsopengl.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32opengl.h" RelativePath="..\..\src\video\windows\SDL_windowsopengl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32shape.c" RelativePath="..\..\src\video\windows\SDL_windowsshape.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32shape.h" RelativePath="..\..\src\video\windows\SDL_windowsshape.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32video.c" RelativePath="..\..\src\video\windows\SDL_windowsvideo.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32video.h" RelativePath="..\..\src\video\windows\SDL_windowsvideo.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32window.c" RelativePath="..\..\src\video\windows\SDL_windowswindow.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32window.h" RelativePath="..\..\src\video\windows\SDL_windowswindow.h"
> >
</File> </File>
<File <File
@ -1264,7 +1264,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\wmmsg.h" RelativePath="..\..\src\video\windows\wmmsg.h"
> >
</File> </File>
</Files> </Files>

76
VisualC/SDL/SDL_VS2008.vcproj
View file

@ -30,7 +30,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
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;" CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -201,7 +201,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
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;" CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -398,7 +398,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_config_win32.h" RelativePath="..\..\include\SDL_config_windows.h"
> >
</File> </File>
<File <File
@ -751,11 +751,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_d3drender.c" RelativePath="..\..\src\video\windows\SDL_d3drender.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_d3drender.h" RelativePath="..\..\src\video\windows\SDL_d3drender.h"
> >
</File> </File>
<File <File
@ -807,7 +807,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\joystick\win32\SDL_dxjoystick.c" RelativePath="..\..\src\joystick\windows\SDL_dxjoystick.c"
> >
</File> </File>
<File <File
@ -843,11 +843,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_gdirender.c" RelativePath="..\..\src\video\windows\SDL_gdirender.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_gdirender.h" RelativePath="..\..\src\video\windows\SDL_gdirender.h"
> >
</File> </File>
<File <File
@ -931,7 +931,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\joystick\win32\SDL_mmjoystick.c" RelativePath="..\..\src\joystick\windows\SDL_mmjoystick.c"
> >
</File> </File>
<File <File
@ -1059,7 +1059,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\haptic\win32\SDL_syshaptic.c" RelativePath="..\..\src\haptic\windows\SDL_syshaptic.c"
> >
</File> </File>
<File <File
@ -1071,11 +1071,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\loadso\win32\SDL_sysloadso.c" RelativePath="..\..\src\loadso\windows\SDL_sysloadso.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\win32\SDL_sysmutex.c" RelativePath="..\..\src\thread\windows\SDL_sysmutex.c"
> >
</File> </File>
<File <File
@ -1083,11 +1083,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\win32\SDL_syssem.c" RelativePath="..\..\src\thread\windows\SDL_syssem.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\win32\SDL_systhread.c" RelativePath="..\..\src\thread\windows\SDL_systhread.c"
> >
</File> </File>
<File <File
@ -1095,11 +1095,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\win32\SDL_systhread_c.h" RelativePath="..\..\src\thread\windows\SDL_systhread_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\timer\win32\SDL_systimer.c" RelativePath="..\..\src\timer\windows\SDL_systimer.c"
> >
</File> </File>
<File <File
@ -1139,7 +1139,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_vkeys.h" RelativePath="..\..\src\video\windows\SDL_vkeys.h"
> >
</File> </File>
<File <File
@ -1151,83 +1151,83 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32clipboard.c" RelativePath="..\..\src\video\windows\SDL_windowsclipboard.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32clipboard.h" RelativePath="..\..\src\video\windows\SDL_windowsclipboard.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32events.c" RelativePath="..\..\src\video\windows\SDL_windowsevents.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32events.h" RelativePath="..\..\src\video\windows\SDL_windowsevents.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32gamma.c" RelativePath="..\..\src\video\windows\SDL_windowsgamma.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32gamma.h" RelativePath="..\..\src\video\windows\SDL_windowsgamma.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32keyboard.c" RelativePath="..\..\src\video\windows\SDL_windowskeyboard.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32keyboard.h" RelativePath="..\..\src\video\windows\SDL_windowskeyboard.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32modes.c" RelativePath="..\..\src\video\windows\SDL_windowsmodes.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32modes.h" RelativePath="..\..\src\video\windows\SDL_windowsmodes.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32mouse.c" RelativePath="..\..\src\video\windows\SDL_windowsmouse.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32mouse.h" RelativePath="..\..\src\video\windows\SDL_windowsmouse.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32opengl.c" RelativePath="..\..\src\video\windows\SDL_windowsopengl.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32opengl.h" RelativePath="..\..\src\video\windows\SDL_windowsopengl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32shape.c" RelativePath="..\..\src\video\windows\SDL_windowsshape.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32shape.h" RelativePath="..\..\src\video\windows\SDL_windowsshape.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32video.c" RelativePath="..\..\src\video\windows\SDL_windowsvideo.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32video.h" RelativePath="..\..\src\video\windows\SDL_windowsvideo.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32window.c" RelativePath="..\..\src\video\windows\SDL_windowswindow.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\SDL_win32window.h" RelativePath="..\..\src\video\windows\SDL_windowswindow.h"
> >
</File> </File>
<File <File
@ -1251,7 +1251,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\win32\wmmsg.h" RelativePath="..\..\src\video\windows\wmmsg.h"
> >
</File> </File>
</Files> </Files>

82
VisualC/SDL/SDL_VS2010.vcxproj
View file

@ -75,8 +75,8 @@
<PreBuildEvent> <PreBuildEvent>
<Message>Making sure basic SDL headers are in place...</Message> <Message>Making sure basic SDL headers are in place...</Message>
<Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY <Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY
echo Copying SDL_config_win32.h to SDL_config.h... echo Copying SDL_config_windows.h to SDL_config.h...
copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h" copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
:SDLCONFIGOKAY :SDLCONFIGOKAY
if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
@ -155,8 +155,8 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<PreBuildEvent> <PreBuildEvent>
<Message>Making sure basic SDL headers are in place...</Message> <Message>Making sure basic SDL headers are in place...</Message>
<Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY <Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY
echo Copying SDL_config_win32.h to SDL_config.h... echo Copying SDL_config_windows.h to SDL_config.h...
copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h" copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
:SDLCONFIGOKAY :SDLCONFIGOKAY
if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
@ -238,7 +238,7 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ClInclude Include="..\..\include\SDL_clipboard.h" /> <ClInclude Include="..\..\include\SDL_clipboard.h" />
<ClInclude Include="..\..\include\SDL_compat.h" /> <ClInclude Include="..\..\include\SDL_compat.h" />
<ClInclude Include="..\..\include\SDL_config.h" /> <ClInclude Include="..\..\include\SDL_config.h" />
<ClInclude Include="..\..\include\SDL_config_win32.h" /> <ClInclude Include="..\..\include\SDL_config_windows.h" />
<ClInclude Include="..\..\include\SDL_copying.h" /> <ClInclude Include="..\..\include\SDL_copying.h" />
<ClInclude Include="..\..\include\SDL_cpuinfo.h" /> <ClInclude Include="..\..\include\SDL_cpuinfo.h" />
<ClInclude Include="..\..\include\SDL_endian.h" /> <ClInclude Include="..\..\include\SDL_endian.h" />
@ -290,7 +290,7 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ClInclude Include="..\..\src\video\SDL_blit_copy.h" /> <ClInclude Include="..\..\src\video\SDL_blit_copy.h" />
<ClInclude Include="..\..\src\video\SDL_blit_slow.h" /> <ClInclude Include="..\..\src\video\SDL_blit_slow.h" />
<ClInclude Include="..\..\src\video\SDL_shape_internals.h" /> <ClInclude Include="..\..\src\video\SDL_shape_internals.h" />
<ClInclude Include="..\..\src\video\win32\SDL_d3drender.h" /> <ClInclude Include="..\..\src\video\windows\SDL_d3drender.h" />
<ClInclude Include="..\..\src\audio\windib\SDL_dibaudio.h" /> <ClInclude Include="..\..\src\audio\windib\SDL_dibaudio.h" />
<ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" /> <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
<ClInclude Include="..\..\src\video\SDL_draw.h" /> <ClInclude Include="..\..\src\video\SDL_draw.h" />
@ -299,7 +299,7 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ClInclude Include="..\..\src\SDL_error_c.h" /> <ClInclude Include="..\..\src\SDL_error_c.h" />
<ClInclude Include="..\..\src\events\SDL_events_c.h" /> <ClInclude Include="..\..\src\events\SDL_events_c.h" />
<ClInclude Include="..\..\src\SDL_fatal.h" /> <ClInclude Include="..\..\src\SDL_fatal.h" />
<ClInclude Include="..\..\src\video\win32\SDL_gdirender.h" /> <ClInclude Include="..\..\src\video\windows\SDL_gdirender.h" />
<ClInclude Include="..\..\src\video\SDL_glesfuncs.h" /> <ClInclude Include="..\..\src\video\SDL_glesfuncs.h" />
<ClInclude Include="..\..\src\video\SDL_glfuncs.h" /> <ClInclude Include="..\..\src\video\SDL_glfuncs.h" />
<ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" /> <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
@ -323,26 +323,26 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" /> <ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" />
<ClInclude Include="..\..\src\joystick\SDL_sysjoystick.h" /> <ClInclude Include="..\..\src\joystick\SDL_sysjoystick.h" />
<ClInclude Include="..\..\src\thread\SDL_systhread.h" /> <ClInclude Include="..\..\src\thread\SDL_systhread.h" />
<ClInclude Include="..\..\src\thread\win32\SDL_systhread_c.h" /> <ClInclude Include="..\..\src\thread\windows\SDL_systhread_c.h" />
<ClInclude Include="..\..\src\timer\SDL_systimer.h" /> <ClInclude Include="..\..\src\timer\SDL_systimer.h" />
<ClInclude Include="..\..\src\video\SDL_sysvideo.h" /> <ClInclude Include="..\..\src\video\SDL_sysvideo.h" />
<ClInclude Include="..\..\src\thread\SDL_thread_c.h" /> <ClInclude Include="..\..\src\thread\SDL_thread_c.h" />
<ClInclude Include="..\..\src\timer\SDL_timer_c.h" /> <ClInclude Include="..\..\src\timer\SDL_timer_c.h" />
<ClInclude Include="..\..\src\video\win32\SDL_vkeys.h" /> <ClInclude Include="..\..\src\video\windows\SDL_vkeys.h" />
<ClInclude Include="..\..\src\audio\SDL_wave.h" /> <ClInclude Include="..\..\src\audio\SDL_wave.h" />
<ClInclude Include="..\..\src\video\win32\SDL_win32clipboard.h" /> <ClInclude Include="..\..\src\video\windows\SDL_windowsclipboard.h" />
<ClInclude Include="..\..\src\video\win32\SDL_win32events.h" /> <ClInclude Include="..\..\src\video\windows\SDL_windowsevents.h" />
<ClInclude Include="..\..\src\video\win32\SDL_win32gamma.h" /> <ClInclude Include="..\..\src\video\windows\SDL_windowsgamma.h" />
<ClInclude Include="..\..\src\video\win32\SDL_win32keyboard.h" /> <ClInclude Include="..\..\src\video\windows\SDL_windowskeyboard.h" />
<ClInclude Include="..\..\src\video\win32\SDL_win32modes.h" /> <ClInclude Include="..\..\src\video\windows\SDL_windowsmodes.h" />
<ClInclude Include="..\..\src\video\win32\SDL_win32mouse.h" /> <ClInclude Include="..\..\src\video\windows\SDL_windowsmouse.h" />
<ClInclude Include="..\..\src\video\win32\SDL_win32opengl.h" /> <ClInclude Include="..\..\src\video\windows\SDL_windowsopengl.h" />
<ClInclude Include="..\..\src\video\win32\SDL_win32shape.h" /> <ClInclude Include="..\..\src\video\windows\SDL_windowsshape.h" />
<ClInclude Include="..\..\src\video\win32\SDL_win32video.h" /> <ClInclude Include="..\..\src\video\windows\SDL_windowsvideo.h" />
<ClInclude Include="..\..\src\video\win32\SDL_win32window.h" /> <ClInclude Include="..\..\src\video\windows\SDL_windowswindow.h" />
<ClInclude Include="..\..\src\events\SDL_windowevents_c.h" /> <ClInclude Include="..\..\src\events\SDL_windowevents_c.h" />
<ClInclude Include="..\..\src\video\SDL_yuv_sw_c.h" /> <ClInclude Include="..\..\src\video\SDL_yuv_sw_c.h" />
<ClInclude Include="..\..\src\video\win32\wmmsg.h" /> <ClInclude Include="..\..\src\video\windows\wmmsg.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\events\SDL_clipboardevents.c" /> <ClCompile Include="..\..\src\events\SDL_clipboardevents.c" />
@ -389,7 +389,7 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ClCompile Include="..\..\src\cpuinfo\SDL_cpuinfo.c" /> <ClCompile Include="..\..\src\cpuinfo\SDL_cpuinfo.c" />
<ClCompile Include="..\..\src\video\SDL_clipboard.c" /> <ClCompile Include="..\..\src\video\SDL_clipboard.c" />
<ClCompile Include="..\..\src\video\SDL_shape.c" /> <ClCompile Include="..\..\src\video\SDL_shape.c" />
<ClCompile Include="..\..\src\video\win32\SDL_d3drender.c" /> <ClCompile Include="..\..\src\video\windows\SDL_d3drender.c" />
<ClCompile Include="..\..\src\audio\windib\SDL_dibaudio.c" /> <ClCompile Include="..\..\src\audio\windib\SDL_dibaudio.c" />
<ClCompile Include="..\..\src\audio\disk\SDL_diskaudio.c" /> <ClCompile Include="..\..\src\audio\disk\SDL_diskaudio.c" />
<ClCompile Include="..\..\src\video\SDL_drawline.c" /> <ClCompile Include="..\..\src\video\SDL_drawline.c" />
@ -397,13 +397,13 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ClCompile Include="..\..\src\video\SDL_drawrect.c" /> <ClCompile Include="..\..\src\video\SDL_drawrect.c" />
<ClCompile Include="..\..\src\audio\dummy\SDL_dummyaudio.c" /> <ClCompile Include="..\..\src\audio\dummy\SDL_dummyaudio.c" />
<ClCompile Include="..\..\src\audio\windx5\SDL_dx5audio.c" /> <ClCompile Include="..\..\src\audio\windx5\SDL_dx5audio.c" />
<ClCompile Include="..\..\src\joystick\win32\SDL_dxjoystick.c" /> <ClCompile Include="..\..\src\joystick\windows\SDL_dxjoystick.c" />
<ClCompile Include="..\..\src\SDL_error.c" /> <ClCompile Include="..\..\src\SDL_error.c" />
<ClCompile Include="..\..\src\events\SDL_events.c" /> <ClCompile Include="..\..\src\events\SDL_events.c" />
<ClCompile Include="..\..\src\SDL_fatal.c" /> <ClCompile Include="..\..\src\SDL_fatal.c" />
<ClCompile Include="..\..\src\video\SDL_fillrect.c" /> <ClCompile Include="..\..\src\video\SDL_fillrect.c" />
<ClCompile Include="..\..\src\video\SDL_gamma.c" /> <ClCompile Include="..\..\src\video\SDL_gamma.c" />
<ClCompile Include="..\..\src\video\win32\SDL_gdirender.c" /> <ClCompile Include="..\..\src\video\windows\SDL_gdirender.c" />
<ClCompile Include="..\..\src\stdlib\SDL_getenv.c" /> <ClCompile Include="..\..\src\stdlib\SDL_getenv.c" />
<ClCompile Include="..\..\src\haptic\SDL_haptic.c" /> <ClCompile Include="..\..\src\haptic\SDL_haptic.c" />
<ClCompile Include="..\..\src\stdlib\SDL_iconv.c" /> <ClCompile Include="..\..\src\stdlib\SDL_iconv.c" />
@ -414,7 +414,7 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ClCompile Include="..\..\src\audio\SDL_mixer_m68k.c" /> <ClCompile Include="..\..\src\audio\SDL_mixer_m68k.c" />
<ClCompile Include="..\..\src\audio\SDL_mixer_MMX.c" /> <ClCompile Include="..\..\src\audio\SDL_mixer_MMX.c" />
<ClCompile Include="..\..\src\audio\SDL_mixer_MMX_VC.c" /> <ClCompile Include="..\..\src\audio\SDL_mixer_MMX_VC.c" />
<ClCompile Include="..\..\src\joystick\win32\SDL_mmjoystick.c" /> <ClCompile Include="..\..\src\joystick\windows\SDL_mmjoystick.c" />
<ClCompile Include="..\..\src\events\SDL_mouse.c" /> <ClCompile Include="..\..\src\events\SDL_mouse.c" />
<ClCompile Include="..\..\src\video\dummy\SDL_nullevents.c" /> <ClCompile Include="..\..\src\video\dummy\SDL_nullevents.c" />
<ClCompile Include="..\..\src\video\dummy\SDL_nullrender.c" /> <ClCompile Include="..\..\src\video\dummy\SDL_nullrender.c" />
@ -432,27 +432,27 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ClCompile Include="..\..\src\video\SDL_stretch.c" /> <ClCompile Include="..\..\src\video\SDL_stretch.c" />
<ClCompile Include="..\..\src\stdlib\SDL_string.c" /> <ClCompile Include="..\..\src\stdlib\SDL_string.c" />
<ClCompile Include="..\..\src\video\SDL_surface.c" /> <ClCompile Include="..\..\src\video\SDL_surface.c" />
<ClCompile Include="..\..\src\haptic\win32\SDL_syshaptic.c" /> <ClCompile Include="..\..\src\haptic\windows\SDL_syshaptic.c" />
<ClCompile Include="..\..\src\loadso\win32\SDL_sysloadso.c" /> <ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
<ClCompile Include="..\..\src\thread\win32\SDL_sysmutex.c" /> <ClCompile Include="..\..\src\thread\windows\SDL_sysmutex.c" />
<ClCompile Include="..\..\src\power\windows\SDL_syspower.c" /> <ClCompile Include="..\..\src\power\windows\SDL_syspower.c" />
<ClCompile Include="..\..\src\thread\win32\SDL_syssem.c" /> <ClCompile Include="..\..\src\thread\windows\SDL_syssem.c" />
<ClCompile Include="..\..\src\thread\win32\SDL_systhread.c" /> <ClCompile Include="..\..\src\thread\windows\SDL_systhread.c" />
<ClCompile Include="..\..\src\timer\win32\SDL_systimer.c" /> <ClCompile Include="..\..\src\timer\windows\SDL_systimer.c" />
<ClCompile Include="..\..\src\thread\SDL_thread.c" /> <ClCompile Include="..\..\src\thread\SDL_thread.c" />
<ClCompile Include="..\..\src\timer\SDL_timer.c" /> <ClCompile Include="..\..\src\timer\SDL_timer.c" />
<ClCompile Include="..\..\src\video\SDL_video.c" /> <ClCompile Include="..\..\src\video\SDL_video.c" />
<ClCompile Include="..\..\src\audio\SDL_wave.c" /> <ClCompile Include="..\..\src\audio\SDL_wave.c" />
<ClCompile Include="..\..\src\video\win32\SDL_win32clipboard.c" /> <ClCompile Include="..\..\src\video\windows\SDL_windowsclipboard.c" />
<ClCompile Include="..\..\src\video\win32\SDL_win32events.c" /> <ClCompile Include="..\..\src\video\windows\SDL_windowsevents.c" />
<ClCompile Include="..\..\src\video\win32\SDL_win32gamma.c" /> <ClCompile Include="..\..\src\video\windows\SDL_windowsgamma.c" />
<ClCompile Include="..\..\src\video\win32\SDL_win32keyboard.c" /> <ClCompile Include="..\..\src\video\windows\SDL_windowskeyboard.c" />
<ClCompile Include="..\..\src\video\win32\SDL_win32modes.c" /> <ClCompile Include="..\..\src\video\windows\SDL_windowsmodes.c" />
<ClCompile Include="..\..\src\video\win32\SDL_win32mouse.c" /> <ClCompile Include="..\..\src\video\windows\SDL_windowsmouse.c" />
<ClCompile Include="..\..\src\video\win32\SDL_win32opengl.c" /> <ClCompile Include="..\..\src\video\windows\SDL_windowsopengl.c" />
<ClCompile Include="..\..\src\video\win32\SDL_win32shape.c" /> <ClCompile Include="..\..\src\video\windows\SDL_windowsshape.c" />
<ClCompile Include="..\..\src\video\win32\SDL_win32video.c" /> <ClCompile Include="..\..\src\video\windows\SDL_windowsvideo.c" />
<ClCompile Include="..\..\src\video\win32\SDL_win32window.c" /> <ClCompile Include="..\..\src\video\windows\SDL_windowswindow.c" />
<ClCompile Include="..\..\src\events\SDL_windowevents.c" /> <ClCompile Include="..\..\src\events\SDL_windowevents.c" />
<ClCompile Include="..\..\src\video\SDL_yuv_mmx.c" /> <ClCompile Include="..\..\src\video\SDL_yuv_mmx.c" />
<ClCompile Include="..\..\src\video\SDL_yuv_sw.c" /> <ClCompile Include="..\..\src\video\SDL_yuv_sw.c" />
@ -460,4 +460,4 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

8
VisualC/SDLmain/SDLmain_VS2005.vcproj
View file

@ -29,7 +29,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
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;" CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -164,7 +164,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
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;" CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -299,7 +299,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
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;" CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -425,7 +425,7 @@
</References> </References>
<Files> <Files>
<File <File
RelativePath="..\..\Src\Main\Win32\SDL_win32_main.c" RelativePath="..\..\src\main\windows\SDL_windows_main.c"
> >
</File> </File>
</Files> </Files>

8
VisualC/SDLmain/SDLmain_VS2008.vcproj
View file

@ -30,7 +30,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
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;" CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -165,7 +165,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
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;" CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -300,7 +300,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
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;" CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.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;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
@ -426,7 +426,7 @@
</References> </References>
<Files> <Files>
<File <File
RelativePath="..\..\Src\Main\Win32\SDL_win32_main.c" RelativePath="..\..\src\main\windows\SDL_windows_main.c"
> >
</File> </File>
</Files> </Files>

16
VisualC/SDLmain/SDLmain_VS2010.vcxproj
View file

@ -102,8 +102,8 @@
<PreBuildEvent> <PreBuildEvent>
<Message>Making sure basic SDL headers are in place...</Message> <Message>Making sure basic SDL headers are in place...</Message>
<Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY <Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY
echo Copying SDL_config_win32.h to SDL_config.h... echo Copying SDL_config_windows.h to SDL_config.h...
copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h" copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
:SDLCONFIGOKAY :SDLCONFIGOKAY
if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
@ -155,8 +155,8 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<PreBuildEvent> <PreBuildEvent>
<Message>Making sure basic SDL headers are in place...</Message> <Message>Making sure basic SDL headers are in place...</Message>
<Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY <Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY
echo Copying SDL_config_win32.h to SDL_config.h... echo Copying SDL_config_windows.h to SDL_config.h...
copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h" copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
:SDLCONFIGOKAY :SDLCONFIGOKAY
if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
@ -208,8 +208,8 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<PreBuildEvent> <PreBuildEvent>
<Message>Making sure basic SDL headers are in place...</Message> <Message>Making sure basic SDL headers are in place...</Message>
<Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY <Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY
echo Copying SDL_config_win32.h to SDL_config.h... echo Copying SDL_config_windows.h to SDL_config.h...
copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h" copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
:SDLCONFIGOKAY :SDLCONFIGOKAY
if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
@ -256,9 +256,9 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Src\Main\Win32\SDL_win32_main.c" /> <ClCompile Include="..\..\src\main\windows\SDL_windows_main.c" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

74
configure.in
View file

@ -1645,8 +1645,8 @@ CheckOpenGLESQNX()
} }
dnl Check for Win32 OpenGL dnl Check for Windows OpenGL
CheckWIN32GL() CheckWINDOWSGL()
{ {
if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
AC_DEFINE(SDL_VIDEO_OPENGL) AC_DEFINE(SDL_VIDEO_OPENGL)
@ -1906,10 +1906,10 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]])
fi fi
} }
dnl Determine whether the compiler can produce Win32 executables dnl Determine whether the compiler can produce Windows executables
CheckWIN32() CheckWINDOWS()
{ {
AC_MSG_CHECKING(Win32 compiler) AC_MSG_CHECKING(Windows compiler)
have_win32_gcc=no have_win32_gcc=no
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <windows.h> #include <windows.h>
@ -1920,7 +1920,7 @@ CheckWIN32()
AC_MSG_RESULT($have_win32_gcc) AC_MSG_RESULT($have_win32_gcc)
if test x$have_win32_gcc != xyes; then if test x$have_win32_gcc != xyes; then
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Your compiler ($CC) does not produce Win32 executables! *** Your compiler ($CC) does not produce Windows executables!
]) ])
fi fi
@ -1938,7 +1938,7 @@ CheckWIN32()
dnl See if the user wants to redirect standard output to files dnl See if the user wants to redirect standard output to files
AC_ARG_ENABLE(stdio-redirect, AC_ARG_ENABLE(stdio-redirect,
AC_HELP_STRING([--enable-stdio-redirect], [Redirect STDIO to files on Win32 [[default=yes]]]), AC_HELP_STRING([--enable-stdio-redirect], [Redirect STDIO to files on Windows [[default=yes]]]),
, enable_stdio_redirect=yes) , enable_stdio_redirect=yes)
if test x$enable_stdio_redirect != xyes; then if test x$enable_stdio_redirect != xyes; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_STDIO_REDIRECT" EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_STDIO_REDIRECT"
@ -1949,7 +1949,7 @@ dnl Find the DirectX includes and libraries
CheckDIRECTX() CheckDIRECTX()
{ {
AC_ARG_ENABLE(directx, AC_ARG_ENABLE(directx,
AC_HELP_STRING([--enable-directx], [use DirectX for Win32 audio/video [[default=yes]]]), AC_HELP_STRING([--enable-directx], [use DirectX for Windows audio/video [[default=yes]]]),
, enable_directx=yes) , enable_directx=yes)
if test x$enable_directx = xyes; then if test x$enable_directx = xyes; then
AC_CHECK_HEADER(d3d9.h, have_d3d=yes) AC_CHECK_HEADER(d3d9.h, have_d3d=yes)
@ -2332,10 +2332,10 @@ case "$host" in
CheckDummyVideo CheckDummyVideo
CheckDiskAudio CheckDiskAudio
CheckDummyAudio CheckDummyAudio
CheckWIN32 CheckWINDOWS
if test x$enable_video = xyes; then if test x$enable_video = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_WIN32) AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS)
SOURCES="$SOURCES $srcdir/src/video/win32/*.c" SOURCES="$SOURCES $srcdir/src/video/windows/*.c"
have_video=yes have_video=yes
AC_ARG_ENABLE(render-gdi, AC_ARG_ENABLE(render-gdi,
AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]), AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]),
@ -2381,10 +2381,10 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
fi fi
# Set up files for the thread library # Set up files for the thread library
if test x$enable_threads = xyes; then if test x$enable_threads = xyes; then
AC_DEFINE(SDL_THREAD_WIN32) AC_DEFINE(SDL_THREAD_WINDOWS)
SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_sysmutex.c"
SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_syssem.c"
SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_systhread.c"
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
have_threads=yes have_threads=yes
fi fi
@ -2396,8 +2396,8 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
fi fi
# Set up files for the shared object loading library # Set up files for the shared object loading library
if test x$enable_loadso = xyes; then if test x$enable_loadso = xyes; then
AC_DEFINE(SDL_LOADSO_WIN32) AC_DEFINE(SDL_LOADSO_WINDOWS)
SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" SOURCES="$SOURCES $srcdir/src/loadso/windows/*.c"
have_loadso=yes have_loadso=yes
fi fi
# Set up the system libraries we need # Set up the system libraries we need
@ -2412,8 +2412,8 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
;; ;;
esac esac
# The Win32 platform requires special setup # The Windows platform requires special setup
SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c" SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420" EXTRA_CFLAGS="$EXTRA_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420"
EXTRA_LDFLAGS="-lSDLmain $EXTRA_LDFLAGS" EXTRA_LDFLAGS="-lSDLmain $EXTRA_LDFLAGS"
;; ;;
@ -2431,13 +2431,13 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
CheckDummyVideo CheckDummyVideo
CheckDiskAudio CheckDiskAudio
CheckDummyAudio CheckDummyAudio
CheckWIN32 CheckWINDOWS
CheckWIN32GL CheckWINDOWSGL
CheckDIRECTX CheckDIRECTX
# Set up files for the video library # Set up files for the video library
if test x$enable_video = xyes; then if test x$enable_video = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_WIN32) AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS)
SOURCES="$SOURCES $srcdir/src/video/win32/*.c" SOURCES="$SOURCES $srcdir/src/video/windows/*.c"
have_video=yes have_video=yes
AC_ARG_ENABLE(render-gdi, AC_ARG_ENABLE(render-gdi,
AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]), AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]),
@ -2466,18 +2466,18 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
if test x$enable_joystick = xyes; then if test x$enable_joystick = xyes; then
if test x$have_dinput = xyes; then if test x$have_dinput = xyes; then
AC_DEFINE(SDL_JOYSTICK_DINPUT) AC_DEFINE(SDL_JOYSTICK_DINPUT)
SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c" SOURCES="$SOURCES $srcdir/src/joystick/windows/SDL_dxjoystick.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8"
else else
AC_DEFINE(SDL_JOYSTICK_WINMM) AC_DEFINE(SDL_JOYSTICK_WINMM)
SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c" SOURCES="$SOURCES $srcdir/src/joystick/windows/SDL_mmjoystick.c"
fi fi
have_joystick=yes have_joystick=yes
fi fi
if test x$enable_haptic = xyes; then if test x$enable_haptic = xyes; then
if test x$have_dinput = xyes; then if test x$have_dinput = xyes; then
AC_DEFINE(SDL_HAPTIC_DINPUT) AC_DEFINE(SDL_HAPTIC_DINPUT)
SOURCES="$SOURCES $srcdir/src/haptic/win32/SDL_syshaptic.c" SOURCES="$SOURCES $srcdir/src/haptic/windows/SDL_syshaptic.c"
have_haptic=yes have_haptic=yes
fi fi
fi fi
@ -2488,23 +2488,23 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
fi fi
# Set up files for the thread library # Set up files for the thread library
if test x$enable_threads = xyes; then if test x$enable_threads = xyes; then
AC_DEFINE(SDL_THREAD_WIN32) AC_DEFINE(SDL_THREAD_WINDOWS)
SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_sysmutex.c"
SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_syssem.c"
SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_systhread.c"
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
have_threads=yes have_threads=yes
fi fi
# Set up files for the timer library # Set up files for the timer library
if test x$enable_timers = xyes; then if test x$enable_timers = xyes; then
AC_DEFINE(SDL_TIMER_WIN32) AC_DEFINE(SDL_TIMER_WINDOWS)
SOURCES="$SOURCES $srcdir/src/timer/win32/*.c" SOURCES="$SOURCES $srcdir/src/timer/windows/*.c"
have_timers=yes have_timers=yes
fi fi
# Set up files for the shared object loading library # Set up files for the shared object loading library
if test x$enable_loadso = xyes; then if test x$enable_loadso = xyes; then
AC_DEFINE(SDL_LOADSO_WIN32) AC_DEFINE(SDL_LOADSO_WINDOWS)
SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" SOURCES="$SOURCES $srcdir/src/loadso/windows/*.c"
have_loadso=yes have_loadso=yes
fi fi
# Set up the system libraries we need # Set up the system libraries we need
@ -2512,9 +2512,9 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
# You can get this here: http://libunicows.sourceforge.net/ # You can get this here: http://libunicows.sourceforge.net/
#EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows" #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lmsimg32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lmsimg32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid"
# The Win32 platform requires special setup # The Windows platform requires special setup
VERSION_SOURCES="$srcdir/src/main/win32/*.rc" VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c" SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows" SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
;; ;;

6
include/SDL_compat.h
View file

@ -64,6 +64,12 @@ extern "C" {
*/ */
/*@{*/ /*@{*/
/* Platform */
#ifdef __WINDOWS__
#undef __WIN32__
#define __WIN32__ 1
#endif
/** /**
* \name Surface flags * \name Surface flags
*/ */

4
include/SDL_config.h.default
View file

@ -40,8 +40,8 @@
#include "SDL_config_iphoneos.h" #include "SDL_config_iphoneos.h"
#elif defined(__MACOSX__) #elif defined(__MACOSX__)
#include "SDL_config_macosx.h" #include "SDL_config_macosx.h"
#elif defined(__WIN32__) #elif defined(__WINDOWS__)
#include "SDL_config_win32.h" #include "SDL_config_windows.h"
#else #else
#include "SDL_config_minimal.h" #include "SDL_config_minimal.h"
#endif /* platform config */ #endif /* platform config */

10
include/SDL_config.h.in
View file

@ -89,7 +89,7 @@
#undef HAVE_REALLOC #undef HAVE_REALLOC
#undef HAVE_FREE #undef HAVE_FREE
#undef HAVE_ALLOCA #undef HAVE_ALLOCA
#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */ #ifndef __WINDOWS__ /* Don't use C runtime versions of these on Windows */
#undef HAVE_GETENV #undef HAVE_GETENV
#undef HAVE_SETENV #undef HAVE_SETENV
#undef HAVE_PUTENV #undef HAVE_PUTENV
@ -235,7 +235,7 @@
#undef SDL_LOADSO_DLOPEN #undef SDL_LOADSO_DLOPEN
#undef SDL_LOADSO_DUMMY #undef SDL_LOADSO_DUMMY
#undef SDL_LOADSO_LDG #undef SDL_LOADSO_LDG
#undef SDL_LOADSO_WIN32 #undef SDL_LOADSO_WINDOWS
/* Enable various threading systems */ /* Enable various threading systems */
#undef SDL_THREAD_BEOS #undef SDL_THREAD_BEOS
@ -244,7 +244,7 @@
#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX
#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP
#undef SDL_THREAD_SPROC #undef SDL_THREAD_SPROC
#undef SDL_THREAD_WIN32 #undef SDL_THREAD_WINDOWS
/* Enable various timer systems */ /* Enable various timer systems */
#undef SDL_TIMER_BEOS #undef SDL_TIMER_BEOS
@ -252,7 +252,7 @@
#undef SDL_TIMER_NDS #undef SDL_TIMER_NDS
#undef SDL_TIMER_RISCOS #undef SDL_TIMER_RISCOS
#undef SDL_TIMER_UNIX #undef SDL_TIMER_UNIX
#undef SDL_TIMER_WIN32 #undef SDL_TIMER_WINDOWS
#undef SDL_TIMER_WINCE #undef SDL_TIMER_WINCE
/* Enable various video drivers */ /* Enable various video drivers */
@ -265,7 +265,7 @@
#undef SDL_VIDEO_DRIVER_PHOTON #undef SDL_VIDEO_DRIVER_PHOTON
#undef SDL_VIDEO_DRIVER_QNXGF #undef SDL_VIDEO_DRIVER_QNXGF
#undef SDL_VIDEO_DRIVER_RISCOS #undef SDL_VIDEO_DRIVER_RISCOS
#undef SDL_VIDEO_DRIVER_WIN32 #undef SDL_VIDEO_DRIVER_WINDOWS
#undef SDL_VIDEO_DRIVER_X11 #undef SDL_VIDEO_DRIVER_X11
#undef SDL_VIDEO_DRIVER_X11_DYNAMIC #undef SDL_VIDEO_DRIVER_X11_DYNAMIC
#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT

14
include/SDL_config_win32.h → include/SDL_config_windows.h
View file

@ -20,8 +20,8 @@
slouken@libsdl.org slouken@libsdl.org
*/ */
#ifndef _SDL_config_win32_h #ifndef _SDL_config_windows2_h
#define _SDL_config_win32_h #define _SDL_config_windows2_h
#include "SDL_platform.h" #include "SDL_platform.h"
@ -162,21 +162,21 @@ typedef unsigned int uintptr_t;
#endif #endif
/* Enable various shared object loading systems */ /* Enable various shared object loading systems */
#define SDL_LOADSO_WIN32 1 #define SDL_LOADSO_WINDOWS 1
/* Enable various threading systems */ /* Enable various threading systems */
#define SDL_THREAD_WIN32 1 #define SDL_THREAD_WINDOWS 1
/* Enable various timer systems */ /* Enable various timer systems */
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
#define SDL_TIMER_WINCE 1 #define SDL_TIMER_WINCE 1
#else #else
#define SDL_TIMER_WIN32 1 #define SDL_TIMER_WINDOWS 1
#endif #endif
/* Enable various video drivers */ /* Enable various video drivers */
#define SDL_VIDEO_DRIVER_DUMMY 1 #define SDL_VIDEO_DRIVER_DUMMY 1
#define SDL_VIDEO_DRIVER_WIN32 1 #define SDL_VIDEO_DRIVER_WINDOWS 1
#define SDL_VIDEO_RENDER_D3D 1 #define SDL_VIDEO_RENDER_D3D 1
#define SDL_VIDEO_RENDER_GDI 1 #define SDL_VIDEO_RENDER_GDI 1
@ -196,4 +196,4 @@ typedef unsigned int uintptr_t;
#define SDL_ASSEMBLY_ROUTINES 1 #define SDL_ASSEMBLY_ROUTINES 1
#endif #endif
#endif /* _SDL_config_win32_h */ #endif /* _SDL_config_windows2_h */

4
include/SDL_main.h
View file

@ -31,7 +31,7 @@
* Redefine main() on some platforms so that it is called by SDL. * Redefine main() on some platforms so that it is called by SDL.
*/ */
#if defined(__WIN32__) || \ #if defined(__WINDOWS__) || \
(defined(__MWERKS__) && !defined(__BEOS__)) || \ (defined(__MWERKS__) && !defined(__BEOS__)) || \
defined(__SYMBIAN32__) || defined(__IPHONEOS__) || \ defined(__SYMBIAN32__) || defined(__IPHONEOS__) || \
defined(__ANDROID__) defined(__ANDROID__)
@ -66,7 +66,7 @@ extern C_LINKAGE int SDL_main(int argc, char *argv[]);
/* From the SDL library code -- needed for registering the app on Win32 */ /* From the SDL library code -- needed for registering the app on Win32 */
#ifdef __WIN32__ #ifdef __WINDOWS__
#include "begin_code.h" #include "begin_code.h"
#ifdef __cplusplus #ifdef __cplusplus

2
include/SDL_opengl.h
View file

@ -31,7 +31,7 @@
#include "SDL_config.h" #include "SDL_config.h"
#ifdef __WIN32__ #ifdef __WINDOWS__
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX #ifndef NOMINMAX
#define NOMINMAX /* Don't defined min() and max() */ #define NOMINMAX /* Don't defined min() and max() */

4
include/SDL_platform.h
View file

@ -125,8 +125,8 @@
#define __SOLARIS__ 1 #define __SOLARIS__ 1
#endif #endif
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
#undef __WIN32__ #undef __WINDOWS__
#define __WIN32__ 1 #define __WINDOWS__ 1
#endif #endif
#if defined(__NDS__) #if defined(__NDS__)

4
include/SDL_rwops.h
View file

@ -83,7 +83,7 @@ typedef struct SDL_RWops
Uint32 type; Uint32 type;
union union
{ {
#ifdef __WIN32__ #ifdef __WINDOWS__
struct struct
{ {
SDL_bool append; SDL_bool append;
@ -94,7 +94,7 @@ typedef struct SDL_RWops
size_t size; size_t size;
size_t left; size_t left;
} buffer; } buffer;
} win32io; } windowsio;
#endif #endif
#ifdef HAVE_STDIO_H #ifdef HAVE_STDIO_H
struct struct

6
include/SDL_syswm.h
View file

@ -54,7 +54,7 @@ extern "C" {
struct SDL_SysWMinfo; struct SDL_SysWMinfo;
#else #else
#if defined(SDL_VIDEO_DRIVER_WIN32) #if defined(SDL_VIDEO_DRIVER_WINDOWS)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#endif #endif
@ -118,7 +118,7 @@ struct SDL_SysWMmsg
SDL_SYSWM_TYPE subsystem; SDL_SYSWM_TYPE subsystem;
union union
{ {
#if defined(SDL_VIDEO_DRIVER_WIN32) #if defined(SDL_VIDEO_DRIVER_WINDOWS)
struct { struct {
HWND hwnd; /**< The window for the message */ HWND hwnd; /**< The window for the message */
UINT msg; /**< The type of message */ UINT msg; /**< The type of message */
@ -163,7 +163,7 @@ struct SDL_SysWMinfo
SDL_SYSWM_TYPE subsystem; SDL_SYSWM_TYPE subsystem;
union union
{ {
#if defined(SDL_VIDEO_DRIVER_WIN32) #if defined(SDL_VIDEO_DRIVER_WINDOWS)
struct struct
{ {
HWND window; /**< The window handle */ HWND window; /**< The window handle */

2
include/SDL_thread.h
View file

@ -55,7 +55,7 @@ typedef unsigned long SDL_threadID;
*/ */
typedef int (SDLCALL * SDL_ThreadFunction) (void *data); typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
#if defined(__WIN32__) && !defined(HAVE_LIBC) #if defined(__WINDOWS__) && !defined(HAVE_LIBC)
/** /**
* \file SDL_thread.h * \file SDL_thread.h
* *

4
include/begin_code.h
View file

@ -42,7 +42,7 @@
# else # else
# define DECLSPEC __declspec(export) # define DECLSPEC __declspec(export)
# endif # endif
# elif defined(__WIN32__) # elif defined(__WINDOWS__)
# ifdef __BORLANDC__ # ifdef __BORLANDC__
# ifdef BUILD_SDL # ifdef BUILD_SDL
# define DECLSPEC # define DECLSPEC
@ -63,7 +63,7 @@
/* By default SDL uses the C calling convention */ /* By default SDL uses the C calling convention */
#ifndef SDLCALL #ifndef SDLCALL
#if defined(__WIN32__) && !defined(__GNUC__) #if defined(__WINDOWS__) && !defined(__GNUC__)
#define SDLCALL __cdecl #define SDLCALL __cdecl
#else #else
#define SDLCALL #define SDLCALL

12
src/SDL.c
View file

@ -39,7 +39,7 @@ extern void SDL_StartTicks(void);
extern int SDL_TimerInit(void); extern int SDL_TimerInit(void);
extern void SDL_TimerQuit(void); extern void SDL_TimerQuit(void);
#endif #endif
#if defined(__WIN32__) #if defined(__WINDOWS__)
extern int SDL_HelperWindowCreate(void); extern int SDL_HelperWindowCreate(void);
extern int SDL_HelperWindowDestroy(void); extern int SDL_HelperWindowDestroy(void);
#endif #endif
@ -147,7 +147,7 @@ SDL_Init(Uint32 flags)
/* Clear the error message */ /* Clear the error message */
SDL_ClearError(); SDL_ClearError();
#if defined(__WIN32__) #if defined(__WINDOWS__)
if (SDL_HelperWindowCreate() < 0) { if (SDL_HelperWindowCreate() < 0) {
return -1; return -1;
} }
@ -220,7 +220,7 @@ SDL_Quit(void)
fflush(stdout); fflush(stdout);
#endif #endif
#if defined(__WIN32__) #if defined(__WINDOWS__)
SDL_HelperWindowDestroy(); SDL_HelperWindowDestroy();
#endif #endif
SDL_QuitSubSystem(SDL_INIT_EVERYTHING); SDL_QuitSubSystem(SDL_INIT_EVERYTHING);
@ -312,7 +312,7 @@ SDL_GetPlatform()
return "RISC OS"; return "RISC OS";
#elif __SOLARIS__ #elif __SOLARIS__
return "Solaris"; return "Solaris";
#elif __WIN32__ #elif __WINDOWS__
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
return "Windows CE"; return "Windows CE";
#else #else
@ -325,7 +325,7 @@ SDL_GetPlatform()
#endif #endif
} }
#if defined(__WIN32__) #if defined(__WINDOWS__)
#if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL)) #if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL))
/* Need to include DllMain() on Watcom C for some reason.. */ /* Need to include DllMain() on Watcom C for some reason.. */
@ -347,6 +347,6 @@ _DllMainCRTStartup(HANDLE hModule,
} }
#endif /* building DLL with Watcom C */ #endif /* building DLL with Watcom C */
#endif /* __WIN32__ */ #endif /* __WINDOWS__ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

2
src/audio/SDL_audio.c
View file

@ -971,7 +971,7 @@ open_audio_device(const char *devname, int iscapture,
if (!current_audio.impl.ProvidesOwnCallbackThread) { if (!current_audio.impl.ProvidesOwnCallbackThread) {
/* Start the audio thread */ /* Start the audio thread */
/* !!! FIXME: this is nasty. */ /* !!! FIXME: this is nasty. */
#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) #if (defined(__WINDOWS__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
#undef SDL_CreateThread #undef SDL_CreateThread
device->thread = SDL_CreateThread(SDL_RunAudio, device, NULL, NULL); device->thread = SDL_CreateThread(SDL_RunAudio, device, NULL, NULL);
#else #else

4
src/cpuinfo/SDL_cpuinfo.c
View file

@ -38,7 +38,7 @@
#include <signal.h> #include <signal.h>
#include <setjmp.h> #include <setjmp.h>
#endif #endif
#ifdef __WIN32__ #ifdef __WINDOWS__
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#endif #endif
@ -319,7 +319,7 @@ SDL_GetCPUCount()
sysctlbyname("hw.ncpu", &SDL_CPUCount, &size, NULL, 0); sysctlbyname("hw.ncpu", &SDL_CPUCount, &size, NULL, 0);
} }
#endif #endif
#ifdef __WIN32__ #ifdef __WINDOWS__
if (SDL_CPUCount <= 0) { if (SDL_CPUCount <= 0) {
SYSTEM_INFO info; SYSTEM_INFO info;
GetSystemInfo(&info); GetSystemInfo(&info);

2
src/events/SDL_events.c
View file

@ -170,7 +170,7 @@ SDL_StartEventThread(Uint32 flags)
/* The event thread will handle timers too */ /* The event thread will handle timers too */
SDL_SetTimerThreaded(2); SDL_SetTimerThreaded(2);
#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) #if (defined(__WINDOWS__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
#undef SDL_CreateThread #undef SDL_CreateThread
SDL_EventThread = SDL_EventThread =
SDL_CreateThread(SDL_GobbleEvents, NULL, NULL, NULL); SDL_CreateThread(SDL_GobbleEvents, NULL, NULL, NULL);

2
src/events/SDL_sysevents.h
View file

@ -29,7 +29,7 @@
#define MUST_THREAD_EVENTS #define MUST_THREAD_EVENTS
#endif #endif
#ifdef __WIN32__ /* Win32 doesn't allow a separate event thread */ #ifdef __WINDOWS__ /* Windows doesn't allow a separate event thread */
#define CANT_THREAD_EVENTS #define CANT_THREAD_EVENTS
#endif #endif

2
src/events/scancodes_win32.h → src/events/scancodes_windows.h
View file

@ -26,7 +26,7 @@
- msdn.microsoft.com - msdn.microsoft.com
*/ */
/* *INDENT-OFF* */ /* *INDENT-OFF* */
static const SDL_scancode win32_scancode_table[] = { static const SDL_scancode windows_scancode_table[] = {
/* 0, 0x00 */ SDL_SCANCODE_UNKNOWN, /* 0, 0x00 */ SDL_SCANCODE_UNKNOWN,
/* 1, 0x01 */ SDL_SCANCODE_UNKNOWN, /* 1, 0x01 */ SDL_SCANCODE_UNKNOWN,
/* 2, 0x02 */ SDL_SCANCODE_UNKNOWN, /* 2, 0x02 */ SDL_SCANCODE_UNKNOWN,

124
src/file/SDL_rwops.c
View file

@ -37,7 +37,7 @@
#include <fat.h> #include <fat.h>
#endif /* __NDS__ */ #endif /* __NDS__ */
#ifdef __WIN32__ #ifdef __WINDOWS__
/* Functions to read/write Win32 API file pointers */ /* Functions to read/write Win32 API file pointers */
/* Will not use it on WinCE because stdio is buffered, it means /* Will not use it on WinCE because stdio is buffered, it means
@ -54,7 +54,7 @@
#define READAHEAD_BUFFER_SIZE 1024 #define READAHEAD_BUFFER_SIZE 1024
static int SDLCALL static int SDLCALL
win32_file_open(SDL_RWops * context, const char *filename, const char *mode) windows_file_open(SDL_RWops * context, const char *filename, const char *mode)
{ {
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
UINT old_error_mode; UINT old_error_mode;
@ -67,10 +67,10 @@ win32_file_open(SDL_RWops * context, const char *filename, const char *mode)
if (!context) if (!context)
return -1; /* failed (invalid call) */ return -1; /* failed (invalid call) */
context->hidden.win32io.h = INVALID_HANDLE_VALUE; /* mark this as unusable */ context->hidden.windowsio.h = INVALID_HANDLE_VALUE; /* mark this as unusable */
context->hidden.win32io.buffer.data = NULL; context->hidden.windowsio.buffer.data = NULL;
context->hidden.win32io.buffer.size = 0; context->hidden.windowsio.buffer.size = 0;
context->hidden.win32io.buffer.left = 0; context->hidden.windowsio.buffer.left = 0;
/* "r" = reading, file must exist */ /* "r" = reading, file must exist */
/* "w" = writing, truncate existing, file may not exist */ /* "w" = writing, truncate existing, file may not exist */
@ -90,9 +90,9 @@ win32_file_open(SDL_RWops * context, const char *filename, const char *mode)
if (!r_right && !w_right) /* inconsistent mode */ if (!r_right && !w_right) /* inconsistent mode */
return -1; /* failed (invalid call) */ return -1; /* failed (invalid call) */
context->hidden.win32io.buffer.data = context->hidden.windowsio.buffer.data =
(char *) SDL_malloc(READAHEAD_BUFFER_SIZE); (char *) SDL_malloc(READAHEAD_BUFFER_SIZE);
if (!context->hidden.win32io.buffer.data) { if (!context->hidden.windowsio.buffer.data) {
SDL_OutOfMemory(); SDL_OutOfMemory();
return -1; return -1;
} }
@ -104,8 +104,8 @@ win32_file_open(SDL_RWops * context, const char *filename, const char *mode)
if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, filenameW, size) == if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, filenameW, size) ==
0) { 0) {
SDL_stack_free(filenameW); SDL_stack_free(filenameW);
SDL_free(context->hidden.win32io.buffer.data); SDL_free(context->hidden.windowsio.buffer.data);
context->hidden.win32io.buffer.data = NULL; context->hidden.windowsio.buffer.data = NULL;
SDL_SetError("Unable to convert filename to Unicode"); SDL_SetError("Unable to convert filename to Unicode");
return -1; return -1;
} }
@ -130,51 +130,51 @@ win32_file_open(SDL_RWops * context, const char *filename, const char *mode)
#endif /* _WIN32_WCE */ #endif /* _WIN32_WCE */
if (h == INVALID_HANDLE_VALUE) { if (h == INVALID_HANDLE_VALUE) {
SDL_free(context->hidden.win32io.buffer.data); SDL_free(context->hidden.windowsio.buffer.data);
context->hidden.win32io.buffer.data = NULL; context->hidden.windowsio.buffer.data = NULL;
SDL_SetError("Couldn't open %s", filename); SDL_SetError("Couldn't open %s", filename);
return -2; /* failed (CreateFile) */ return -2; /* failed (CreateFile) */
} }
context->hidden.win32io.h = h; context->hidden.windowsio.h = h;
context->hidden.win32io.append = a_mode ? SDL_TRUE : SDL_FALSE; context->hidden.windowsio.append = a_mode ? SDL_TRUE : SDL_FALSE;
return 0; /* ok */ return 0; /* ok */
} }
static long SDLCALL static long SDLCALL
win32_file_seek(SDL_RWops * context, long offset, int whence) windows_file_seek(SDL_RWops * context, long offset, int whence)
{ {
DWORD win32whence; DWORD windowswhence;
long file_pos; long file_pos;
if (!context || context->hidden.win32io.h == INVALID_HANDLE_VALUE) { if (!context || context->hidden.windowsio.h == INVALID_HANDLE_VALUE) {
SDL_SetError("win32_file_seek: invalid context/file not opened"); SDL_SetError("windows_file_seek: invalid context/file not opened");
return -1; return -1;
} }
/* FIXME: We may be able to satisfy the seek within buffered data */ /* FIXME: We may be able to satisfy the seek within buffered data */
if (whence == RW_SEEK_CUR && context->hidden.win32io.buffer.left) { if (whence == RW_SEEK_CUR && context->hidden.windowsio.buffer.left) {
offset -= (long)context->hidden.win32io.buffer.left; offset -= (long)context->hidden.windowsio.buffer.left;
} }
context->hidden.win32io.buffer.left = 0; context->hidden.windowsio.buffer.left = 0;
switch (whence) { switch (whence) {
case RW_SEEK_SET: case RW_SEEK_SET:
win32whence = FILE_BEGIN; windowswhence = FILE_BEGIN;
break; break;
case RW_SEEK_CUR: case RW_SEEK_CUR:
win32whence = FILE_CURRENT; windowswhence = FILE_CURRENT;
break; break;
case RW_SEEK_END: case RW_SEEK_END:
win32whence = FILE_END; windowswhence = FILE_END;
break; break;
default: default:
SDL_SetError("win32_file_seek: Unknown value for 'whence'"); SDL_SetError("windows_file_seek: Unknown value for 'whence'");
return -1; return -1;
} }
file_pos = file_pos =
SetFilePointer(context->hidden.win32io.h, offset, NULL, win32whence); SetFilePointer(context->hidden.windowsio.h, offset, NULL, windowswhence);
if (file_pos != INVALID_SET_FILE_POINTER) if (file_pos != INVALID_SET_FILE_POINTER)
return file_pos; /* success */ return file_pos; /* success */
@ -184,7 +184,7 @@ win32_file_seek(SDL_RWops * context, long offset, int whence)
} }
static size_t SDLCALL static size_t SDLCALL
win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum) windows_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
{ {
size_t total_need; size_t total_need;
size_t total_read = 0; size_t total_read = 0;
@ -193,18 +193,18 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
total_need = size * maxnum; total_need = size * maxnum;
if (!context || context->hidden.win32io.h == INVALID_HANDLE_VALUE if (!context || context->hidden.windowsio.h == INVALID_HANDLE_VALUE
|| !total_need) || !total_need)
return 0; return 0;
if (context->hidden.win32io.buffer.left > 0) { if (context->hidden.windowsio.buffer.left > 0) {
void *data = (char *) context->hidden.win32io.buffer.data + void *data = (char *) context->hidden.windowsio.buffer.data +
context->hidden.win32io.buffer.size - context->hidden.windowsio.buffer.size -
context->hidden.win32io.buffer.left; context->hidden.windowsio.buffer.left;
read_ahead = read_ahead =
SDL_min(total_need, context->hidden.win32io.buffer.left); SDL_min(total_need, context->hidden.windowsio.buffer.left);
SDL_memcpy(ptr, data, read_ahead); SDL_memcpy(ptr, data, read_ahead);
context->hidden.win32io.buffer.left -= read_ahead; context->hidden.windowsio.buffer.left -= read_ahead;
if (read_ahead == total_need) { if (read_ahead == total_need) {
return maxnum; return maxnum;
@ -216,19 +216,19 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
if (total_need < READAHEAD_BUFFER_SIZE) { if (total_need < READAHEAD_BUFFER_SIZE) {
if (!ReadFile if (!ReadFile
(context->hidden.win32io.h, context->hidden.win32io.buffer.data, (context->hidden.windowsio.h, context->hidden.windowsio.buffer.data,
READAHEAD_BUFFER_SIZE, &byte_read, NULL)) { READAHEAD_BUFFER_SIZE, &byte_read, NULL)) {
SDL_Error(SDL_EFREAD); SDL_Error(SDL_EFREAD);
return 0; return 0;
} }
read_ahead = SDL_min(total_need, (int) byte_read); read_ahead = SDL_min(total_need, (int) byte_read);
SDL_memcpy(ptr, context->hidden.win32io.buffer.data, read_ahead); SDL_memcpy(ptr, context->hidden.windowsio.buffer.data, read_ahead);
context->hidden.win32io.buffer.size = byte_read; context->hidden.windowsio.buffer.size = byte_read;
context->hidden.win32io.buffer.left = byte_read - read_ahead; context->hidden.windowsio.buffer.left = byte_read - read_ahead;
total_read += read_ahead; total_read += read_ahead;
} else { } else {
if (!ReadFile if (!ReadFile
(context->hidden.win32io.h, ptr, (DWORD)total_need, &byte_read, NULL)) { (context->hidden.windowsio.h, ptr, (DWORD)total_need, &byte_read, NULL)) {
SDL_Error(SDL_EFREAD); SDL_Error(SDL_EFREAD);
return 0; return 0;
} }
@ -238,7 +238,7 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
} }
static size_t SDLCALL static size_t SDLCALL
win32_file_write(SDL_RWops * context, const void *ptr, size_t size, windows_file_write(SDL_RWops * context, const void *ptr, size_t size,
size_t num) size_t num)
{ {
@ -248,20 +248,20 @@ win32_file_write(SDL_RWops * context, const void *ptr, size_t size,
total_bytes = size * num; total_bytes = size * num;
if (!context || context->hidden.win32io.h == INVALID_HANDLE_VALUE if (!context || context->hidden.windowsio.h == INVALID_HANDLE_VALUE
|| total_bytes <= 0 || !size) || total_bytes <= 0 || !size)
return 0; return 0;
if (context->hidden.win32io.buffer.left) { if (context->hidden.windowsio.buffer.left) {
SetFilePointer(context->hidden.win32io.h, SetFilePointer(context->hidden.windowsio.h,
-(LONG)context->hidden.win32io.buffer.left, NULL, -(LONG)context->hidden.windowsio.buffer.left, NULL,
FILE_CURRENT); FILE_CURRENT);
context->hidden.win32io.buffer.left = 0; context->hidden.windowsio.buffer.left = 0;
} }
/* if in append mode, we must go to the EOF before write */ /* if in append mode, we must go to the EOF before write */
if (context->hidden.win32io.append) { if (context->hidden.windowsio.append) {
if (SetFilePointer(context->hidden.win32io.h, 0L, NULL, FILE_END) == if (SetFilePointer(context->hidden.windowsio.h, 0L, NULL, FILE_END) ==
INVALID_SET_FILE_POINTER) { INVALID_SET_FILE_POINTER) {
SDL_Error(SDL_EFWRITE); SDL_Error(SDL_EFWRITE);
return 0; return 0;
@ -269,7 +269,7 @@ win32_file_write(SDL_RWops * context, const void *ptr, size_t size,
} }
if (!WriteFile if (!WriteFile
(context->hidden.win32io.h, ptr, (DWORD)total_bytes, &byte_written, NULL)) { (context->hidden.windowsio.h, ptr, (DWORD)total_bytes, &byte_written, NULL)) {
SDL_Error(SDL_EFWRITE); SDL_Error(SDL_EFWRITE);
return 0; return 0;
} }
@ -279,23 +279,23 @@ win32_file_write(SDL_RWops * context, const void *ptr, size_t size,
} }
static int SDLCALL static int SDLCALL
win32_file_close(SDL_RWops * context) windows_file_close(SDL_RWops * context)
{ {
if (context) { if (context) {
if (context->hidden.win32io.h != INVALID_HANDLE_VALUE) { if (context->hidden.windowsio.h != INVALID_HANDLE_VALUE) {
CloseHandle(context->hidden.win32io.h); CloseHandle(context->hidden.windowsio.h);
context->hidden.win32io.h = INVALID_HANDLE_VALUE; /* to be sure */ context->hidden.windowsio.h = INVALID_HANDLE_VALUE; /* to be sure */
} }
if (context->hidden.win32io.buffer.data) { if (context->hidden.windowsio.buffer.data) {
SDL_free(context->hidden.win32io.buffer.data); SDL_free(context->hidden.windowsio.buffer.data);
context->hidden.win32io.buffer.data = NULL; context->hidden.windowsio.buffer.data = NULL;
} }
SDL_FreeRW(context); SDL_FreeRW(context);
} }
return (0); return (0);
} }
#endif /* __WIN32__ */ #endif /* __WINDOWS__ */
#ifdef HAVE_STDIO_H #ifdef HAVE_STDIO_H
@ -449,18 +449,18 @@ SDL_RWFromFile(const char *file, const char *mode)
SDL_SetError("SDL_RWFromFile(): No file or no mode specified"); SDL_SetError("SDL_RWFromFile(): No file or no mode specified");
return NULL; return NULL;
} }
#if defined(__WIN32__) #if defined(__WINDOWS__)
rwops = SDL_AllocRW(); rwops = SDL_AllocRW();
if (!rwops) if (!rwops)
return NULL; /* SDL_SetError already setup by SDL_AllocRW() */ return NULL; /* SDL_SetError already setup by SDL_AllocRW() */
if (win32_file_open(rwops, file, mode) < 0) { if (windows_file_open(rwops, file, mode) < 0) {
SDL_FreeRW(rwops); SDL_FreeRW(rwops);
return NULL; return NULL;
} }
rwops->seek = win32_file_seek; rwops->seek = windows_file_seek;
rwops->read = win32_file_read; rwops->read = windows_file_read;
rwops->write = win32_file_write; rwops->write = windows_file_write;
rwops->close = win32_file_close; rwops->close = windows_file_close;
#elif HAVE_STDIO_H #elif HAVE_STDIO_H
#ifdef __APPLE__ #ifdef __APPLE__

2
src/haptic/win32/SDL_syshaptic.c → src/haptic/windows/SDL_syshaptic.c
View file

@ -27,7 +27,7 @@
#include "../SDL_syshaptic.h" #include "../SDL_syshaptic.h"
#include "SDL_joystick.h" #include "SDL_joystick.h"
#include "../../joystick/SDL_sysjoystick.h" /* For the real SDL_Joystick */ #include "../../joystick/SDL_sysjoystick.h" /* For the real SDL_Joystick */
#include "../../joystick/win32/SDL_dxjoystick_c.h" /* For joystick hwdata */ #include "../../joystick/windows/SDL_dxjoystick_c.h" /* For joystick hwdata */
#define MAX_HAPTICS 32 #define MAX_HAPTICS 32

0
src/joystick/win32/SDL_dxjoystick.c → src/joystick/windows/SDL_dxjoystick.c
View file

0
src/joystick/win32/SDL_dxjoystick_c.h → src/joystick/windows/SDL_dxjoystick_c.h
View file

2
src/joystick/win32/SDL_mmjoystick.c → src/joystick/windows/SDL_mmjoystick.c
View file

@ -65,7 +65,7 @@ struct joystick_hwdata
} transaxis[6]; } transaxis[6];
}; };
/* Convert a win32 Multimedia API return code to a text message */ /* Convert a Windows Multimedia API return code to a text message */
static void SetMMerror(char *function, int code); static void SetMMerror(char *function, int code);

6
src/loadso/win32/SDL_sysloadso.c → src/loadso/windows/SDL_sysloadso.c
View file

@ -21,7 +21,7 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#ifdef SDL_LOADSO_WIN32 #ifdef SDL_LOADSO_WINDOWS
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* System dependent library loading routines */ /* System dependent library loading routines */
@ -61,7 +61,7 @@ SDL_LoadObject(const char *sofile)
SDL_free(sofile_t); SDL_free(sofile_t);
SDL_free(errbuf_t); SDL_free(errbuf_t);
#else /*if defined(__WIN32__) */ #else /*if defined(__WINDOWS__) */
char errbuf[512]; char errbuf[512];
handle = (void *) LoadLibrary(sofile); handle = (void *) LoadLibrary(sofile);
@ -140,6 +140,6 @@ SDL_UnloadObject(void *handle)
} }
} }
#endif /* SDL_LOADSO_WIN32 */ #endif /* SDL_LOADSO_WINDOWS */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

0
src/main/win32/SDL_win32_main.c → src/main/windows/SDL_windows_main.c
View file

0
src/main/win32/version.rc → src/main/windows/version.rc
View file

4
src/stdlib/SDL_getenv.c
View file

@ -25,7 +25,7 @@
#ifndef HAVE_GETENV #ifndef HAVE_GETENV
#if defined(__WIN32__) && !defined(_WIN32_WCE) #if defined(__WINDOWS__) && !defined(_WIN32_WCE)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
@ -163,7 +163,7 @@ SDL_getenv(const char *name)
return value; return value;
} }
#endif /* __WIN32__ */ #endif /* __WINDOWS__ */
#endif /* !HAVE_GETENV */ #endif /* !HAVE_GETENV */

4
src/thread/SDL_thread_c.h
View file

@ -35,8 +35,8 @@
#include "pthread/SDL_systhread_c.h" #include "pthread/SDL_systhread_c.h"
#elif SDL_THREAD_SPROC #elif SDL_THREAD_SPROC
#include "irix/SDL_systhread_c.h" #include "irix/SDL_systhread_c.h"
#elif SDL_THREAD_WIN32 #elif SDL_THREAD_WINDOWS
#include "win32/SDL_systhread_c.h" #include "windows/SDL_systhread_c.h"
#elif SDL_THREAD_NDS #elif SDL_THREAD_NDS
#include "nds/SDL_systhread_c.h" #include "nds/SDL_systhread_c.h"
#else #else

0
src/thread/win32/SDL_sysmutex.c → src/thread/windows/SDL_sysmutex.c
View file

0
src/thread/win32/SDL_syssem.c → src/thread/windows/SDL_syssem.c
View file

0
src/thread/win32/SDL_systhread.c → src/thread/windows/SDL_systhread.c
View file

0
src/thread/win32/SDL_systhread_c.h → src/thread/windows/SDL_systhread_c.h
View file

0
src/thread/win32/win_ce_semaphore.c → src/thread/windows/win_ce_semaphore.c
View file

0
src/thread/win32/win_ce_semaphore.h → src/thread/windows/win_ce_semaphore.h
View file

5
src/timer/win32/SDL_systimer.c → src/timer/windows/SDL_systimer.c
View file

@ -21,7 +21,7 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#ifdef SDL_TIMER_WIN32 #ifdef SDL_TIMER_WINDOWS
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
@ -161,5 +161,6 @@ SDL_SYS_StopTimer(void)
return; return;
} }
#endif /* SDL_TIMER_WIN32 */ #endif /* SDL_TIMER_WINDOWS */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

4
src/video/SDL_renderer_gl.c
View file

@ -1181,7 +1181,7 @@ GL_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points,
} }
data->glEnd(); data->glEnd();
} else { } else {
#if defined(__APPLE__) || defined(__WIN32__) #if defined(__APPLE__) || defined(__WINDOWS__)
#else #else
int x1, y1, x2, y2; int x1, y1, x2, y2;
#endif #endif
@ -1200,7 +1200,7 @@ GL_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points,
* least it would be pixel perfect. * least it would be pixel perfect.
*/ */
data->glBegin(GL_POINTS); data->glBegin(GL_POINTS);
#if defined(__APPLE__) || defined(__WIN32__) #if defined(__APPLE__) || defined(__WINDOWS__)
/* Mac OS X and Windows seem to always leave the second point open */ /* Mac OS X and Windows seem to always leave the second point open */
data->glVertex2f(0.5f + points[count-1].x, 0.5f + points[count-1].y); data->glVertex2f(0.5f + points[count-1].x, 0.5f + points[count-1].y);
#else #else

4
src/video/SDL_sysvideo.h
View file

@ -411,8 +411,8 @@ extern VideoBootStrap X11_bootstrap;
#if SDL_VIDEO_DRIVER_DIRECTFB #if SDL_VIDEO_DRIVER_DIRECTFB
extern VideoBootStrap DirectFB_bootstrap; extern VideoBootStrap DirectFB_bootstrap;
#endif #endif
#if SDL_VIDEO_DRIVER_WIN32 #if SDL_VIDEO_DRIVER_WINDOWS
extern VideoBootStrap WIN32_bootstrap; extern VideoBootStrap WINDOWS_bootstrap;
#endif #endif
#if SDL_VIDEO_DRIVER_BWINDOW #if SDL_VIDEO_DRIVER_BWINDOW
extern VideoBootStrap BWINDOW_bootstrap; extern VideoBootStrap BWINDOW_bootstrap;

10
src/video/SDL_video.c
View file

@ -34,8 +34,8 @@
#include "../events/SDL_sysevents.h" #include "../events/SDL_sysevents.h"
#include "../events/SDL_events_c.h" #include "../events/SDL_events_c.h"
#if SDL_VIDEO_DRIVER_WIN32 #if SDL_VIDEO_DRIVER_WINDOWS
#include "win32/SDL_win32video.h" #include "windows/SDL_windowsvideo.h"
extern void IME_Present(SDL_VideoData *videodata); extern void IME_Present(SDL_VideoData *videodata);
#endif #endif
@ -65,8 +65,8 @@ static VideoBootStrap *bootstrap[] = {
#if SDL_VIDEO_DRIVER_DIRECTFB #if SDL_VIDEO_DRIVER_DIRECTFB
&DirectFB_bootstrap, &DirectFB_bootstrap,
#endif #endif
#if SDL_VIDEO_DRIVER_WIN32 #if SDL_VIDEO_DRIVER_WINDOWS
&WIN32_bootstrap, &WINDOWS_bootstrap,
#endif #endif
#if SDL_VIDEO_DRIVER_BWINDOW #if SDL_VIDEO_DRIVER_BWINDOW
&BWINDOW_bootstrap, &BWINDOW_bootstrap,
@ -2708,7 +2708,7 @@ SDL_RenderPresent(void)
if (!renderer || !renderer->RenderPresent) { if (!renderer || !renderer->RenderPresent) {
return; return;
} }
#if SDL_VIDEO_DRIVER_WIN32 #if SDL_VIDEO_DRIVER_WINDOWS
IME_Present((SDL_VideoData *)_this->driverdata); IME_Present((SDL_VideoData *)_this->driverdata);
#endif #endif
renderer->RenderPresent(renderer); renderer->RenderPresent(renderer);

2
src/video/win32/SDL_ceddrawrender.c → src/video/windows/SDL_ceddrawrender.c
View file

@ -26,7 +26,7 @@
#if SDL_VIDEO_RENDER_DDRAW #if SDL_VIDEO_RENDER_DDRAW
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
#include "../SDL_yuv_sw_c.h" #include "../SDL_yuv_sw_c.h"
#if 0 #if 0

0
src/video/win32/SDL_ceddrawrender.h → src/video/windows/SDL_ceddrawrender.h
View file

2
src/video/win32/SDL_d3drender.c → src/video/windows/SDL_d3drender.c
View file

@ -23,7 +23,7 @@
#if SDL_VIDEO_RENDER_D3D #if SDL_VIDEO_RENDER_D3D
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
#include "../SDL_yuv_sw_c.h" #include "../SDL_yuv_sw_c.h"
#ifdef ASSEMBLE_SHADER #ifdef ASSEMBLE_SHADER

0
src/video/win32/SDL_d3drender.h → src/video/windows/SDL_d3drender.h
View file

4
src/video/win32/SDL_gapirender.c → src/video/windows/SDL_gapirender.c
View file

@ -26,8 +26,8 @@
#if SDL_VIDEO_RENDER_GAPI #if SDL_VIDEO_RENDER_GAPI
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
#include "SDL_win32window.h" #include "SDL_windowswindow.h"
#include "../SDL_yuv_sw_c.h" #include "../SDL_yuv_sw_c.h"
// RawFrameBufferInfo // RawFrameBufferInfo

0
src/video/win32/SDL_gapirender.h → src/video/windows/SDL_gapirender.h
View file

0
src/video/win32/SDL_gapirender_c.h → src/video/windows/SDL_gapirender_c.h
View file

2
src/video/win32/SDL_gdirender.c → src/video/windows/SDL_gdirender.c
View file

@ -23,7 +23,7 @@
#if SDL_VIDEO_RENDER_GDI #if SDL_VIDEO_RENDER_GDI
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
#include "../SDL_rect_c.h" #include "../SDL_rect_c.h"
#include "../SDL_yuv_sw_c.h" #include "../SDL_yuv_sw_c.h"
#include "../SDL_alphamult.h" #include "../SDL_alphamult.h"

0
src/video/win32/SDL_gdirender.h → src/video/windows/SDL_gdirender.h
View file

0
src/video/win32/SDL_msctf.h → src/video/windows/SDL_msctf.h
View file

0
src/video/win32/SDL_vkeys.h → src/video/windows/SDL_vkeys.h
View file

4
src/video/win32/SDL_win32clipboard.c → src/video/windows/SDL_windowsclipboard.c
View file

@ -21,8 +21,8 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
#include "SDL_win32window.h" #include "SDL_windowswindow.h"
#include "../../events/SDL_clipboardevents_c.h" #include "../../events/SDL_clipboardevents_c.h"

6
src/video/win32/SDL_win32clipboard.h → src/video/windows/SDL_windowsclipboard.h
View file

@ -21,8 +21,8 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#ifndef _SDL_win32clipboard_h #ifndef _SDL_windowsclipboard_h
#define _SDL_win32clipboard_h #define _SDL_windowsclipboard_h
/* Forward declaration */ /* Forward declaration */
struct SDL_VideoData; struct SDL_VideoData;
@ -32,6 +32,6 @@ extern char *WIN_GetClipboardText(_THIS);
extern SDL_bool WIN_HasClipboardText(_THIS); extern SDL_bool WIN_HasClipboardText(_THIS);
extern void WIN_CheckClipboardUpdate(struct SDL_VideoData * data); extern void WIN_CheckClipboardUpdate(struct SDL_VideoData * data);
#endif /* _SDL_win32clipboard_h */ #endif /* _SDL_windowsclipboard_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

4
src/video/win32/SDL_win32events.c → src/video/windows/SDL_windowsevents.c
View file

@ -22,8 +22,8 @@
#include "SDL_config.h" #include "SDL_config.h"
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
#include "SDL_win32shape.h" #include "SDL_windowsshape.h"
#include "SDL_syswm.h" #include "SDL_syswm.h"
#include "SDL_vkeys.h" #include "SDL_vkeys.h"
#include "../../events/SDL_events_c.h" #include "../../events/SDL_events_c.h"

6
src/video/win32/SDL_win32events.h → src/video/windows/SDL_windowsevents.h
View file

@ -21,8 +21,8 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#ifndef _SDL_win32events_h #ifndef _SDL_windowsevents_h
#define _SDL_win32events_h #define _SDL_windowsevents_h
extern LPTSTR SDL_Appname; extern LPTSTR SDL_Appname;
extern Uint32 SDL_Appstyle; extern Uint32 SDL_Appstyle;
@ -32,6 +32,6 @@ extern LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam,
LPARAM lParam); LPARAM lParam);
extern void WIN_PumpEvents(_THIS); extern void WIN_PumpEvents(_THIS);
#endif /* _SDL_win32events_h */ #endif /* _SDL_windowsevents_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

2
src/video/win32/SDL_win32gamma.c → src/video/windows/SDL_windowsgamma.c
View file

@ -21,7 +21,7 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
int int

6
src/video/win32/SDL_win32gamma.h → src/video/windows/SDL_windowsgamma.h
View file

@ -21,12 +21,12 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#ifndef _SDL_win32gamma_h #ifndef _SDL_windowsgamma_h
#define _SDL_win32gamma_h #define _SDL_windowsgamma_h
extern int WIN_SetDisplayGammaRamp(_THIS, SDL_VideoDisplay * display, Uint16 * ramp); extern int WIN_SetDisplayGammaRamp(_THIS, SDL_VideoDisplay * display, Uint16 * ramp);
extern int WIN_GetDisplayGammaRamp(_THIS, SDL_VideoDisplay * display, Uint16 * ramp); extern int WIN_GetDisplayGammaRamp(_THIS, SDL_VideoDisplay * display, Uint16 * ramp);
#endif /* _SDL_win32gamma_h */ #endif /* _SDL_windowsgamma_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

10
src/video/win32/SDL_win32keyboard.c → src/video/windows/SDL_windowskeyboard.c
View file

@ -21,10 +21,10 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
#include "../../events/SDL_keyboard_c.h" #include "../../events/SDL_keyboard_c.h"
#include "../../events/scancodes_win32.h" #include "../../events/scancodes_windows.h"
#include <imm.h> #include <imm.h>
#include <oleauto.h> #include <oleauto.h>
@ -87,7 +87,7 @@ WIN_InitKeyboard(_THIS)
} }
} }
data->key_layout = win32_scancode_table; data->key_layout = windows_scancode_table;
data->ime_com_initialized = SDL_FALSE; data->ime_com_initialized = SDL_FALSE;
data->ime_threadmgr = 0; data->ime_threadmgr = 0;
@ -150,10 +150,10 @@ WIN_UpdateKeymap()
SDL_GetDefaultKeymap(keymap); SDL_GetDefaultKeymap(keymap);
for (i = 0; i < SDL_arraysize(win32_scancode_table); i++) { for (i = 0; i < SDL_arraysize(windows_scancode_table); i++) {
/* Make sure this scancode is a valid character scancode */ /* Make sure this scancode is a valid character scancode */
scancode = win32_scancode_table[i]; scancode = windows_scancode_table[i];
if (scancode == SDL_SCANCODE_UNKNOWN || keymap[scancode] >= 127) { if (scancode == SDL_SCANCODE_UNKNOWN || keymap[scancode] >= 127) {
continue; continue;
} }

6
src/video/win32/SDL_win32keyboard.h → src/video/windows/SDL_windowskeyboard.h
View file

@ -21,8 +21,8 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#ifndef _SDL_win32keyboard_h #ifndef _SDL_windowskeyboard_h
#define _SDL_win32keyboard_h #define _SDL_windowskeyboard_h
extern BYTE alpha_scancodes[26]; extern BYTE alpha_scancodes[26];
extern BYTE keypad_scancodes[10]; extern BYTE keypad_scancodes[10];
@ -37,6 +37,6 @@ extern void WIN_SetTextInputRect(_THIS, SDL_Rect *rect);
extern SDL_bool IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, struct SDL_VideoData *videodata); extern SDL_bool IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, struct SDL_VideoData *videodata);
#endif /* _SDL_win32keyboard_h */ #endif /* _SDL_windowskeyboard_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

2
src/video/win32/SDL_win32modes.c → src/video/windows/SDL_windowsmodes.c
View file

@ -21,7 +21,7 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
static SDL_bool static SDL_bool

6
src/video/win32/SDL_win32modes.h → src/video/windows/SDL_windowsmodes.h
View file

@ -21,8 +21,8 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#ifndef _SDL_win32modes_h #ifndef _SDL_windowsmodes_h
#define _SDL_win32modes_h #define _SDL_windowsmodes_h
typedef struct typedef struct
{ {
@ -40,6 +40,6 @@ extern void WIN_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
extern int WIN_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode); extern int WIN_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
extern void WIN_QuitModes(_THIS); extern void WIN_QuitModes(_THIS);
#endif /* _SDL_win32modes_h */ #endif /* _SDL_windowsmodes_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

2
src/video/win32/SDL_win32mouse.c → src/video/windows/SDL_windowsmouse.c
View file

@ -29,7 +29,7 @@
#include "SDL_config.h" #include "SDL_config.h"
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
void void
WIN_InitMouse(_THIS) WIN_InitMouse(_THIS)

6
src/video/win32/SDL_win32mouse.h → src/video/windows/SDL_windowsmouse.h
View file

@ -21,12 +21,12 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#ifndef _SDL_win32mouse_h #ifndef _SDL_windowsmouse_h
#define _SDL_win32mouse_h #define _SDL_windowsmouse_h
extern void WIN_InitMouse(_THIS); extern void WIN_InitMouse(_THIS);
extern void WIN_QuitMouse(_THIS); extern void WIN_QuitMouse(_THIS);
#endif /* _SDL_win32mouse_h */ #endif /* _SDL_windowsmouse_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

2
src/video/win32/SDL_win32opengl.c → src/video/windows/SDL_windowsopengl.c
View file

@ -21,7 +21,7 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
/* WGL implementation of SDL OpenGL support */ /* WGL implementation of SDL OpenGL support */

6
src/video/win32/SDL_win32opengl.h → src/video/windows/SDL_windowsopengl.h
View file

@ -21,8 +21,8 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#ifndef _SDL_win32opengl_h #ifndef _SDL_windowsopengl_h
#define _SDL_win32opengl_h #define _SDL_windowsopengl_h
#if SDL_VIDEO_OPENGL_WGL #if SDL_VIDEO_OPENGL_WGL
@ -121,6 +121,6 @@ extern void WIN_GL_DeleteContext(_THIS, SDL_GLContext context);
#endif /* SDL_VIDEO_OPENGL_WGL */ #endif /* SDL_VIDEO_OPENGL_WGL */
#endif /* _SDL_win32opengl_h */ #endif /* _SDL_windowsopengl_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

4
src/video/win32/SDL_win32shape.c → src/video/windows/SDL_windowsshape.c
View file

@ -22,8 +22,8 @@
#include <stdio.h> #include <stdio.h>
#include "SDL_assert.h" #include "SDL_assert.h"
#include "SDL_win32shape.h" #include "SDL_windowsshape.h"
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
SDL_WindowShaper* SDL_WindowShaper*
Win32_CreateShaper(SDL_Window * window) { Win32_CreateShaper(SDL_Window * window) {

6
src/video/win32/SDL_win32shape.h → src/video/windows/SDL_windowsshape.h
View file

@ -22,8 +22,8 @@
#include "SDL_config.h" #include "SDL_config.h"
#ifndef _SDL_win32shape_h #ifndef _SDL_windowsshape_h
#define _SDL_win32shape_h #define _SDL_windowsshape_h
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_shape.h" #include "SDL_shape.h"
@ -38,4 +38,4 @@ extern SDL_WindowShaper* Win32_CreateShaper(SDL_Window * window);
extern int Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode); extern int Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
extern int Win32_ResizeWindowShape(SDL_Window *window); extern int Win32_ResizeWindowShape(SDL_Window *window);
#endif /* _SDL_win32shape_h */ #endif /* _SDL_windowsshape_h */

10
src/video/win32/SDL_win32video.c → src/video/windows/SDL_windowsvideo.c
View file

@ -27,8 +27,8 @@
#include "../SDL_sysvideo.h" #include "../SDL_sysvideo.h"
#include "../SDL_pixels_c.h" #include "../SDL_pixels_c.h"
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
#include "SDL_win32shape.h" #include "SDL_windowsshape.h"
#include "SDL_d3drender.h" #include "SDL_d3drender.h"
#include "SDL_gdirender.h" #include "SDL_gdirender.h"
#include "SDL_gapirender.h" #include "SDL_gapirender.h"
@ -51,7 +51,7 @@ WIN_SetError(const char *prefix)
} }
/* WIN32 driver bootstrap functions */ /* Windows driver bootstrap functions */
static int static int
WIN_Available(void) WIN_Available(void)
@ -221,11 +221,11 @@ WIN_CreateDevice(int devindex)
return device; return device;
} }
VideoBootStrap WIN32_bootstrap = { VideoBootStrap WINDOWS_bootstrap = {
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
"wince", "SDL WinCE video driver", WINCE_Available, WIN_CreateDevice "wince", "SDL WinCE video driver", WINCE_Available, WIN_CreateDevice
#else #else
"win32", "SDL Win32/64 video driver", WIN_Available, WIN_CreateDevice "windows", "SDL Win32/64 video driver", WIN_Available, WIN_CreateDevice
#endif #endif
}; };

22
src/video/win32/SDL_win32video.h → src/video/windows/SDL_windowsvideo.h
View file

@ -21,8 +21,8 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#ifndef _SDL_win32video_h #ifndef _SDL_windowsvideo_h
#define _SDL_win32video_h #define _SDL_windowsvideo_h
#include "../SDL_sysvideo.h" #include "../SDL_sysvideo.h"
@ -59,14 +59,14 @@
#include "ddraw.h" #include "ddraw.h"
#endif #endif
#include "SDL_win32clipboard.h" #include "SDL_windowsclipboard.h"
#include "SDL_win32events.h" #include "SDL_windowsevents.h"
#include "SDL_win32gamma.h" #include "SDL_windowsgamma.h"
#include "SDL_win32keyboard.h" #include "SDL_windowskeyboard.h"
#include "SDL_win32modes.h" #include "SDL_windowsmodes.h"
#include "SDL_win32mouse.h" #include "SDL_windowsmouse.h"
#include "SDL_win32opengl.h" #include "SDL_windowsopengl.h"
#include "SDL_win32window.h" #include "SDL_windowswindow.h"
#include "SDL_events.h" #include "SDL_events.h"
#ifdef UNICODE #ifdef UNICODE
@ -217,6 +217,6 @@ typedef struct SDL_VideoData
TSFSink *ime_ippasink; TSFSink *ime_ippasink;
} SDL_VideoData; } SDL_VideoData;
#endif /* _SDL_win32video_h */ #endif /* _SDL_windowsvideo_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

6
src/video/win32/SDL_win32window.c → src/video/windows/SDL_windowswindow.c
View file

@ -25,10 +25,10 @@
#include "../SDL_pixels_c.h" #include "../SDL_pixels_c.h"
#include "../../events/SDL_keyboard_c.h" #include "../../events/SDL_keyboard_c.h"
#include "SDL_win32video.h" #include "SDL_windowsvideo.h"
#include "SDL_win32window.h" #include "SDL_windowswindow.h"
/* This is included after SDL_win32video.h, which includes windows.h */ /* This is included after SDL_windowsvideo.h, which includes windows.h */
#include "SDL_syswm.h" #include "SDL_syswm.h"
#include "SDL_gapirender.h" #include "SDL_gapirender.h"

6
src/video/win32/SDL_win32window.h → src/video/windows/SDL_windowswindow.h
View file

@ -21,8 +21,8 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#ifndef _SDL_win32window_h #ifndef _SDL_windowswindow_h
#define _SDL_win32window_h #define _SDL_windowswindow_h
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
#define SHFS_SHOWTASKBAR 0x0001 #define SHFS_SHOWTASKBAR 0x0001
@ -61,6 +61,6 @@ extern void WIN_DestroyWindow(_THIS, SDL_Window * window);
extern SDL_bool WIN_GetWindowWMInfo(_THIS, SDL_Window * window, extern SDL_bool WIN_GetWindowWMInfo(_THIS, SDL_Window * window,
struct SDL_SysWMinfo *info); struct SDL_SysWMinfo *info);
#endif /* _SDL_win32window_h */ #endif /* _SDL_windowswindow_h */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

0
src/video/win32/wmmsg.h → src/video/windows/wmmsg.h
View file

2
test/automated/rwops/TestSupportRWops_Generic.c
View file

@ -2,7 +2,7 @@
* Customizations for specific platforms should go in alternative files. * Customizations for specific platforms should go in alternative files.
*/ */
// quiet win32 compiler warnings // quiet windows compiler warnings
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#include <stdio.h> #include <stdio.h>

2
test/testfile.c
View file

@ -1,7 +1,7 @@
/* sanity tests on SDL_rwops.c (usefull for alternative implementations of stdio rwops) */ /* sanity tests on SDL_rwops.c (usefull for alternative implementations of stdio rwops) */
// quiet win32 compiler warnings // quiet windows compiler warnings
#define _CRT_NONSTDC_NO_WARNINGS #define _CRT_NONSTDC_NO_WARNINGS
#include <stdlib.h> #include <stdlib.h>

4
test/testgesture.c
View file

@ -19,14 +19,14 @@
#define PRIu32 "u" #define PRIu32 "u"
#endif #endif
#ifndef PRIs64 #ifndef PRIs64
#ifdef __WIN32__ #ifdef __WINDOWS__
#define PRIs64 "I64" #define PRIs64 "I64"
#else #else
#define PRIs64 "lld" #define PRIs64 "lld"
#endif #endif
#endif #endif
#ifndef PRIu64 #ifndef PRIu64
#ifdef __WIN32__ #ifdef __WINDOWS__
#define PRIu64 "I64u" #define PRIu64 "I64u"
#else #else
#define PRIu64 "llu" #define PRIu64 "llu"

4
test/testnative.c
View file

@ -10,8 +10,8 @@
#define MAX_SPEED 1 #define MAX_SPEED 1
static NativeWindowFactory *factories[] = { static NativeWindowFactory *factories[] = {
#ifdef TEST_NATIVE_WIN32 #ifdef TEST_NATIVE_WINDOWS
&Win32WindowFactory, &WindowsWindowFactory,
#endif #endif
#ifdef TEST_NATIVE_X11 #ifdef TEST_NATIVE_X11
&X11WindowFactory, &X11WindowFactory,

6
test/testnative.h
View file

@ -15,9 +15,9 @@ typedef struct
void (*DestroyNativeWindow) (void *window); void (*DestroyNativeWindow) (void *window);
} NativeWindowFactory; } NativeWindowFactory;
#ifdef SDL_VIDEO_DRIVER_WIN32 #ifdef SDL_VIDEO_DRIVER_WINDOWS
#define TEST_NATIVE_WIN32 #define TEST_NATIVE_WINDOWS
extern NativeWindowFactory Win32WindowFactory; extern NativeWindowFactory WindowsWindowFactory;
#endif #endif
#ifdef SDL_VIDEO_DRIVER_X11 #ifdef SDL_VIDEO_DRIVER_X11

18
test/testnativew32.c
View file

@ -1,15 +1,15 @@
#include "testnative.h" #include "testnative.h"
#ifdef TEST_NATIVE_WIN32 #ifdef TEST_NATIVE_WINDOWS
static void *CreateWindowWin32(int w, int h); static void *CreateWindowNative(int w, int h);
static void DestroyWindowWin32(void *window); static void DestroyWindowNative(void *window);
NativeWindowFactory Win32WindowFactory = { NativeWindowFactory WindowsWindowFactory = {
"win32", "windows",
CreateWindowWin32, CreateWindowNative,
DestroyWindowWin32 DestroyWindowNative
}; };
LRESULT CALLBACK LRESULT CALLBACK
@ -29,7 +29,7 @@ WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
} }
static void * static void *
CreateWindowWin32(int w, int h) CreateWindowNative(int w, int h)
{ {
HWND hwnd; HWND hwnd;
WNDCLASS wc; WNDCLASS wc;
@ -67,7 +67,7 @@ CreateWindowWin32(int w, int h)
} }
static void static void
DestroyWindowWin32(void *window) DestroyWindowNative(void *window)
{ {
DestroyWindow((HWND) window); DestroyWindow((HWND) window);
} }