Skip to content

L
libSDL
Commit 20b4d9f7 authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

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
parent 72cdb910
Show whitespace changes
Inline Side-by-side
Showing with 310 additions and 40 deletions
VisualC/SDL/SDL_VS2005.vcproj
View file @ 20b4d9f7
...@@ -29,7 +29,7 @@ ...@@ -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="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;" CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;xcopy /d /q /y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -207,7 +207,7 @@ ...@@ -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="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;" CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;xcopy /d /q /y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -398,6 +398,10 @@ ...@@ -398,6 +398,10 @@
RelativePath="..\..\include\SDL_audio.h" RelativePath="..\..\include\SDL_audio.h"
> >
</File> </File>
<File
RelativePath="..\..\include\SDL_blendmode.h"
>
</File>
<File <File
RelativePath="..\..\include\SDL_clipboard.h" RelativePath="..\..\include\SDL_clipboard.h"
> >
...@@ -434,10 +438,22 @@ ...@@ -434,10 +438,22 @@
RelativePath="..\..\include\SDL_events.h" RelativePath="..\..\include\SDL_events.h"
> >
</File> </File>
<File
RelativePath="..\..\include\SDL_gesture.h"
>
</File>
<File <File
RelativePath="..\..\include\SDL_haptic.h" RelativePath="..\..\include\SDL_haptic.h"
> >
</File> </File>
<File
RelativePath="..\..\include\SDL_hints.h"
>
</File>
<File
RelativePath="..\..\include\SDL_input.h"
>
</File>
<File <File
RelativePath="..\..\include\SDL_joystick.h" RelativePath="..\..\include\SDL_joystick.h"
> >
...@@ -454,6 +470,10 @@ ...@@ -454,6 +470,10 @@
RelativePath="..\..\include\SDL_loadso.h" RelativePath="..\..\include\SDL_loadso.h"
> >
</File> </File>
<File
RelativePath="..\..\include\SDL_log.h"
>
</File>
<File <File
RelativePath="..\..\include\SDL_main.h" RelativePath="..\..\include\SDL_main.h"
> >
...@@ -498,6 +518,10 @@ ...@@ -498,6 +518,10 @@
RelativePath="..\..\include\SDL_rect.h" RelativePath="..\..\include\SDL_rect.h"
> >
</File> </File>
<File
RelativePath="..\..\include\SDL_render.h"
>
</File>
<File <File
RelativePath="..\..\include\SDL_revision.h" RelativePath="..\..\include\SDL_revision.h"
> >
...@@ -530,6 +554,10 @@ ...@@ -530,6 +554,10 @@
RelativePath="..\..\include\SDL_timer.h" RelativePath="..\..\include\SDL_timer.h"
> >
</File> </File>
<File
RelativePath="..\..\include\SDL_touch.h"
>
</File>
<File <File
RelativePath="..\..\include\SDL_types.h" RelativePath="..\..\include\SDL_types.h"
> >
...@@ -596,7 +624,7 @@ ...@@ -596,7 +624,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\mmx.h" RelativePath="..\..\src\render\mmx.h.h"
> >
</File> </File>
<File <File
...@@ -631,10 +659,6 @@ ...@@ -631,10 +659,6 @@
RelativePath="..\..\src\SDL.c" RelativePath="..\..\src\SDL.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\SDL_alphamult.c"
>
</File>
<File <File
RelativePath="..\..\src\video\SDL_alphamult.h" RelativePath="..\..\src\video\SDL_alphamult.h"
> >
...@@ -676,19 +700,27 @@ ...@@ -676,19 +700,27 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blendfillrect.c" RelativePath="..\..\src\render\software\SDL_blendfillrect.c"
>
</File>
<File
RelativePath="..\..\src\render\software\SDL_blendfillrect.h"
>
</File>
<File
RelativePath="..\..\src\render\software\SDL_blendline.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blendline.c" RelativePath="..\..\src\render\software\SDL_blendline.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blendpoint.c" RelativePath="..\..\src\render\software\SDL_blendpoint.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blendrect.c" RelativePath="..\..\src\render\software\SDL_blendpoint.h"
> >
</File> </File>
<File <File
...@@ -763,14 +795,6 @@ ...@@ -763,14 +795,6 @@
RelativePath="..\..\src\cpuinfo\SDL_cpuinfo.c" RelativePath="..\..\src\cpuinfo\SDL_cpuinfo.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\windows\SDL_d3drender.c"
>
</File>
<File
RelativePath="..\..\src\video\windows\SDL_d3drender.h"
>
</File>
<File <File
RelativePath="..\..\src\audio\windib\SDL_dibaudio.c" RelativePath="..\..\src\audio\windib\SDL_dibaudio.c"
> >
...@@ -788,19 +812,23 @@ ...@@ -788,19 +812,23 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_draw.h" RelativePath="..\..\src\render\software\SDL_draw.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_drawline.c" RelativePath="..\..\src\render\software\SDL_drawline.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_drawpoint.c" RelativePath="..\..\src\render\software\SDL_drawline.h"
> >
</File> </File>
<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>
<File <File
...@@ -851,10 +879,6 @@ ...@@ -851,10 +879,6 @@
RelativePath="..\..\src\video\SDL_fillrect.c" RelativePath="..\..\src\video\SDL_fillrect.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\SDL_gamma.c"
>
</File>
<File <File
RelativePath="..\..\src\events\SDL_gesture.c" RelativePath="..\..\src\events\SDL_gesture.c"
> >
...@@ -879,6 +903,10 @@ ...@@ -879,6 +903,10 @@
RelativePath="..\..\src\haptic\SDL_haptic.c" RelativePath="..\..\src\haptic\SDL_haptic.c"
> >
</File> </File>
<File
RelativePath="..\..\src\SDL_hints.c"
>
</File>
<File <File
RelativePath="..\..\src\stdlib\SDL_iconv.c" RelativePath="..\..\src\stdlib\SDL_iconv.c"
> >
...@@ -899,6 +927,10 @@ ...@@ -899,6 +927,10 @@
RelativePath="..\..\src\events\SDL_keyboard_c.h" RelativePath="..\..\src\events\SDL_keyboard_c.h"
> >
</File> </File>
<File
RelativePath="..\..\src\SDL_log.c"
>
</File>
<File <File
RelativePath="..\..\src\stdlib\SDL_malloc.c" RelativePath="..\..\src\stdlib\SDL_malloc.c"
> >
...@@ -952,11 +984,11 @@ ...@@ -952,11 +984,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\dummy\SDL_nullrender.c" RelativePath="..\..\src\video\dummy\SDL_nullframebuffer.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\dummy\SDL_nullrender_c.h" RelativePath="..\..\src\video\dummy\SDL_nullframebuffer_c.h"
> >
</File> </File>
<File <File
...@@ -996,19 +1028,23 @@ ...@@ -996,19 +1028,23 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_renderer_gl.c" RelativePath="..\..\src\render\SDL_render.c"
>
</File>
<File
RelativePath="..\..\src\render\direct3d\SDL_render_d3d.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_renderer_gl.h" RelativePath="..\..\src\render\opengl\SDL_render_gl.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_renderer_sw.c" RelativePath="..\..\src\render\software\SDL_render_sw.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_renderer_sw.h" RelativePath="..\..\src\render\software\SDL_render_sw_c.h"
> >
</File> </File>
<File <File
...@@ -1023,6 +1059,14 @@ ...@@ -1023,6 +1059,14 @@
RelativePath="..\..\src\file\SDL_rwops.c" RelativePath="..\..\src\file\SDL_rwops.c"
> >
</File> </File>
<File
RelativePath="..\..\src\render\opengl\SDL_shaders_gl.c"
>
</File>
<File
RelativePath="..\..\src\render\opengl\SDL_shaders_gl.h"
>
</File>
<File <File
RelativePath="..\..\src\video\SDL_shape.c" RelativePath="..\..\src\video\SDL_shape.c"
> >
...@@ -1083,6 +1127,10 @@ ...@@ -1083,6 +1127,10 @@
RelativePath="..\..\src\power\windows\SDL_syspower.c" RelativePath="..\..\src\power\windows\SDL_syspower.c"
> >
</File> </File>
<File
RelativePath="..\..\src\render\SDL_sysrender.h"
>
</File>
<File <File
RelativePath="..\..\src\thread\windows\SDL_syssem.c" RelativePath="..\..\src\thread\windows\SDL_syssem.c"
> >
...@@ -1184,11 +1232,11 @@ ...@@ -1184,11 +1232,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\windows\SDL_windowsgamma.c" RelativePath="..\..\src\video\windows\SDL_windowsframebuffer.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\windows\SDL_windowsgamma.h" RelativePath="..\..\src\video\windows\SDL_windowsframebuffer.h"
> >
</File> </File>
<File <File
...@@ -1248,15 +1296,15 @@ ...@@ -1248,15 +1296,15 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_yuv_mmx.c" RelativePath="..\..\src\render\SDL_yuv_mmx.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_yuv_sw.c" RelativePath="..\..\src\render\SDL_yuv_sw.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_yuv_sw_c.h" RelativePath="..\..\src\render\SDL_yuv_sw_c.h"
> >
</File> </File>
<File <File
......
VisualC/tests/testscale/testscale_VS2005.vcproj 0 → 100644
View file @ 20b4d9f7
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="testscale"
ProjectGUID="{845BAD86-9FBE-4052-ADEE-CE84EA3978D0}"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Debug/testscale.tlb"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\include"
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Debug/testscale.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
OutputFile=".\Debug/testscale.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/testscale.pdb"
SubSystem="2"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Release/testscale.tlb"
/>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\include"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release/testscale.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
OutputFile=".\Release/testscale.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\Release/testscale.pdb"
SubSystem="2"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath="..\..\..\test\common.c"
>
</File>
<File
RelativePath="..\..\Sdl\Debug\SDL.lib"
>
</File>
<File
RelativePath="..\..\SDLmain\Debug\SDLmain.lib"
>
</File>
<File
RelativePath="..\..\..\Test\testscale.c"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
src/video/SDL_pixels.c
View file @ 20b4d9f7
...@@ -549,6 +549,8 @@ SDL_SetPixelFormatPalette(SDL_PixelFormat * format, SDL_Palette *palette) ...@@ -549,6 +549,8 @@ SDL_SetPixelFormatPalette(SDL_PixelFormat * format, SDL_Palette *palette)
if (format->palette) { if (format->palette) {
++format->palette->refcount; ++format->palette->refcount;
} }
return 0;
} }
int int
......
test/testscale.c
View file @ 20b4d9f7
...@@ -83,7 +83,6 @@ void ...@@ -83,7 +83,6 @@ void
Draw(DrawState *s) Draw(DrawState *s)
{ {
int w, h; int w, h;
SDL_Rect rect;
SDL_GetWindowSize(s->window, &w, &h); SDL_GetWindowSize(s->window, &w, &h);
...@@ -177,7 +176,7 @@ main(int argc, char *argv[]) ...@@ -177,7 +176,7 @@ main(int argc, char *argv[])
printf("%2.2f frames per second\n", fps); printf("%2.2f frames per second\n", fps);
} }
SDL_stack_free(drawstate); SDL_stack_free(drawstates);
quit(0); quit(0);
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment