Patch from Ken Rogoway:
Migrate all of the recent changes into the SDL VS2005 project file. Fix missing return value in SDL_pixels.c Fix compile error in testscale.c, variable was incorrectly named. Added VS2005 project file for testscale
This commit is contained in:
Sam Lantinga
parent
72cdb910fb
commit
20b4d9f762
4 changed files with 310 additions and 40 deletions
|
|
@ -29,7 +29,7 @@
|
|||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
Description="Making sure basic SDL headers are in place..."
|
||||
CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...
copy /Y "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"

if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
echo Creating stub SDL_revision.h file...
echo #define SDL_REVISION "hg-0:baadf00d" >"$(ProjectDir)\..\..\include\SDL_revision.h"
:SDLREVISIONOKAY
"
|
||||
CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...
xcopy /d /q /y "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"

if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
echo Creating stub SDL_revision.h file...
echo #define SDL_REVISION "hg-0:baadf00d" >"$(ProjectDir)\..\..\include\SDL_revision.h"
:SDLREVISIONOKAY
"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
|
|
@ -207,7 +207,7 @@
|
|||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
Description="Making sure basic SDL headers are in place..."
|
||||
CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...
copy /Y "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"

if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
echo Creating stub SDL_revision.h file...
echo #define SDL_REVISION "hg-0:baadf00d" >"$(ProjectDir)\..\..\include\SDL_revision.h"
:SDLREVISIONOKAY
"
|
||||
CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...
xcopy /d /q /y "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"

if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
echo Creating stub SDL_revision.h file...
echo #define SDL_REVISION "hg-0:baadf00d" >"$(ProjectDir)\..\..\include\SDL_revision.h"
:SDLREVISIONOKAY
"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
|
|
@ -398,6 +398,10 @@
|
|||
RelativePath="..\..\include\SDL_audio.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_blendmode.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_clipboard.h"
|
||||
>
|
||||
|
|
@ -434,10 +438,22 @@
|
|||
RelativePath="..\..\include\SDL_events.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_gesture.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_haptic.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_hints.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_input.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_joystick.h"
|
||||
>
|
||||
|
|
@ -454,6 +470,10 @@
|
|||
RelativePath="..\..\include\SDL_loadso.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_log.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_main.h"
|
||||
>
|
||||
|
|
@ -498,6 +518,10 @@
|
|||
RelativePath="..\..\include\SDL_rect.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_render.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_revision.h"
|
||||
>
|
||||
|
|
@ -530,6 +554,10 @@
|
|||
RelativePath="..\..\include\SDL_timer.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_touch.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\SDL_types.h"
|
||||
>
|
||||
|
|
@ -596,7 +624,7 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\mmx.h"
|
||||
RelativePath="..\..\src\render\mmx.h.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
@ -631,10 +659,6 @@
|
|||
RelativePath="..\..\src\SDL.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_alphamult.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_alphamult.h"
|
||||
>
|
||||
|
|
@ -676,19 +700,27 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_blendfillrect.c"
|
||||
RelativePath="..\..\src\render\software\SDL_blendfillrect.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_blendline.c"
|
||||
RelativePath="..\..\src\render\software\SDL_blendfillrect.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_blendpoint.c"
|
||||
RelativePath="..\..\src\render\software\SDL_blendline.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_blendrect.c"
|
||||
RelativePath="..\..\src\render\software\SDL_blendline.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\render\software\SDL_blendpoint.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\render\software\SDL_blendpoint.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
@ -763,14 +795,6 @@
|
|||
RelativePath="..\..\src\cpuinfo\SDL_cpuinfo.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\windows\SDL_d3drender.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\windows\SDL_d3drender.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\audio\windib\SDL_dibaudio.c"
|
||||
>
|
||||
|
|
@ -788,19 +812,23 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_draw.h"
|
||||
RelativePath="..\..\src\render\software\SDL_draw.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_drawline.c"
|
||||
RelativePath="..\..\src\render\software\SDL_drawline.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_drawpoint.c"
|
||||
RelativePath="..\..\src\render\software\SDL_drawline.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_drawrect.c"
|
||||
RelativePath="..\..\src\render\software\SDL_drawpoint.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\render\software\SDL_drawpoint.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
@ -851,10 +879,6 @@
|
|||
RelativePath="..\..\src\video\SDL_fillrect.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_gamma.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\events\SDL_gesture.c"
|
||||
>
|
||||
|
|
@ -879,6 +903,10 @@
|
|||
RelativePath="..\..\src\haptic\SDL_haptic.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SDL_hints.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\stdlib\SDL_iconv.c"
|
||||
>
|
||||
|
|
@ -899,6 +927,10 @@
|
|||
RelativePath="..\..\src\events\SDL_keyboard_c.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\SDL_log.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\stdlib\SDL_malloc.c"
|
||||
>
|
||||
|
|
@ -952,11 +984,11 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\dummy\SDL_nullrender.c"
|
||||
RelativePath="..\..\src\video\dummy\SDL_nullframebuffer.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\dummy\SDL_nullrender_c.h"
|
||||
RelativePath="..\..\src\video\dummy\SDL_nullframebuffer_c.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
@ -996,19 +1028,23 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_renderer_gl.c"
|
||||
RelativePath="..\..\src\render\SDL_render.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_renderer_gl.h"
|
||||
RelativePath="..\..\src\render\direct3d\SDL_render_d3d.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_renderer_sw.c"
|
||||
RelativePath="..\..\src\render\opengl\SDL_render_gl.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_renderer_sw.h"
|
||||
RelativePath="..\..\src\render\software\SDL_render_sw.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\render\software\SDL_render_sw_c.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
@ -1023,6 +1059,14 @@
|
|||
RelativePath="..\..\src\file\SDL_rwops.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\render\opengl\SDL_shaders_gl.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\render\opengl\SDL_shaders_gl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_shape.c"
|
||||
>
|
||||
|
|
@ -1083,6 +1127,10 @@
|
|||
RelativePath="..\..\src\power\windows\SDL_syspower.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\render\SDL_sysrender.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\thread\windows\SDL_syssem.c"
|
||||
>
|
||||
|
|
@ -1184,11 +1232,11 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\windows\SDL_windowsgamma.c"
|
||||
RelativePath="..\..\src\video\windows\SDL_windowsframebuffer.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\windows\SDL_windowsgamma.h"
|
||||
RelativePath="..\..\src\video\windows\SDL_windowsframebuffer.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
@ -1248,15 +1296,15 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_yuv_mmx.c"
|
||||
RelativePath="..\..\src\render\SDL_yuv_mmx.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_yuv_sw.c"
|
||||
RelativePath="..\..\src\render\SDL_yuv_sw.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\video\SDL_yuv_sw_c.h"
|
||||
RelativePath="..\..\src\render\SDL_yuv_sw_c.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue