Skip to content

L
libSDL
Commit 10b8372b authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Fixed compiling on Windows Mobile SDK 5.0 with Visual Studio 2008

parent b33881a4
Hide whitespace changes
Inline Side-by-side
Showing with 1146 additions and 3446 deletions
VisualCE/SDL.sln
View file @ 10b8372b
 
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2005 # Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcproj", "{C598024D-8030-4F9C-AB76-69BF4CA0645F}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcproj", "{C598024D-8030-4F9C-AB76-69BF4CA0645F}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcproj", "{5AC88B84-5EAA-4C1E-948D-332DA34227F6}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcproj", "{5AC88B84-5EAA-4C1E-948D-332DA34227F6}"
......
VisualCE/SDL/SDL.vcproj
View file @ 10b8372b
<?xml version="1.0" encoding="windows-1251"?> <?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="9.00"
Name="SDL" Name="SDL"
ProjectGUID="{C598024D-8030-4F9C-AB76-69BF4CA0645F}" ProjectGUID="{C598024D-8030-4F9C-AB76-69BF4CA0645F}"
RootNamespace="SDL" RootNamespace="SDL"
TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
...@@ -93,6 +94,8 @@ ...@@ -93,6 +94,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="_DllMainCRTStartup" EntryPointSymbol="_DllMainCRTStartup"
BaseAddress="0x00100000" BaseAddress="0x00100000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib" ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
/> />
<Tool <Tool
...@@ -106,6 +109,9 @@ ...@@ -106,6 +109,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -195,6 +201,8 @@ ...@@ -195,6 +201,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="_DllMainCRTStartup" EntryPointSymbol="_DllMainCRTStartup"
BaseAddress="0x00100000" BaseAddress="0x00100000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib" ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
/> />
<Tool <Tool
...@@ -208,6 +216,9 @@ ...@@ -208,6 +216,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -296,6 +307,8 @@ ...@@ -296,6 +307,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="_DllMainCRTStartup" EntryPointSymbol="_DllMainCRTStartup"
BaseAddress="0x00100000" BaseAddress="0x00100000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib" ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
/> />
<Tool <Tool
...@@ -309,6 +322,9 @@ ...@@ -309,6 +322,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -396,6 +412,8 @@ ...@@ -396,6 +412,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="_DllMainCRTStartup" EntryPointSymbol="_DllMainCRTStartup"
BaseAddress="0x00100000" BaseAddress="0x00100000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib" ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
/> />
<Tool <Tool
...@@ -409,6 +427,9 @@ ...@@ -409,6 +427,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -500,6 +521,8 @@ ...@@ -500,6 +521,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="_DllMainCRTStartup" EntryPointSymbol="_DllMainCRTStartup"
BaseAddress="0x00100000" BaseAddress="0x00100000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib" ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
/> />
<Tool <Tool
...@@ -513,6 +536,9 @@ ...@@ -513,6 +536,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -606,6 +632,8 @@ ...@@ -606,6 +632,8 @@
LinkTimeCodeGeneration="1" LinkTimeCodeGeneration="1"
EntryPointSymbol="_DllMainCRTStartup" EntryPointSymbol="_DllMainCRTStartup"
BaseAddress="0x00100000" BaseAddress="0x00100000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib" ImportLibrary="$(PlatformName)\$(ConfigurationName)/SDL.lib"
/> />
<Tool <Tool
...@@ -619,6 +647,9 @@ ...@@ -619,6 +647,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/SDL.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -642,938 +673,194 @@ ...@@ -642,938 +673,194 @@
Name="Source Files" Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
> >
<File
RelativePath="..\..\src\libm\e_atan2.c"
>
</File>
<File
RelativePath="..\..\src\libm\e_log.c"
>
</File>
<File
RelativePath="..\..\src\libm\e_pow.c"
>
</File>
<File
RelativePath="..\..\src\libm\e_rem_pio2.c"
>
</File>
<File
RelativePath="..\..\src\libm\e_sqrt.c"
>
</File>
<File
RelativePath="..\..\src\libm\k_cos.c"
>
</File>
<File
RelativePath="..\..\src\libm\k_rem_pio2.c"
>
</File>
<File
RelativePath="..\..\src\libm\k_sin.c"
>
</File>
<File
RelativePath="..\..\src\libm\s_atan.c"
>
</File>
<File
RelativePath="..\..\src\libm\s_copysign.c"
>
</File>
<File
RelativePath="..\..\src\libm\s_cos.c"
>
</File>
<File
RelativePath="..\..\src\libm\s_fabs.c"
>
</File>
<File
RelativePath="..\..\src\libm\s_floor.c"
>
</File>
<File
RelativePath="..\..\src\libm\s_scalbn.c"
>
</File>
<File
RelativePath="..\..\src\libm\s_sin.c"
>
</File>
<File <File
RelativePath="..\..\src\SDL.c" RelativePath="..\..\src\SDL.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\video\SDL_alphamult.c"
<Tool >
Name="VCCLCompilerTool" </File>
AdditionalIncludeDirectories="" <File
UsePrecompiledHeader="0" RelativePath="..\..\src\SDL_assert.c"
/> >
</FileConfiguration> </File>
<FileConfiguration <File
Name="Debug|Pocket PC 2003 (ARMV4)" RelativePath="..\..\src\atomic\SDL_atomic.c"
> >
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\events\SDL_active.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\audio\SDL_audio.c" RelativePath="..\..\src\audio\SDL_audio.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\audio\SDL_audiocvt.c" RelativePath="..\..\src\audio\SDL_audiocvt.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\audio\SDL_audiodev.c" RelativePath="..\..\src\audio\SDL_audiodev.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\audio\SDL_audiotypecvt.c"
<Tool >
Name="VCCLCompilerTool" </File>
AdditionalIncludeDirectories="" <File
UsePrecompiledHeader="0" RelativePath="..\..\src\video\SDL_blendfillrect.c"
/> >
</FileConfiguration> </File>
<FileConfiguration <File
Name="Debug|Pocket PC 2003 (ARMV4)" RelativePath="..\..\src\video\SDL_blendline.c"
> >
<Tool </File>
Name="VCCLCompilerTool" <File
AdditionalIncludeDirectories="" RelativePath="..\..\src\video\SDL_blendpoint.c"
UsePrecompiledHeader="0" >
/> </File>
</FileConfiguration> <File
<FileConfiguration RelativePath="..\..\src\video\SDL_blendrect.c"
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" >
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blit.c" RelativePath="..\..\src\video\SDL_blit.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blit_0.c" RelativePath="..\..\src\video\SDL_blit_0.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blit_1.c" RelativePath="..\..\src\video\SDL_blit_1.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blit_A.c" RelativePath="..\..\src\video\SDL_blit_A.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\video\SDL_blit_auto.c"
<Tool >
Name="VCCLCompilerTool" </File>
AdditionalIncludeDirectories="" <File
UsePrecompiledHeader="0" RelativePath="..\..\src\video\SDL_blit_copy.c"
/> >
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blit_N.c" RelativePath="..\..\src\video\SDL_blit_N.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\video\SDL_blit_slow.c"
<Tool >
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_bmp.c" RelativePath="..\..\src\video\SDL_bmp.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\video\windows\SDL_ceddrawrender.c"
<Tool >
Name="VCCLCompilerTool" </File>
AdditionalIncludeDirectories="" <File
UsePrecompiledHeader="0" RelativePath="..\..\src\video\SDL_clipboard.c"
/> >
</FileConfiguration> </File>
<FileConfiguration <File
Name="Debug|Pocket PC 2003 (ARMV4)" RelativePath="..\..\src\events\SDL_clipboardevents.c"
> >
<Tool </File>
Name="VCCLCompilerTool" <File
AdditionalIncludeDirectories="" RelativePath="..\..\src\SDL_compat.c"
UsePrecompiledHeader="0" >
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\cpuinfo\SDL_cpuinfo.c" RelativePath="..\..\src\cpuinfo\SDL_cpuinfo.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\video\windows\SDL_d3drender.c"
<Tool >
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\video\SDL_cursor.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\audio\windib\SDL_dibaudio.c" RelativePath="..\..\src\audio\windib\SDL_dibaudio.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\video\windib\SDL_dibevents.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\video\windib\SDL_dibvideo.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\audio\disk\SDL_diskaudio.c" RelativePath="..\..\src\audio\disk\SDL_diskaudio.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\SDL_drawline.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_drawpoint.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_drawrect.c"
>
</File>
<File <File
RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.c" RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.c"
> >
...@@ -1581,355 +868,43 @@ ...@@ -1581,355 +868,43 @@
<File <File
RelativePath="..\..\src\SDL_error.c" RelativePath="..\..\src\SDL_error.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\events\SDL_events.c" RelativePath="..\..\src\events\SDL_events.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\events\SDL_expose.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\SDL_fatal.c" RelativePath="..\..\src\SDL_fatal.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\video\SDL_fillrect.c"
<Tool >
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_gamma.c" RelativePath="..\..\src\video\SDL_gamma.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\video\windows\SDL_gapirender.c"
<Tool >
Name="VCCLCompilerTool" </File>
AdditionalIncludeDirectories="" <File
UsePrecompiledHeader="0" RelativePath="..\..\src\video\windows\SDL_gdirender.c"
/> >
</FileConfiguration> </File>
<FileConfiguration <File
Name="Debug|Pocket PC 2003 (ARMV4)" RelativePath="..\..\src\events\SDL_gesture.c"
> >
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\video\gapi\sdl_gapivideo.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\stdlib\SDL_getenv.c" RelativePath="..\..\src\stdlib\SDL_getenv.c"
> >
</File> </File>
<File
RelativePath="..\..\src\haptic\SDL_haptic.c"
>
</File>
<File <File
RelativePath="..\..\src\stdlib\SDL_iconv.c" RelativePath="..\..\src\stdlib\SDL_iconv.c"
> >
...@@ -1941,60 +916,6 @@ ...@@ -1941,60 +916,6 @@
<File <File
RelativePath="..\..\src\events\SDL_keyboard.c" RelativePath="..\..\src\events\SDL_keyboard.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\stdlib\SDL_malloc.c" RelativePath="..\..\src\stdlib\SDL_malloc.c"
...@@ -2003,183 +924,17 @@ ...@@ -2003,183 +924,17 @@
<File <File
RelativePath="..\..\src\audio\SDL_mixer.c" RelativePath="..\..\src\audio\SDL_mixer.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\events\SDL_mouse.c" RelativePath="..\..\src\events\SDL_mouse.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\dummy\SDL_nullevents.c" RelativePath="..\..\src\video\dummy\SDL_nullevents.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\dummy\SDL_nullmouse.c" RelativePath="..\..\src\video\dummy\SDL_nullrender.c"
> >
</File> </File>
<File <File
...@@ -2189,60 +944,10 @@ ...@@ -2189,60 +944,10 @@
<File <File
RelativePath="..\..\src\video\SDL_pixels.c" RelativePath="..\..\src\video\SDL_pixels.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\power\SDL_power.c"
<Tool >
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\stdlib\SDL_qsort.c" RelativePath="..\..\src\stdlib\SDL_qsort.c"
...@@ -2251,292 +956,38 @@ ...@@ -2251,292 +956,38 @@
<File <File
RelativePath="..\..\src\events\SDL_quit.c" RelativePath="..\..\src\events\SDL_quit.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\video\SDL_rect.c"
<Tool >
Name="VCCLCompilerTool" </File>
AdditionalIncludeDirectories="" <File
UsePrecompiledHeader="0" RelativePath="..\..\src\video\SDL_renderer_sw.c"
/> >
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\events\SDL_resize.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_RLEaccel.c" RelativePath="..\..\src\video\SDL_RLEaccel.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\file\SDL_rwops.c" RelativePath="..\..\src\file\SDL_rwops.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\video\SDL_shape.c"
<Tool >
Name="VCCLCompilerTool" </File>
AdditionalIncludeDirectories="" <File
UsePrecompiledHeader="0" RelativePath="..\..\src\atomic\SDL_spinlock.c"
/> >
</FileConfiguration> </File>
<FileConfiguration <File
Name="Debug|Pocket PC 2003 (ARMV4)" RelativePath="..\..\src\stdlib\SDL_stdlib.c"
> >
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_stretch.c" RelativePath="..\..\src\video\SDL_stretch.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\stdlib\SDL_string.c" RelativePath="..\..\src\stdlib\SDL_string.c"
...@@ -2545,1244 +996,314 @@ ...@@ -2545,1244 +996,314 @@
<File <File
RelativePath="..\..\src\video\SDL_surface.c" RelativePath="..\..\src\video\SDL_surface.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\haptic\dummy\SDL_syshaptic.c"
<Tool >
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\thread\generic\SDL_syscond.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\video\wincommon\SDL_sysevents.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\joystick\dummy\SDL_sysjoystick.c" RelativePath="..\..\src\joystick\dummy\SDL_sysjoystick.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\loadso\win32\SDL_sysloadso.c"
>
</File>
<File
RelativePath="..\..\src\video\wincommon\SDL_sysmouse.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\thread\win32\SDL_sysmutex.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\thread\win32\SDL_syssem.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\thread\win32\SDL_systhread.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\timer\wince\SDL_systimer.c" RelativePath="..\..\src\loadso\windows\SDL_sysloadso.c"
>
</File>
<File
RelativePath="..\..\src\thread\windows\SDL_sysmutex.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\wincommon\SDL_syswm.c" RelativePath="..\..\src\power\windows\SDL_syspower.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\thread\windows\SDL_syssem.c"
<Tool >
Name="VCCLCompilerTool" </File>
AdditionalIncludeDirectories="" <File
UsePrecompiledHeader="0" RelativePath="..\..\src\thread\windows\SDL_systhread.c"
/> >
</FileConfiguration> </File>
<FileConfiguration <File
Name="Debug|Pocket PC 2003 (ARMV4)" RelativePath="..\..\src\timer\wince\SDL_systimer.c"
> >
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\thread\SDL_thread.c" RelativePath="..\..\src\thread\SDL_thread.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\timer\SDL_timer.c" RelativePath="..\..\src\timer\SDL_timer.c"
> >
<FileConfiguration </File>
Name="Debug|Smartphone 2003 (ARMV4)" <File
> RelativePath="..\..\src\events\SDL_touch.c"
<Tool >
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_video.c" RelativePath="..\..\src\video\SDL_video.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\audio\SDL_wave.c" RelativePath="..\..\src\audio\SDL_wave.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\video\wincommon\SDL_wingl.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\src\video\SDL_yuv.c"
>
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_yuv_mmx.c" RelativePath="..\..\src\events\SDL_windowevents.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_yuv_sw.c" RelativePath="..\..\src\video\windows\SDL_windowsclipboard.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\win32\win_ce_semaphore.c" RelativePath="..\..\src\video\windows\SDL_windowsevents.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
<File <File
RelativePath="..\..\include\begin_code.h" RelativePath="..\..\src\video\windows\SDL_windowsgamma.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\blank_cursor.h" RelativePath="..\..\src\video\windows\SDL_windowskeyboard.c"
> >
</File> </File>
<File <File
RelativePath="..\..\include\close_code.h" RelativePath="..\..\src\video\windows\SDL_windowsmodes.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\default_cursor.h" RelativePath="..\..\src\video\windows\SDL_windowsmouse.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\hermes\HeadMMX.h" RelativePath="..\..\src\video\windows\SDL_windowsopengl.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\hermes\HeadX86.h" RelativePath="..\..\src\video\windows\SDL_windowsshape.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\mmx.h" RelativePath="..\..\src\video\windows\SDL_windowsvideo.c"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL.h" RelativePath="..\..\src\video\windows\SDL_windowswindow.c"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_active.h" RelativePath="..\..\src\video\SDL_yuv_mmx.c"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_audio.h" RelativePath="..\..\src\video\SDL_yuv_sw.c"
> >
</File> </File>
<File <File
RelativePath="..\..\src\audio\SDL_audio_c.h" RelativePath="..\..\src\thread\windows\win_ce_semaphore.c"
> >
</File> </File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
<File <File
RelativePath="..\..\src\audio\SDL_audiodev_c.h" RelativePath="..\..\src\events\blank_cursor.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\audio\SDL_audiomem.h" RelativePath="..\..\src\events\default_cursor.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_blit.h" RelativePath="..\..\src\libm\math.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_byteorder.h" RelativePath="..\..\src\libm\math_private.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_config.h" RelativePath="..\..\src\video\mmx.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_config_wince.h" RelativePath="..\..\src\events\scancodes_darwin.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_copying.h" RelativePath="..\..\src\events\scancodes_linux.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_cpuinfo.h" RelativePath="..\..\src\events\scancodes_windows.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_cursor_c.h" RelativePath="..\..\src\events\scancodes_xfree86.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\audio\windib\SDL_dibaudio.h" RelativePath="..\..\src\video\SDL_alphamult.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\windib\SDL_dibevents_c.h" RelativePath="..\..\src\SDL_assert_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\windib\SDL_dibvideo.h" RelativePath="..\..\src\audio\SDL_audio_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\audio\disk\SDL_diskaudio.h" RelativePath="..\..\src\audio\SDL_audiodev_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.h" RelativePath="..\..\src\audio\SDL_audiomem.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_endian.h" RelativePath="..\..\src\video\SDL_blit.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_error.h" RelativePath="..\..\src\video\SDL_blit_auto.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\SDL_error_c.h" RelativePath="..\..\src\video\SDL_blit_copy.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_events.h" RelativePath="..\..\src\video\SDL_blit_slow.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\events\SDL_events_c.h" RelativePath="..\..\src\video\windows\SDL_ceddrawrender.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\SDL_fatal.h" RelativePath="..\..\src\events\SDL_clipboardevents_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\gapi\sdl_gapivideo.h" RelativePath="..\..\src\video\windows\SDL_d3drender.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_getenv.h" RelativePath="..\..\src\audio\windib\SDL_dibaudio.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_glfuncs.h" RelativePath="..\..\src\audio\disk\SDL_diskaudio.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_joystick.h" RelativePath="..\..\src\video\SDL_draw.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\joystick\SDL_joystick_c.h" RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_keyboard.h" RelativePath="..\..\src\SDL_error_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_keysym.h" RelativePath="..\..\src\events\SDL_events_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_leaks.h" RelativePath="..\..\src\SDL_fatal.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_loadso.h" RelativePath="..\..\src\video\windows\SDL_gapirender.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\wincommon\SDL_lowvideo.h" RelativePath="..\..\src\video\windows\SDL_gapirender_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_main.h" RelativePath="..\..\src\video\windows\SDL_gdirender.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_memops.h" RelativePath="..\..\src\events\SDL_gesture_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\audio\SDL_mixer_MMX.h" RelativePath="..\..\src\video\SDL_glesfuncs.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\audio\SDL_mixer_MMX_VC.h" RelativePath="..\..\src\video\SDL_glfuncs.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_mouse.h" RelativePath="..\..\src\haptic\SDL_haptic_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_mutex.h" RelativePath="..\..\src\joystick\SDL_joystick_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_name.h" RelativePath="..\..\src\events\SDL_keyboard_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\dummy\SDL_nullevents_c.h" RelativePath="..\..\src\video\SDL_leaks.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\dummy\SDL_nullmouse_c.h" RelativePath="..\..\src\events\SDL_mouse_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\dummy\SDL_nullvideo.h" RelativePath="..\..\src\video\windows\SDL_msctf.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_opengl.h" RelativePath="..\..\src\video\dummy\SDL_nullevents_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_pixels_c.h" RelativePath="..\..\src\video\dummy\SDL_nullrender_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_platform.h" RelativePath="..\..\src\video\dummy\SDL_nullvideo.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_quit.h" RelativePath="..\..\src\video\SDL_pixels_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_RLEaccel_c.h" RelativePath="..\..\src\video\SDL_rect_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_rwops.h" RelativePath="..\..\src\video\SDL_renderer_sw.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_stretch_c.h" RelativePath="..\..\src\video\SDL_RLEaccel_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\audio\SDL_sysaudio.h" RelativePath="..\..\src\video\SDL_shape_internals.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\generic\SDL_syscond_c.h" RelativePath="..\..\src\audio\SDL_sysaudio.h"
> >
</File> </File>
<File <File
...@@ -3790,103 +1311,103 @@ ...@@ -3790,103 +1311,103 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\joystick\SDL_sysjoystick.h" RelativePath="..\..\src\haptic\SDL_syshaptic.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\wincommon\SDL_sysmouse_c.h" RelativePath="..\..\src\joystick\SDL_sysjoystick.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\generic\SDL_sysmutex_c.h" RelativePath="..\..\src\thread\SDL_systhread.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\generic\SDL_syssem_c.h" RelativePath="..\..\src\thread\windows\SDL_systhread_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\SDL_systhread.h" RelativePath="..\..\src\timer\SDL_systimer.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\generic\SDL_systhread_c.h" RelativePath="..\..\src\video\SDL_sysvideo.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\win32\SDL_systhread_c.h" RelativePath="..\..\src\thread\SDL_thread_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\timer\SDL_systimer.h" RelativePath="..\..\src\timer\SDL_timer_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_sysvideo.h" RelativePath="..\..\src\events\SDL_touch_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_syswm.h" RelativePath="..\..\src\video\windows\SDL_vkeys.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\wincommon\SDL_syswm_c.h" RelativePath="..\..\src\audio\SDL_wave.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_thread.h" RelativePath="..\..\src\events\SDL_windowevents_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\SDL_thread_c.h" RelativePath="..\..\src\video\windows\SDL_windowsclipboard.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_timer.h" RelativePath="..\..\src\video\windows\SDL_windowsevents.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\timer\SDL_timer_c.h" RelativePath="..\..\src\video\windows\SDL_windowsgamma.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_types.h" RelativePath="..\..\src\video\windows\SDL_windowskeyboard.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_version.h" RelativePath="..\..\src\video\windows\SDL_windowsmodes.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\SDL_video.h" RelativePath="..\..\src\video\windows\SDL_windowsmouse.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\windib\SDL_vkeys.h" RelativePath="..\..\src\video\windows\SDL_windowsopengl.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\audio\SDL_wave.h" RelativePath="..\..\src\video\windows\SDL_windowsshape.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\wincommon\SDL_wingl_c.h" RelativePath="..\..\src\video\windows\SDL_windowsvideo.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_yuv_sw_c.h" RelativePath="..\..\src\video\windows\SDL_windowswindow.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\SDL_yuvfuncs.h" RelativePath="..\..\src\video\SDL_yuv_sw_c.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\thread\win32\win_ce_semaphore.h" RelativePath="..\..\src\thread\windows\win_ce_semaphore.h"
> >
</File> </File>
<File <File
RelativePath="..\..\src\video\wincommon\wmmsg.h" RelativePath="..\..\src\video\windows\wmmsg.h"
> >
</File> </File>
</Filter> </Filter>
......
VisualCE/SDLMain/SDLmain.vcproj
View file @ 10b8372b
<?xml version="1.0" encoding="windows-1251"?> <?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="9.00"
Name="SDLmain" Name="SDLmain"
ProjectGUID="{5AC88B84-5EAA-4C1E-948D-332DA34227F6}" ProjectGUID="{5AC88B84-5EAA-4C1E-948D-332DA34227F6}"
RootNamespace="SDLmain" RootNamespace="SDLmain"
TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
...@@ -88,6 +89,9 @@ ...@@ -88,6 +89,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -171,6 +175,9 @@ ...@@ -171,6 +175,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -254,6 +261,9 @@ ...@@ -254,6 +261,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -337,6 +347,9 @@ ...@@ -337,6 +347,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -420,6 +433,9 @@ ...@@ -420,6 +433,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -506,6 +522,9 @@ ...@@ -506,6 +522,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -530,62 +549,8 @@ ...@@ -530,62 +549,8 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
> >
<File <File
RelativePath="..\..\src\main\win32\SDL_win32_main.c" RelativePath="..\..\src\main\windows\SDL_windows_main.c"
> >
<FileConfiguration
Name="Debug|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Smartphone 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
</Filter> </Filter>
<Filter <Filter
......
VisualCE/loopwave/loopwave.vcproj
View file @ 10b8372b
<?xml version="1.0" encoding="windows-1251"?> <?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="9.00"
Name="loopwave" Name="loopwave"
ProjectGUID="{6F642636-CB11-4DC7-855E-27FE1744003A}" ProjectGUID="{6F642636-CB11-4DC7-855E-27FE1744003A}"
RootNamespace="loopwave" RootNamespace="loopwave"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
...@@ -74,6 +75,8 @@ ...@@ -74,6 +75,8 @@
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/loopwave.pdb" ProgramDatabaseFile="$(OutDir)/loopwave.pdb"
SubSystem="0" SubSystem="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -84,6 +87,9 @@ ...@@ -84,6 +87,9 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -125,7 +131,7 @@ ...@@ -125,7 +131,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ExecutionBucket="7" ExecutionBucket="7"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\nclude" AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
MinimalRebuild="true" MinimalRebuild="true"
RuntimeLibrary="1" RuntimeLibrary="1"
...@@ -154,6 +160,8 @@ ...@@ -154,6 +160,8 @@
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/loopwave.pdb" ProgramDatabaseFile="$(OutDir)/loopwave.pdb"
SubSystem="0" SubSystem="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -164,6 +172,9 @@ ...@@ -164,6 +172,9 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -236,6 +247,8 @@ ...@@ -236,6 +247,8 @@
SubSystem="0" SubSystem="0"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -246,6 +259,9 @@ ...@@ -246,6 +259,9 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -317,6 +333,8 @@ ...@@ -317,6 +333,8 @@
SubSystem="0" SubSystem="0"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -327,6 +345,9 @@ ...@@ -327,6 +345,9 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
......
VisualCE/testalpha/testalpha.vcproj
View file @ 10b8372b
<?xml version="1.0" encoding="windows-1251"?> <?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="9.00"
Name="testalpha" Name="testalpha"
ProjectGUID="{DF401CB3-6F70-4485-996B-B7C357CF7EE7}" ProjectGUID="{DF401CB3-6F70-4485-996B-B7C357CF7EE7}"
RootNamespace="testalpha" RootNamespace="testalpha"
TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
...@@ -94,6 +95,8 @@ ...@@ -94,6 +95,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup" EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000" BaseAddress="0x00010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -106,6 +109,9 @@ ...@@ -106,6 +109,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -195,6 +201,8 @@ ...@@ -195,6 +201,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup" EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000" BaseAddress="0x00010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -207,6 +215,9 @@ ...@@ -207,6 +215,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -300,6 +311,8 @@ ...@@ -300,6 +311,8 @@
LinkTimeCodeGeneration="1" LinkTimeCodeGeneration="1"
EntryPointSymbol="WinMainCRTStartup" EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000" BaseAddress="0x00010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -312,6 +325,9 @@ ...@@ -312,6 +325,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -400,6 +416,8 @@ ...@@ -400,6 +416,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup" EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000" BaseAddress="0x00010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -412,6 +430,9 @@ ...@@ -412,6 +430,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -500,6 +521,8 @@ ...@@ -500,6 +521,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup" EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000" BaseAddress="0x00010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -512,6 +535,9 @@ ...@@ -512,6 +535,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -600,6 +626,8 @@ ...@@ -600,6 +626,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup" EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000" BaseAddress="0x00010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -612,6 +640,9 @@ ...@@ -612,6 +640,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
......
VisualCE/testtimer/testtimer.vcproj
View file @ 10b8372b
<?xml version="1.0" encoding="windows-1251"?> <?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="9.00"
Name="testtimer" Name="testtimer"
ProjectGUID="{D482D7EE-6FF0-4254-9027-C59F8F03AB1F}" ProjectGUID="{D482D7EE-6FF0-4254-9027-C59F8F03AB1F}"
RootNamespace="testtimer" RootNamespace="testtimer"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
...@@ -74,6 +75,8 @@ ...@@ -74,6 +75,8 @@
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/testtimer.pdb" ProgramDatabaseFile="$(OutDir)/testtimer.pdb"
SubSystem="0" SubSystem="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -84,6 +87,9 @@ ...@@ -84,6 +87,9 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -125,6 +131,7 @@ ...@@ -125,6 +131,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ExecutionBucket="7" ExecutionBucket="7"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
MinimalRebuild="true" MinimalRebuild="true"
RuntimeLibrary="1" RuntimeLibrary="1"
...@@ -153,6 +160,8 @@ ...@@ -153,6 +160,8 @@
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/testtimer.pdb" ProgramDatabaseFile="$(OutDir)/testtimer.pdb"
SubSystem="0" SubSystem="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -163,6 +172,9 @@ ...@@ -163,6 +172,9 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -235,6 +247,8 @@ ...@@ -235,6 +247,8 @@
SubSystem="0" SubSystem="0"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -245,6 +259,9 @@ ...@@ -245,6 +259,9 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -286,6 +303,7 @@ ...@@ -286,6 +303,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
ExecutionBucket="7" ExecutionBucket="7"
Optimization="2" Optimization="2"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -315,6 +333,8 @@ ...@@ -315,6 +333,8 @@
SubSystem="0" SubSystem="0"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -325,6 +345,9 @@ ...@@ -325,6 +345,9 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
......
VisualCE/testwin/testwin.vcproj
View file @ 10b8372b
<?xml version="1.0" encoding="windows-1251"?> <?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="9.00"
Name="testwin" Name="testwin"
ProjectGUID="{DC516978-88CB-4F9A-A39A-C351C258613B}" ProjectGUID="{DC516978-88CB-4F9A-A39A-C351C258613B}"
RootNamespace="testwin" RootNamespace="testwin"
TargetFrameworkVersion="131072"
> >
<Platforms> <Platforms>
<Platform <Platform
...@@ -93,6 +94,8 @@ ...@@ -93,6 +94,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup" EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000" BaseAddress="0x00010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -105,6 +108,9 @@ ...@@ -105,6 +108,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -194,6 +200,8 @@ ...@@ -194,6 +200,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup" EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000" BaseAddress="0x00010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -206,6 +214,9 @@ ...@@ -206,6 +214,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -295,6 +306,8 @@ ...@@ -295,6 +306,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup" EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000" BaseAddress="0x00010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -307,6 +320,9 @@ ...@@ -307,6 +320,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -395,6 +411,8 @@ ...@@ -395,6 +411,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup" EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000" BaseAddress="0x00010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -407,6 +425,9 @@ ...@@ -407,6 +425,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -495,6 +516,8 @@ ...@@ -495,6 +516,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup" EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000" BaseAddress="0x00010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -507,6 +530,9 @@ ...@@ -507,6 +530,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
...@@ -595,6 +621,8 @@ ...@@ -595,6 +621,8 @@
StackCommitSize="4096" StackCommitSize="4096"
EntryPointSymbol="WinMainCRTStartup" EntryPointSymbol="WinMainCRTStartup"
BaseAddress="0x00010000" BaseAddress="0x00010000"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -607,6 +635,9 @@ ...@@ -607,6 +635,9 @@
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc" OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
/> />
<Tool
Name="VCFxCopTool"
/>
<Tool <Tool
Name="VCCodeSignTool" Name="VCCodeSignTool"
/> />
......
include/SDL_assert.h
View file @ 10b8372b
...@@ -50,7 +50,7 @@ on the assertion line and not in some random guts of SDL, and so each ...@@ -50,7 +50,7 @@ on the assertion line and not in some random guts of SDL, and so each
assert can have unique static variables associated with it. assert can have unique static variables associated with it.
*/ */
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(_WIN32_WCE)
#include <intrin.h> #include <intrin.h>
#define SDL_TriggerBreakpoint() __debugbreak() #define SDL_TriggerBreakpoint() __debugbreak()
#elif (defined(__GNUC__) && ((__i386__) || (__x86_64__))) #elif (defined(__GNUC__) && ((__i386__) || (__x86_64__)))
......
include/SDL_atomic.h
View file @ 10b8372b
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
/* Need to do this here because intrin.h has C++ code in it */ /* Need to do this here because intrin.h has C++ code in it */
/* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */ /* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */
#if defined(_MSC_VER) && (_MSC_VER >= 1500) #if defined(_MSC_VER) && (_MSC_VER >= 1500) && !defined(_WIN32_WCE)
#include <intrin.h> #include <intrin.h>
#define HAVE_MSC_ATOMICS #define HAVE_MSC_ATOMICS
#endif #endif
......
include/SDL_compat.h
View file @ 10b8372b
...@@ -65,7 +65,7 @@ extern "C" { ...@@ -65,7 +65,7 @@ extern "C" {
/*@{*/ /*@{*/
/* Platform */ /* Platform */
#ifdef __WINDOWS__ #ifdef __WIN32__
#undef __WIN32__ #undef __WIN32__
#define __WIN32__ 1 #define __WIN32__ 1
#endif #endif
......
include/SDL_config_windows.h
View file @ 10b8372b
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
slouken@libsdl.org slouken@libsdl.org
*/ */
#ifndef _SDL_config_windows2_h #ifndef _SDL_config_windows_h
#define _SDL_config_windows2_h #define _SDL_config_windows_h
#include "SDL_platform.h" #include "SDL_platform.h"
...@@ -178,7 +178,11 @@ typedef unsigned int uintptr_t; ...@@ -178,7 +178,11 @@ typedef unsigned int uintptr_t;
#define SDL_VIDEO_DRIVER_DUMMY 1 #define SDL_VIDEO_DRIVER_DUMMY 1
#define SDL_VIDEO_DRIVER_WINDOWS 1 #define SDL_VIDEO_DRIVER_WINDOWS 1
#ifdef _WIN32_WCE
#define SDL_VIDEO_RENDER_GAPI 1
#else
#define SDL_VIDEO_RENDER_D3D 1 #define SDL_VIDEO_RENDER_D3D 1
#endif
#define SDL_VIDEO_RENDER_GDI 1 #define SDL_VIDEO_RENDER_GDI 1
/* Enable OpenGL support */ /* Enable OpenGL support */
...@@ -196,4 +200,4 @@ typedef unsigned int uintptr_t; ...@@ -196,4 +200,4 @@ typedef unsigned int uintptr_t;
#define SDL_ASSEMBLY_ROUTINES 1 #define SDL_ASSEMBLY_ROUTINES 1
#endif #endif
#endif /* _SDL_config_windows2_h */ #endif /* _SDL_config_windows_h */
include/SDL_main.h
View file @ 10b8372b
...@@ -31,7 +31,7 @@ ...@@ -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(__WINDOWS__) || \ #if defined(__WIN32__) || \
(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[]); ...@@ -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 __WINDOWS__ #ifdef __WIN32__
#include "begin_code.h" #include "begin_code.h"
#ifdef __cplusplus #ifdef __cplusplus
......
include/SDL_opengl.h
View file @ 10b8372b
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "SDL_config.h" #include "SDL_config.h"
#ifdef __WINDOWS__ #ifdef __WIN32__
#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() */
......
include/SDL_platform.h
View file @ 10b8372b
...@@ -125,8 +125,8 @@ ...@@ -125,8 +125,8 @@
#define __SOLARIS__ 1 #define __SOLARIS__ 1
#endif #endif
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
#undef __WINDOWS__ #undef __WIN32__
#define __WINDOWS__ 1 #define __WIN32__ 1
#endif #endif
#if defined(__NDS__) #if defined(__NDS__)
......
include/SDL_rwops.h
View file @ 10b8372b
...@@ -83,7 +83,7 @@ typedef struct SDL_RWops ...@@ -83,7 +83,7 @@ typedef struct SDL_RWops
Uint32 type; Uint32 type;
union union
{ {
#ifdef __WINDOWS__ #ifdef __WIN32__
struct struct
{ {
SDL_bool append; SDL_bool append;
......
include/SDL_thread.h
View file @ 10b8372b
...@@ -55,7 +55,7 @@ typedef unsigned long SDL_threadID; ...@@ -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(__WINDOWS__) && !defined(HAVE_LIBC) #if defined(__WIN32__) && !defined(HAVE_LIBC)
/** /**
* \file SDL_thread.h * \file SDL_thread.h
* *
......
include/begin_code.h
View file @ 10b8372b
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
# else # else
# define DECLSPEC __declspec(export) # define DECLSPEC __declspec(export)
# endif # endif
# elif defined(__WINDOWS__) # elif defined(__WIN32__)
# ifdef __BORLANDC__ # ifdef __BORLANDC__
# ifdef BUILD_SDL # ifdef BUILD_SDL
# define DECLSPEC # define DECLSPEC
...@@ -63,7 +63,7 @@ ...@@ -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(__WINDOWS__) && !defined(__GNUC__) #if defined(__WIN32__) && !defined(__GNUC__)
#define SDLCALL __cdecl #define SDLCALL __cdecl
#else #else
#define SDLCALL #define SDLCALL
......
src/SDL.c
View file @ 10b8372b
...@@ -39,7 +39,7 @@ extern void SDL_StartTicks(void); ...@@ -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(__WINDOWS__) #if defined(__WIN32__)
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) ...@@ -147,7 +147,7 @@ SDL_Init(Uint32 flags)
/* Clear the error message */ /* Clear the error message */
SDL_ClearError(); SDL_ClearError();
#if defined(__WINDOWS__) #if defined(__WIN32__)
if (SDL_HelperWindowCreate() < 0) { if (SDL_HelperWindowCreate() < 0) {
return -1; return -1;
} }
...@@ -220,7 +220,7 @@ SDL_Quit(void) ...@@ -220,7 +220,7 @@ SDL_Quit(void)
fflush(stdout); fflush(stdout);
#endif #endif
#if defined(__WINDOWS__) #if defined(__WIN32__)
SDL_HelperWindowDestroy(); SDL_HelperWindowDestroy();
#endif #endif
SDL_QuitSubSystem(SDL_INIT_EVERYTHING); SDL_QuitSubSystem(SDL_INIT_EVERYTHING);
...@@ -312,7 +312,7 @@ SDL_GetPlatform() ...@@ -312,7 +312,7 @@ SDL_GetPlatform()
return "RISC OS"; return "RISC OS";
#elif __SOLARIS__ #elif __SOLARIS__
return "Solaris"; return "Solaris";
#elif __WINDOWS__ #elif __WIN32__
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
return "Windows CE"; return "Windows CE";
#else #else
...@@ -325,7 +325,7 @@ SDL_GetPlatform() ...@@ -325,7 +325,7 @@ SDL_GetPlatform()
#endif #endif
} }
#if defined(__WINDOWS__) #if defined(__WIN32__)
#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, ...@@ -347,6 +347,6 @@ _DllMainCRTStartup(HANDLE hModule,
} }
#endif /* building DLL with Watcom C */ #endif /* building DLL with Watcom C */
#endif /* __WINDOWS__ */ #endif /* __WIN32__ */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */
src/SDL_assert.c
View file @ 10b8372b
...@@ -26,9 +26,19 @@ ...@@ -26,9 +26,19 @@
#include "SDL_assert_c.h" #include "SDL_assert_c.h"
#include "video/SDL_sysvideo.h" #include "video/SDL_sysvideo.h"
#ifdef __WINDOWS__ #ifdef __WIN32__
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#ifndef WS_OVERLAPPEDWINDOW
#define WS_OVERLAPPEDWINDOW 0
#endif
#ifdef UNICODE
#define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UCS-2", "UTF-8", (char *)S, SDL_strlen(S)+1)
#else
#define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)S, SDL_strlen(S)+1)
#endif
#else /* fprintf, _exit(), etc. */ #else /* fprintf, _exit(), etc. */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
...@@ -57,11 +67,12 @@ debug_print(const char *fmt, ...) __attribute__((format (printf, 1, 2))); ...@@ -57,11 +67,12 @@ debug_print(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
static void static void
debug_print(const char *fmt, ...) debug_print(const char *fmt, ...)
{ {
#ifdef __WINDOWS__ #ifdef __WIN32__
/* Format into a buffer for OutputDebugStringA(). */ /* Format into a buffer for OutputDebugStringA(). */
char buf[1024]; char buf[1024];
char *startptr; char *startptr;
char *ptr; char *ptr;
LPTSTR tstr;
int len; int len;
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
...@@ -78,15 +89,19 @@ debug_print(const char *fmt, ...) ...@@ -78,15 +89,19 @@ debug_print(const char *fmt, ...)
for (ptr = startptr; *ptr; ptr++) { for (ptr = startptr; *ptr; ptr++) {
if (*ptr == '\n') { if (*ptr == '\n') {
*ptr = '\0'; *ptr = '\0';
OutputDebugStringA(startptr); tstr = WIN_UTF8ToString(startptr);
OutputDebugStringA("\r\n"); OutputDebugString(tstr);
SDL_free(tstr);
OutputDebugString(TEXT("\r\n"));
startptr = ptr+1; startptr = ptr+1;
} }
} }
/* catch that last piece if it didn't have a newline... */ /* catch that last piece if it didn't have a newline... */
if (startptr != ptr) { if (startptr != ptr) {
OutputDebugStringA(startptr); tstr = WIN_UTF8ToString(startptr);
OutputDebugString(tstr);
SDL_free(tstr);
} }
#else #else
/* Unix has it easy. Just dump it to stderr. */ /* Unix has it easy. Just dump it to stderr. */
...@@ -99,7 +114,7 @@ debug_print(const char *fmt, ...) ...@@ -99,7 +114,7 @@ debug_print(const char *fmt, ...)
} }
#ifdef __WINDOWS__ #ifdef __WIN32__
static SDL_assert_state SDL_Windows_AssertChoice = SDL_ASSERTION_ABORT; static SDL_assert_state SDL_Windows_AssertChoice = SDL_ASSERTION_ABORT;
static const SDL_assert_data *SDL_Windows_AssertData = NULL; static const SDL_assert_data *SDL_Windows_AssertData = NULL;
...@@ -113,6 +128,7 @@ SDL_Assertion_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -113,6 +128,7 @@ SDL_Assertion_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
/* !!! FIXME: all this code stinks. */ /* !!! FIXME: all this code stinks. */
const SDL_assert_data *data = SDL_Windows_AssertData; const SDL_assert_data *data = SDL_Windows_AssertData;
char buf[1024]; char buf[1024];
LPTSTR tstr;
const int w = 100; const int w = 100;
const int h = 25; const int h = 25;
const int gap = 10; const int gap = 10;
...@@ -121,14 +137,14 @@ SDL_Assertion_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -121,14 +137,14 @@ SDL_Assertion_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
int len; int len;
int i; int i;
static const struct { static const struct {
const char *name; LPCTSTR name;
SDL_assert_state state; SDL_assert_state state;
} buttons[] = { } buttons[] = {
{"Abort", SDL_ASSERTION_ABORT }, {TEXT("Abort"), SDL_ASSERTION_ABORT },
{"Break", SDL_ASSERTION_BREAK }, {TEXT("Break"), SDL_ASSERTION_BREAK },
{"Retry", SDL_ASSERTION_RETRY }, {TEXT("Retry"), SDL_ASSERTION_RETRY },
{"Ignore", SDL_ASSERTION_IGNORE }, {TEXT("Ignore"), SDL_ASSERTION_IGNORE },
{"Always Ignore", SDL_ASSERTION_ALWAYS_IGNORE }, {TEXT("Always Ignore"), SDL_ASSERTION_ALWAYS_IGNORE },
}; };
len = (int) SDL_snprintf(buf, sizeof (buf), len = (int) SDL_snprintf(buf, sizeof (buf),
...@@ -140,14 +156,16 @@ SDL_Assertion_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -140,14 +156,16 @@ SDL_Assertion_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
buf[sizeof (buf) - 1] = '\0'; buf[sizeof (buf) - 1] = '\0';
} }
CreateWindowA("STATIC", buf, tstr = WIN_UTF8ToString(buf);
CreateWindow(TEXT("STATIC"), tstr,
WS_VISIBLE | WS_CHILD | SS_LEFT, WS_VISIBLE | WS_CHILD | SS_LEFT,
x, y, 550, 100, x, y, 550, 100,
hwnd, (HMENU) 1, NULL, NULL); hwnd, (HMENU) 1, NULL, NULL);
SDL_free(tstr);
y += 110; y += 110;
for (i = 0; i < (sizeof (buttons) / sizeof (buttons[0])); i++) { for (i = 0; i < (sizeof (buttons) / sizeof (buttons[0])); i++) {
CreateWindowA("BUTTON", buttons[i].name, CreateWindow(TEXT("BUTTON"), buttons[i].name,
WS_VISIBLE | WS_CHILD, WS_VISIBLE | WS_CHILD,
x, y, w, h, x, y, w, h,
hwnd, (HMENU) buttons[i].state, NULL, NULL); hwnd, (HMENU) buttons[i].state, NULL, NULL);
...@@ -248,7 +266,7 @@ static void SDL_GenerateAssertionReport(void) ...@@ -248,7 +266,7 @@ static void SDL_GenerateAssertionReport(void)
static void SDL_ExitProcess(int exitcode) static void SDL_ExitProcess(int exitcode)
{ {
#ifdef __WINDOWS__ #ifdef __WIN32__
ExitProcess(42); ExitProcess(42);
#else #else
_exit(42); _exit(42);
...@@ -311,7 +329,7 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata) ...@@ -311,7 +329,7 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
/* platform-specific UI... */ /* platform-specific UI... */
#ifdef __WINDOWS__ #ifdef __WIN32__
state = SDL_PromptAssertion_windows(data); state = SDL_PromptAssertion_windows(data);
#elif __MACOSX__ #elif __MACOSX__
......
src/atomic/SDL_spinlock.c
View file @ 10b8372b
...@@ -26,8 +26,13 @@ ...@@ -26,8 +26,13 @@
/* Don't do the check for Visual Studio 2005, it's safe here */ /* Don't do the check for Visual Studio 2005, it's safe here */
#if defined(_MSC_VER) #if defined(_MSC_VER)
#ifdef _WIN32_WCE
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#else
#include <intrin.h> #include <intrin.h>
#endif #endif
#endif /* _MSC_VER */
/* This function is where all the magic happens... */ /* This function is where all the magic happens... */
SDL_bool SDL_bool
......
src/audio/SDL_audio.c
View file @ 10b8372b
...@@ -971,7 +971,7 @@ open_audio_device(const char *devname, int iscapture, ...@@ -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(__WINDOWS__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) #if (defined(__WIN32__) && !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
......
src/cpuinfo/SDL_cpuinfo.c
View file @ 10b8372b
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <signal.h> #include <signal.h>
#include <setjmp.h> #include <setjmp.h>
#endif #endif
#ifdef __WINDOWS__ #ifdef __WIN32__
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#endif #endif
...@@ -319,7 +319,7 @@ SDL_GetCPUCount() ...@@ -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 __WINDOWS__ #ifdef __WIN32__
if (SDL_CPUCount <= 0) { if (SDL_CPUCount <= 0) {
SYSTEM_INFO info; SYSTEM_INFO info;
GetSystemInfo(&info); GetSystemInfo(&info);
......
src/events/SDL_events.c
View file @ 10b8372b
...@@ -170,7 +170,7 @@ SDL_StartEventThread(Uint32 flags) ...@@ -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(__WINDOWS__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) #if (defined(__WIN32__) && !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);
......
src/events/SDL_sysevents.h
View file @ 10b8372b
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define MUST_THREAD_EVENTS #define MUST_THREAD_EVENTS
#endif #endif
#ifdef __WINDOWS__ /* Windows doesn't allow a separate event thread */ #ifdef __WIN32__ /* Windows doesn't allow a separate event thread */
#define CANT_THREAD_EVENTS #define CANT_THREAD_EVENTS
#endif #endif
......
src/file/SDL_rwops.c
View file @ 10b8372b
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <fat.h> #include <fat.h>
#endif /* __NDS__ */ #endif /* __NDS__ */
#ifdef __WINDOWS__ #ifdef __WIN32__
/* 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
...@@ -295,7 +295,7 @@ windows_file_close(SDL_RWops * context) ...@@ -295,7 +295,7 @@ windows_file_close(SDL_RWops * context)
} }
return (0); return (0);
} }
#endif /* __WINDOWS__ */ #endif /* __WIN32__ */
#ifdef HAVE_STDIO_H #ifdef HAVE_STDIO_H
...@@ -449,7 +449,7 @@ SDL_RWFromFile(const char *file, const char *mode) ...@@ -449,7 +449,7 @@ 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(__WINDOWS__) #if defined(__WIN32__)
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() */
......
src/libm/math_private.h
View file @ 10b8372b
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
/*#include <endian.h>*/ /*#include <endian.h>*/
#include "SDL_endian.h" #include "SDL_endian.h"
#include <sys/types.h> /*#include <sys/types.h>*/
#define attribute_hidden #define attribute_hidden
#define libm_hidden_proto(x) #define libm_hidden_proto(x)
......
src/loadso/windows/SDL_sysloadso.c
View file @ 10b8372b
...@@ -61,7 +61,7 @@ SDL_LoadObject(const char *sofile) ...@@ -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(__WINDOWS__) */ #else /*if defined(__WIN32__) */
char errbuf[512]; char errbuf[512];
handle = (void *) LoadLibrary(sofile); handle = (void *) LoadLibrary(sofile);
......
src/power/windows/SDL_syspower.c
View file @ 10b8372b
...@@ -32,11 +32,20 @@ ...@@ -32,11 +32,20 @@
SDL_bool SDL_bool
SDL_GetPowerInfo_Windows(SDL_PowerState * state, int *seconds, int *percent) SDL_GetPowerInfo_Windows(SDL_PowerState * state, int *seconds, int *percent)
{ {
#ifdef _WIN32_WCE
SYSTEM_POWER_STATUS_EX status;
#else
SYSTEM_POWER_STATUS status; SYSTEM_POWER_STATUS status;
#endif
SDL_bool need_details = SDL_FALSE; SDL_bool need_details = SDL_FALSE;
/* This API should exist back to Win95 and Windows CE. */ /* This API should exist back to Win95 and Windows CE. */
if (!GetSystemPowerStatus(&status)) { #ifdef _WIN32_WCE
if (!GetSystemPowerStatusEx(&status, FALSE))
#else
if (!GetSystemPowerStatus(&status))
#endif
{
/* !!! FIXME: push GetLastError() into SDL_GetError() */ /* !!! FIXME: push GetLastError() into SDL_GetError() */
*state = SDL_POWERSTATE_UNKNOWN; *state = SDL_POWERSTATE_UNKNOWN;
} else if (status.BatteryFlag == 0xFF) { /* unknown state */ } else if (status.BatteryFlag == 0xFF) { /* unknown state */
......
src/stdlib/SDL_getenv.c
View file @ 10b8372b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#ifndef HAVE_GETENV #ifndef HAVE_GETENV
#if defined(__WINDOWS__) && !defined(_WIN32_WCE) #if defined(__WIN32__) && !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) ...@@ -163,7 +163,7 @@ SDL_getenv(const char *name)
return value; return value;
} }
#endif /* __WINDOWS__ */ #endif /* __WIN32__ */
#endif /* !HAVE_GETENV */ #endif /* !HAVE_GETENV */
......
src/stdlib/SDL_stdlib.c
View file @ 10b8372b
...@@ -35,9 +35,7 @@ ...@@ -35,9 +35,7 @@
__declspec(selectany) int _fltused = 1; __declspec(selectany) int _fltused = 1;
#endif #endif
#ifdef _WIN64 #ifdef _M_IX86
#else
void void
__declspec(naked) __declspec(naked)
......
src/thread/windows/SDL_syssem.c
View file @ 10b8372b
...@@ -39,7 +39,7 @@ struct SDL_semaphore ...@@ -39,7 +39,7 @@ struct SDL_semaphore
#else #else
HANDLE id; HANDLE id;
#endif #endif
LONG volatile count; LONG count;
}; };
......
src/thread/windows/SDL_systhread.c
View file @ 10b8372b
...@@ -23,12 +23,10 @@ ...@@ -23,12 +23,10 @@
/* Win32 thread management routines for SDL */ /* Win32 thread management routines for SDL */
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include "SDL_thread.h" #include "SDL_thread.h"
#include "../SDL_thread_c.h" #include "../SDL_thread_c.h"
#include "../SDL_systhread.h" #include "../SDL_systhread.h"
#include "SDL_systhread_c.h"
#ifndef SDL_PASSED_BEGINTHREAD_ENDTHREAD #ifndef SDL_PASSED_BEGINTHREAD_ENDTHREAD
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
......
src/video/SDL_renderer_gl.c
View file @ 10b8372b
...@@ -1181,7 +1181,7 @@ GL_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points, ...@@ -1181,7 +1181,7 @@ GL_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points,
} }
data->glEnd(); data->glEnd();
} else { } else {
#if defined(__APPLE__) || defined(__WINDOWS__) #if defined(__APPLE__) || defined(__WIN32__)
#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, ...@@ -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(__WINDOWS__) #if defined(__APPLE__) || defined(__WIN32__)
/* 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
......
src/video/windows/SDL_gapirender.c
View file @ 10b8372b
...@@ -92,19 +92,19 @@ typedef struct ...@@ -92,19 +92,19 @@ typedef struct
//#define DM_DISPLAYORIENTATION 0x00800000L //#define DM_DISPLAYORIENTATION 0x00800000L
//#endif //#endif
#define FORMAT_565 1 #define FORMAT_565 1
#define FORMAT_555 2 #define FORMAT_555 2
#define FORMAT_OTHER 3 #define FORMAT_OTHER 3
#define GETRAWFRAMEBUFFER 0x00020001 #define GETRAWFRAMEBUFFER 0x00020001
#define GETGXINFO 0x00020000 #define GETGXINFO 0x00020000
#define kfPalette 0x10 #define kfPalette 0x10
#define kfDirect 0x20 #define kfDirect 0x20
#define kfDirect555 0x40 #define kfDirect555 0x40
#define kfDirect565 0x80 #define kfDirect565 0x80
#define GX_FULLSCREEN 0x01 #define GX_FULLSCREEN 0x01
enum ScreenOrientation { ORIENTATION_UNKNOWN = -1, ORIENTATION_UP = DMDO_0, ORIENTATION_DOWN = DMDO_180, ORIENTATION_LEFT = DMDO_270, ORIENTATION_RIGHT = DMDO_90 }; enum ScreenOrientation { ORIENTATION_UNKNOWN = -1, ORIENTATION_UP = DMDO_0, ORIENTATION_DOWN = DMDO_180, ORIENTATION_LEFT = DMDO_270, ORIENTATION_RIGHT = DMDO_90 };
enum ScreenGeometry { GEOMETRY_UNKNOWN, GEOMETRY_PORTRAIT, GEOMETRY_LANDSCAPE, GEOMETRY_SQUARE }; enum ScreenGeometry { GEOMETRY_UNKNOWN, GEOMETRY_PORTRAIT, GEOMETRY_LANDSCAPE, GEOMETRY_SQUARE };
...@@ -123,15 +123,15 @@ typedef struct ...@@ -123,15 +123,15 @@ typedef struct
// private display data // private display data
typedef struct typedef struct
{ {
unsigned char* pixels; // video memory unsigned char* pixels; // video memory
int format; // video format int format; // video format
FrameBufferInfo fb; // framebuffer geometry FrameBufferInfo fb; // framebuffer geometry
GapiInfo* gapi; // GAPI module GapiInfo* gapi; // GAPI module
int userOrientation; int userOrientation;
int systemOrientation; int systemOrientation;
int hardwareGeometry; int hardwareGeometry;
int flags; // fb flags int flags; // fb flags
float scale; // scale pointer position float scale; // scale pointer position
int debug; int debug;
} WINCE_RenderData; } WINCE_RenderData;
...@@ -147,110 +147,111 @@ typedef struct ...@@ -147,110 +147,111 @@ typedef struct
// system func // system func
SDL_Renderer* WINCE_CreateRenderer(SDL_Window* window, Uint32 flags); SDL_Renderer* WINCE_CreateRenderer(SDL_Window* window, Uint32 flags);
void WINCE_DestroyRenderer(SDL_Renderer* renderer); void WINCE_DestroyRenderer(SDL_Renderer* renderer);
int WINCE_CreateTexture(SDL_Renderer* renderer, SDL_Texture* texture); int WINCE_CreateTexture(SDL_Renderer* renderer, SDL_Texture* texture);
void WINCE_DestroyTexture(SDL_Renderer* renderer, SDL_Texture* texture); void WINCE_DestroyTexture(SDL_Renderer* renderer, SDL_Texture* texture);
int WINCE_QueryTexturePixels(SDL_Renderer* renderer, SDL_Texture* texture, void** pixels, int* pitch); int WINCE_QueryTexturePixels(SDL_Renderer* renderer, SDL_Texture* texture, void** pixels, int* pitch);
int WINCE_UpdateTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, const void* pixels, int pitch); int WINCE_UpdateTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, const void* pixels, int pitch);
int WINCE_LockTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, int dirty, void** pixels, int* pitch); int WINCE_LockTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* rect, int dirty, void** pixels, int* pitch);
void WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture); void WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture);
int WINCE_Available(void); int WINCE_Available(void);
void WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height); void WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height);
int WINCE_RenderCopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* srect, const SDL_Rect* drect); int WINCE_RenderCopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rect* srect, const SDL_Rect* drect);
void WINCE_ShowWindow(_THIS, SDL_Window* window, int visible); void WINCE_ShowWindow(_THIS, SDL_Window* window, int visible);
void WINCE_RenderPresent(SDL_Renderer* renderer); void WINCE_RenderPresent(SDL_Renderer* renderer);
int WINCE_RenderDrawPoints(SDL_Renderer* renderer, const SDL_Point* points, int count); int WINCE_RenderDrawPoints(SDL_Renderer* renderer, const SDL_Point* points, int count);
int WINCE_RenderDrawLines(SDL_Renderer* renderer, const SDL_Point* points, int count); int WINCE_RenderDrawLines(SDL_Renderer* renderer, const SDL_Point* points, int count);
int WINCE_RenderDrawRects(SDL_Renderer* renderer, const SDL_Rect ** rects, int count); int WINCE_RenderDrawRects(SDL_Renderer* renderer, const SDL_Rect ** rects, int count);
int WINCE_RenderFillRects(SDL_Renderer* renderer, const SDL_Rect** rects, int count); int WINCE_RenderFillRects(SDL_Renderer* renderer, const SDL_Rect** rects, int count);
void WINCE_PointerCoordinateTransform(SDL_Window* window, POINT* pt); void WINCE_PointerCoordinateTransform(SDL_Window* window, POINT* pt);
void WINCE_DumpVideoInfo(WINCE_RenderData* data); void WINCE_DumpVideoInfo(WINCE_RenderData* data);
void WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height); void WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height);
void WINCE_LandscapeTransform(WINCE_RenderData* data, int width, int height); void WINCE_LandscapeTransform(WINCE_RenderData* data, int width, int height);
void WINCE_SquareTransform(WINCE_RenderData* data, int width, int height); void WINCE_SquareTransform(WINCE_RenderData* data, int width, int height);
int WINCE_FixedGeometry(FrameBufferInfo* fb, int bpp, int debug); int WINCE_FixedGeometry(FrameBufferInfo* fb, int bpp, int debug);
int WINCE_GetDMOrientation(void); int WINCE_GetDMOrientation(void);
int WINCE_SetDMOrientation(int orientation); int WINCE_SetDMOrientation(int orientation);
void WINCE_UpdateYUVTextureData(SDL_Texture* texture); void WINCE_UpdateYUVTextureData(SDL_Texture* texture);
// gapi engine specific // gapi engine specific
int GAPI_Init(WINCE_RenderData* data, HWND hwnd); int GAPI_Init(WINCE_RenderData* data, HWND hwnd);
void GAPI_Quit(WINCE_RenderData* data); void GAPI_Quit(WINCE_RenderData* data);
// raw engine specific // raw engine specific
int RAW_Init(WINCE_RenderData* data); int RAW_Init(WINCE_RenderData* data);
void RAW_Quit(WINCE_RenderData* data); void RAW_Quit(WINCE_RenderData* data);
// tools // tools
void FrameBufferRotate(FrameBufferInfo* src, int orientation); void FrameBufferRotate(FrameBufferInfo* src, int orientation);
int GetFrameBufferOrientation(const FrameBufferInfo* src); int GetFrameBufferOrientation(const FrameBufferInfo* src);
void PointerRotate(POINT* pt, const FrameBufferInfo* fb, int orientation); void PointerRotate(POINT* pt, const FrameBufferInfo* fb, int orientation);
void FrameBufferInitialize(FrameBufferInfo* fb); void FrameBufferInitialize(FrameBufferInfo* fb);
void FrameBufferDumpInfo(const FrameBufferInfo* fb, const char*); void FrameBufferDumpInfo(const FrameBufferInfo* fb, const char*);
const char* GetOrientationName(int orientation); const char* GetOrientationName(int orientation);
void UpdateLine16to16(const FrameBufferInfo* fb, const Uint16* src, Uint16* dst, Uint16 width); void UpdateLine16to16(const FrameBufferInfo* fb, const Uint16* src, Uint16* dst, Uint16 width);
// stdlib // stdlib
inline int __abs(int x){ return x < 0 ? -x : x; }; static __inline__ int __abs(int x){ return x < 0 ? -x : x; };
inline void __swap(int* a, int* b){ int t = *a; *a = *b; *b = t; }; static __inline__ void __swap(int* a, int* b){ int t = *a; *a = *b; *b = t; };
#define GAPI_RENDER_NAME "gapi" #define GAPI_RENDER_NAME "gapi"
#define RAW_RENDER_NAME "raw" #define RAW_RENDER_NAME "raw"
// //
SDL_RenderDriver GAPI_RenderDriver = { SDL_RenderDriver GAPI_RenderDriver = {
WINCE_CreateRenderer, WINCE_CreateRenderer,
{ {
GAPI_RENDER_NAME, GAPI_RENDER_NAME,
(SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD), (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD),
(SDL_TEXTUREMODULATE_NONE), (SDL_TEXTUREMODULATE_NONE),
(SDL_BLENDMODE_NONE), (SDL_BLENDMODE_NONE),
(SDL_SCALEMODE_NONE), (SDL_SCALEMODE_NONE),
7, 7,
{ {
SDL_PIXELFORMAT_RGB555, SDL_PIXELFORMAT_RGB555,
SDL_PIXELFORMAT_RGB565, SDL_PIXELFORMAT_RGB565,
SDL_PIXELFORMAT_YV12, SDL_PIXELFORMAT_YV12,
SDL_PIXELFORMAT_IYUV, SDL_PIXELFORMAT_IYUV,
SDL_PIXELFORMAT_YUY2, SDL_PIXELFORMAT_YUY2,
SDL_PIXELFORMAT_UYVY, SDL_PIXELFORMAT_UYVY,
SDL_PIXELFORMAT_YVYU SDL_PIXELFORMAT_YVYU
}, },
0, 0,
0 0
} }
}; };
SDL_RenderDriver RAW_RenderDriver = { SDL_RenderDriver RAW_RenderDriver = {
WINCE_CreateRenderer, WINCE_CreateRenderer,
{ {
RAW_RENDER_NAME, RAW_RENDER_NAME,
(SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD), (SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD),
(SDL_TEXTUREMODULATE_NONE), (SDL_TEXTUREMODULATE_NONE),
(SDL_BLENDMODE_NONE), (SDL_BLENDMODE_NONE),
(SDL_SCALEMODE_NONE), (SDL_SCALEMODE_NONE),
7, 7,
{ {
SDL_PIXELFORMAT_RGB555, SDL_PIXELFORMAT_RGB555,
SDL_PIXELFORMAT_RGB565, SDL_PIXELFORMAT_RGB565,
SDL_PIXELFORMAT_YV12, SDL_PIXELFORMAT_YV12,
SDL_PIXELFORMAT_IYUV, SDL_PIXELFORMAT_IYUV,
SDL_PIXELFORMAT_YUY2, SDL_PIXELFORMAT_YUY2,
SDL_PIXELFORMAT_UYVY, SDL_PIXELFORMAT_UYVY,
SDL_PIXELFORMAT_YVYU SDL_PIXELFORMAT_YVYU
}, },
0, 0,
0 0
} }
}; };
int WINCE_Available(void) int WINCE_Available(void)
{ {
HMODULE render_gapi;
const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER"); const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
// raw check // raw check
...@@ -260,13 +261,13 @@ int WINCE_Available(void) ...@@ -260,13 +261,13 @@ int WINCE_Available(void)
ReleaseDC(NULL, hdc); ReleaseDC(NULL, hdc);
if(render_raw != 0 && rfbi.cxPixels != 0 && rfbi.cyPixels != 0 && if(render_raw != 0 && rfbi.cxPixels != 0 && rfbi.cyPixels != 0 &&
rfbi.pFramePointer != 0 && rfbi.cxStride != 0 && rfbi.cyStride != 0) rfbi.pFramePointer != 0 && rfbi.cxStride != 0 && rfbi.cyStride != 0)
render_raw = 1; render_raw = 1;
if(preferably && 0 == SDL_strcasecmp(preferably, RAW_RENDER_NAME)) return 0 != render_raw; if(preferably && 0 == SDL_strcasecmp(preferably, RAW_RENDER_NAME)) return 0 != render_raw;
// gapi check // gapi check
HMODULE render_gapi = LoadLibrary(TEXT("\\Windows\\gx.dll")); render_gapi = LoadLibrary(TEXT("\\Windows\\gx.dll"));
if(0 == render_gapi) if(0 == render_gapi)
render_gapi = LoadLibrary(TEXT("gx.dll")); render_gapi = LoadLibrary(TEXT("gx.dll"));
FreeLibrary(render_gapi); FreeLibrary(render_gapi);
...@@ -290,8 +291,8 @@ void WINCE_AddRenderDriver(_THIS) ...@@ -290,8 +291,8 @@ void WINCE_AddRenderDriver(_THIS)
ReleaseDC(NULL, hdc); ReleaseDC(NULL, hdc);
if(render_raw != 0 && rfbi.cxPixels != 0 && rfbi.cyPixels != 0 && if(render_raw != 0 && rfbi.cxPixels != 0 && rfbi.cyPixels != 0 &&
rfbi.pFramePointer != 0 && rfbi.cxStride != 0 && rfbi.cyStride != 0) rfbi.pFramePointer != 0 && rfbi.cxStride != 0 && rfbi.cyStride != 0)
render_raw = 1; render_raw = 1;
// gapi check // gapi check
render_gapi = LoadLibrary(TEXT("\\Windows\\gx.dll")); render_gapi = LoadLibrary(TEXT("\\Windows\\gx.dll"));
...@@ -299,25 +300,25 @@ void WINCE_AddRenderDriver(_THIS) ...@@ -299,25 +300,25 @@ void WINCE_AddRenderDriver(_THIS)
render_gapi = LoadLibrary(TEXT("gx.dll")); render_gapi = LoadLibrary(TEXT("gx.dll"));
if(render_gapi) if(render_gapi)
FreeLibrary(render_gapi); FreeLibrary(render_gapi);
for(ii = 0; ii < _this->num_displays; ++ii) for(ii = 0; ii < _this->num_displays; ++ii)
{ {
if(preferably) if(preferably)
{ {
if(0 == SDL_strcasecmp(preferably, RAW_RENDER_NAME) && render_raw) if(0 == SDL_strcasecmp(preferably, RAW_RENDER_NAME) && render_raw)
SDL_AddRenderDriver(&_this->displays[ii], &RAW_RenderDriver); SDL_AddRenderDriver(&_this->displays[ii], &RAW_RenderDriver);
else else
if(0 == SDL_strcasecmp(preferably, GAPI_RENDER_NAME) && render_gapi) if(0 == SDL_strcasecmp(preferably, GAPI_RENDER_NAME) && render_gapi)
SDL_AddRenderDriver(&_this->displays[ii], &GAPI_RenderDriver); SDL_AddRenderDriver(&_this->displays[ii], &GAPI_RenderDriver);
} }
else else
{ {
if(render_raw) if(render_raw)
SDL_AddRenderDriver(&_this->displays[ii], &RAW_RenderDriver); SDL_AddRenderDriver(&_this->displays[ii], &RAW_RenderDriver);
if(render_gapi) if(render_gapi)
SDL_AddRenderDriver(&_this->displays[ii], &GAPI_RenderDriver); SDL_AddRenderDriver(&_this->displays[ii], &GAPI_RenderDriver);
} }
} }
} }
...@@ -332,7 +333,7 @@ SDL_Renderer* WINCE_CreateRenderer(SDL_Window* window, Uint32 flags) ...@@ -332,7 +333,7 @@ SDL_Renderer* WINCE_CreateRenderer(SDL_Window* window, Uint32 flags)
Uint32 Rmask, Gmask, Bmask, Amask; Uint32 Rmask, Gmask, Bmask, Amask;
if(!(window->flags & SDL_WINDOW_FULLSCREEN)) if(!(window->flags & SDL_WINDOW_FULLSCREEN))
window->flags |= SDL_WINDOW_FULLSCREEN; window->flags |= SDL_WINDOW_FULLSCREEN;
if(!SDL_PixelFormatEnumToMasks(displayMode->format, &bpp, &Rmask, &Gmask, &Bmask, &Amask)) if(!SDL_PixelFormatEnumToMasks(displayMode->format, &bpp, &Rmask, &Gmask, &Bmask, &Amask))
{ {
...@@ -342,13 +343,13 @@ SDL_Renderer* WINCE_CreateRenderer(SDL_Window* window, Uint32 flags) ...@@ -342,13 +343,13 @@ SDL_Renderer* WINCE_CreateRenderer(SDL_Window* window, Uint32 flags)
switch(window->fullscreen_mode.format) switch(window->fullscreen_mode.format)
{ {
case SDL_PIXELFORMAT_RGB555: case SDL_PIXELFORMAT_RGB555:
case SDL_PIXELFORMAT_RGB565: case SDL_PIXELFORMAT_RGB565:
break; break;
default: default:
SDL_SetError("Support only 16 or 15 bpp"); SDL_SetError("Support only 16 or 15 bpp");
return NULL; return NULL;
} }
renderer = (SDL_Renderer*) SDL_calloc(1, sizeof(SDL_Renderer)); renderer = (SDL_Renderer*) SDL_calloc(1, sizeof(SDL_Renderer));
...@@ -375,9 +376,9 @@ SDL_Renderer* WINCE_CreateRenderer(SDL_Window* window, Uint32 flags) ...@@ -375,9 +376,9 @@ SDL_Renderer* WINCE_CreateRenderer(SDL_Window* window, Uint32 flags)
// set debug // set debug
data->debug = SDL_getenv("DEBUG_VIDEO_GAPI") || SDL_getenv("GAPI_RENDERER_DEBUG") ? 1 : 0; data->debug = SDL_getenv("DEBUG_VIDEO_GAPI") || SDL_getenv("GAPI_RENDERER_DEBUG") ? 1 : 0;
#if defined(DEBUG_VIDEO_GAPI) || defined(GAPI_RENDERER_DEBUG) #if defined(DEBUG_VIDEO_GAPI) || defined(GAPI_RENDERER_DEBUG)
data->debug = 1; data->debug = 1;
#endif #endif
windowdata->videodata->render = data->gapi ? RENDER_GAPI : RENDER_RAW; windowdata->videodata->render = data->gapi ? RENDER_GAPI : RENDER_RAW;
...@@ -418,10 +419,10 @@ void WINCE_DestroyRenderer(SDL_Renderer* renderer) ...@@ -418,10 +419,10 @@ void WINCE_DestroyRenderer(SDL_Renderer* renderer)
if(renderdata) if(renderdata)
{ {
if(renderdata->gapi) if(renderdata->gapi)
GAPI_Quit(renderdata); GAPI_Quit(renderdata);
else else
RAW_Quit(renderdata); RAW_Quit(renderdata);
SDL_free(renderdata); SDL_free(renderdata);
} }
...@@ -448,20 +449,21 @@ int WINCE_CreateTexture(SDL_Renderer* renderer, SDL_Texture* texture) ...@@ -448,20 +449,21 @@ int WINCE_CreateTexture(SDL_Renderer* renderer, SDL_Texture* texture)
if(SDL_ISPIXELFORMAT_FOURCC(texture->format)) if(SDL_ISPIXELFORMAT_FOURCC(texture->format))
{ {
texturedata->yuv = SDL_SW_CreateYUVTexture(texture->format, texture->w, texture->h); SDL_Window* window = renderer->window;
SDL_VideoDisplay* display = window->display;
texturedata->yuv = SDL_SW_CreateYUVTexture(texture->format, texture->w, texture->h);
if(NULL == texturedata->yuv) if(NULL == texturedata->yuv)
{ {
SDL_OutOfMemory(); SDL_OutOfMemory();
return -1; return -1;
} }
SDL_Window* window = renderer->window; texturedata->format = display->current_mode.format;
SDL_VideoDisplay* display = window->display;
texturedata->format = display->current_mode.format;
} }
else else
{ {
texturedata->yuv = NULL; texturedata->yuv = NULL;
texturedata->format = texture->format; texturedata->format = texture->format;
} }
texture->driverdata = texturedata; texture->driverdata = texturedata;
...@@ -475,10 +477,10 @@ void WINCE_DestroyTexture(SDL_Renderer* renderer, SDL_Texture* texture) ...@@ -475,10 +477,10 @@ void WINCE_DestroyTexture(SDL_Renderer* renderer, SDL_Texture* texture)
if(texturedata) if(texturedata)
{ {
if(texturedata->yuv) SDL_SW_DestroyYUVTexture(texturedata->yuv); if(texturedata->yuv) SDL_SW_DestroyYUVTexture(texturedata->yuv);
if(texturedata->pixels) SDL_free(texturedata->pixels); if(texturedata->pixels) SDL_free(texturedata->pixels);
SDL_free(texturedata); SDL_free(texturedata);
texture->driverdata = NULL; texture->driverdata = NULL;
} }
} }
...@@ -509,19 +511,19 @@ int WINCE_UpdateTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_ ...@@ -509,19 +511,19 @@ int WINCE_UpdateTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_
if(0 < rect->w && 0 < rect->h) if(0 < rect->w && 0 < rect->h)
{ {
const unsigned char *src = ((const unsigned char*) pixels); const unsigned char *src = ((const unsigned char*) pixels);
unsigned char *dst = ((unsigned char*) texturedata->pixels) + unsigned char *dst = ((unsigned char*) texturedata->pixels) +
rect->y * texturedata->pitch + rect->y * texturedata->pitch +
rect->x * SDL_BYTESPERPIXEL(texture->format); rect->x * SDL_BYTESPERPIXEL(texture->format);
int length = rect->w * SDL_BYTESPERPIXEL(texture->format); int length = rect->w * SDL_BYTESPERPIXEL(texture->format);
int height = rect->h; int height = rect->h;
while(height--) while(height--)
{ {
SDL_memcpy(dst, src, length); SDL_memcpy(dst, src, length);
dst += texturedata->pitch; dst += texturedata->pitch;
src += pitch; src += pitch;
} }
} }
return 0; return 0;
...@@ -535,9 +537,10 @@ int WINCE_LockTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Re ...@@ -535,9 +537,10 @@ int WINCE_LockTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Re
return SDL_SW_LockYUVTexture(texturedata->yuv, rect, dirty, pixels, pitch); return SDL_SW_LockYUVTexture(texturedata->yuv, rect, dirty, pixels, pitch);
*pixels = (void *) ((unsigned char*) texturedata->pixels + *pixels = (void *) ((unsigned char*) texturedata->pixels +
rect->y * texturedata->pitch + rect->y * texturedata->pitch +
rect->x * SDL_BYTESPERPIXEL(texture->format)); rect->x * SDL_BYTESPERPIXEL(texture->format));
*pitch = texturedata->pitch; *pitch = texturedata->pitch;
return 0;
} }
void WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture) void WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture)
...@@ -547,7 +550,7 @@ void WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture) ...@@ -547,7 +550,7 @@ void WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture)
if(texturedata->yuv) if(texturedata->yuv)
{ {
SDL_SW_UnlockYUVTexture(texturedata->yuv); SDL_SW_UnlockYUVTexture(texturedata->yuv);
WINCE_UpdateYUVTextureData(texture); WINCE_UpdateYUVTextureData(texture);
} }
} }
...@@ -555,41 +558,43 @@ int WINCE_RenderCopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rec ...@@ -555,41 +558,43 @@ int WINCE_RenderCopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rec
{ {
WINCE_RenderData* dstdata = (WINCE_RenderData*) renderer->driverdata; WINCE_RenderData* dstdata = (WINCE_RenderData*) renderer->driverdata;
WINCE_TextureData* srcdata = (WINCE_TextureData*) texture->driverdata; WINCE_TextureData* srcdata = (WINCE_TextureData*) texture->driverdata;
const unsigned char *src;
unsigned char *dst;
if((dstdata->flags & FB_SUSPENDED) || if((dstdata->flags & FB_SUSPENDED) ||
0 >= srect->w || 0 >= srect->h) return; 0 >= srect->w || 0 >= srect->h) return 0;
// lock gapi // lock gapi
if(dstdata->gapi) dstdata->gapi->GXBeginDraw(); if(dstdata->gapi) dstdata->gapi->GXBeginDraw();
const unsigned char *src = ((const unsigned char*) srcdata->pixels); src = ((const unsigned char*) srcdata->pixels);
unsigned char *dst = dstdata->pixels + (dstdata->flags & FB_SKIP_OFFSET ? 0 : dstdata->fb.offset) + dst = dstdata->pixels + (dstdata->flags & FB_SKIP_OFFSET ? 0 : dstdata->fb.offset) +
drect->y * dstdata->fb.ypitch + drect->y * dstdata->fb.ypitch +
drect->x * dstdata->fb.xpitch; drect->x * dstdata->fb.xpitch;
if(srcdata->yuv) if(srcdata->yuv)
{ {
return SDL_SW_CopyYUVToRGB(srcdata->yuv, return SDL_SW_CopyYUVToRGB(srcdata->yuv,
srect, srcdata->format, srect, srcdata->format,
drect->w, drect->h, dst, drect->w, drect->h, dst,
dstdata->fb.ypitch); dstdata->fb.ypitch);
} }
else else
{ {
int height = drect->h; int height = drect->h;
int length = drect->w * SDL_BYTESPERPIXEL(texture->format); // in bytes int length = drect->w * SDL_BYTESPERPIXEL(texture->format); // in bytes
while(height--) while(height--)
{ {
switch(SDL_BYTESPERPIXEL(texture->format)) switch(SDL_BYTESPERPIXEL(texture->format))
{ {
case 2: UpdateLine16to16(&dstdata->fb, (Uint16*) src, (Uint16*) dst, length >> 1); break; case 2: UpdateLine16to16(&dstdata->fb, (Uint16*) src, (Uint16*) dst, length >> 1); break;
default: break; default: break;
} }
dst += dstdata->fb.ypitch; dst += dstdata->fb.ypitch;
src += srcdata->pitch; src += srcdata->pitch;
} }
} }
// unlock gapi // unlock gapi
...@@ -630,8 +635,8 @@ int WINCE_RenderFillRects(SDL_Renderer* renderer, const SDL_Rect** rects, int co ...@@ -630,8 +635,8 @@ int WINCE_RenderFillRects(SDL_Renderer* renderer, const SDL_Rect** rects, int co
void WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height) void WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height)
{ {
const float maxW1 = GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN) ? GetSystemMetrics(SM_CXSCREEN) : GetSystemMetrics(SM_CYSCREEN); const float maxW1 = (float)(GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN) ? GetSystemMetrics(SM_CXSCREEN) : GetSystemMetrics(SM_CYSCREEN));
const float maxW2 = data->fb.width > data->fb.height ? data->fb.width : data->fb.height; const float maxW2 = (float)(data->fb.width > data->fb.height ? data->fb.width : data->fb.height);
// scale define // scale define
data->scale = maxW2 / maxW1; data->scale = maxW2 / maxW1;
...@@ -643,31 +648,31 @@ void WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height) ...@@ -643,31 +648,31 @@ void WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height)
data->userOrientation = ORIENTATION_UP; data->userOrientation = ORIENTATION_UP;
data->systemOrientation = WINCE_GetDMOrientation(); data->systemOrientation = WINCE_GetDMOrientation();
data->hardwareGeometry = data->fb.width == data->fb.height ? GEOMETRY_SQUARE : data->hardwareGeometry = data->fb.width == data->fb.height ? GEOMETRY_SQUARE :
(data->fb.width < data->fb.height ? GEOMETRY_PORTRAIT : GEOMETRY_LANDSCAPE); (data->fb.width < data->fb.height ? GEOMETRY_PORTRAIT : GEOMETRY_LANDSCAPE);
if(data->debug) if(data->debug)
WINCE_DumpVideoInfo(data); WINCE_DumpVideoInfo(data);
if(data->systemOrientation == ORIENTATION_UNKNOWN) if(data->systemOrientation == ORIENTATION_UNKNOWN)
data->systemOrientation == ORIENTATION_UP; data->systemOrientation = ORIENTATION_UP;
data->userOrientation = ORIENTATION_UP; data->userOrientation = ORIENTATION_UP;
switch(data->hardwareGeometry) switch(data->hardwareGeometry)
{ {
case GEOMETRY_PORTRAIT: WINCE_PortraitTransform(data, width, height); break; case GEOMETRY_PORTRAIT: WINCE_PortraitTransform(data, width, height); break;
case GEOMETRY_LANDSCAPE: WINCE_LandscapeTransform(data, width, height); break; case GEOMETRY_LANDSCAPE: WINCE_LandscapeTransform(data, width, height); break;
case GEOMETRY_SQUARE: WINCE_SquareTransform(data, width, height); break; case GEOMETRY_SQUARE: WINCE_SquareTransform(data, width, height); break;
default: break; default: break;
} }
// debug // debug
if(data->debug) if(data->debug)
{ {
printf("\n"); printf("\n");
printf("user video width: %d\n", width); printf("user video width: %d\n", width);
printf("user video height: %d\n", height); printf("user video height: %d\n", height);
FrameBufferDumpInfo(&data->fb, "user"); FrameBufferDumpInfo(&data->fb, "user");
} }
} }
...@@ -705,42 +710,42 @@ void WINCE_ShowWindow(_THIS, SDL_Window* window, int visible) ...@@ -705,42 +710,42 @@ void WINCE_ShowWindow(_THIS, SDL_Window* window, int visible)
if(visible) if(visible)
{ {
if(window->flags & SDL_WINDOW_FULLSCREEN) if(window->flags & SDL_WINDOW_FULLSCREEN)
{ {
if(videodata->SHFullScreen) if(videodata->SHFullScreen)
videodata->SHFullScreen(windowdata->hwnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_HIDESIPBUTTON); videodata->SHFullScreen(windowdata->hwnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_HIDESIPBUTTON);
ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_HIDE); ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_HIDE);
} }
ShowWindow(windowdata->hwnd, SW_SHOW); ShowWindow(windowdata->hwnd, SW_SHOW);
SetForegroundWindow(windowdata->hwnd); SetForegroundWindow(windowdata->hwnd);
if(renderer && if(renderer &&
(videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW)) (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
{ {
WINCE_RenderData* renderdata = (WINCE_RenderData*) renderer->driverdata; WINCE_RenderData* renderdata = (WINCE_RenderData*) renderer->driverdata;
renderdata->flags &= ~FB_SUSPENDED; renderdata->flags &= ~FB_SUSPENDED;
if(renderdata->gapi) renderdata->gapi->GXResume(); if(renderdata->gapi) renderdata->gapi->GXResume();
} }
} }
else else
{ {
if(renderer && if(renderer &&
(videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW)) (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
{ {
WINCE_RenderData* renderdata = (WINCE_RenderData*) renderer->driverdata; WINCE_RenderData* renderdata = (WINCE_RenderData*) renderer->driverdata;
if(renderdata->gapi) renderdata->gapi->GXSuspend(); if(renderdata->gapi) renderdata->gapi->GXSuspend();
renderdata->flags |= FB_SUSPENDED; renderdata->flags |= FB_SUSPENDED;
} }
ShowWindow(windowdata->hwnd, SW_HIDE); ShowWindow(windowdata->hwnd, SW_HIDE);
if(window->flags & SDL_WINDOW_FULLSCREEN) if(window->flags & SDL_WINDOW_FULLSCREEN)
{ {
if(videodata->SHFullScreen) if(videodata->SHFullScreen)
videodata->SHFullScreen(windowdata->hwnd, SHFS_SHOWTASKBAR | SHFS_SHOWSTARTICON | SHFS_SHOWSIPBUTTON); videodata->SHFullScreen(windowdata->hwnd, SHFS_SHOWTASKBAR | SHFS_SHOWSTARTICON | SHFS_SHOWSIPBUTTON);
ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_SHOW); ShowWindow(FindWindow(TEXT("HHTaskBar"), NULL), SW_SHOW);
} }
} }
} }
...@@ -749,8 +754,8 @@ void WINCE_PointerCoordinateTransform(SDL_Window* window, POINT* pt) ...@@ -749,8 +754,8 @@ void WINCE_PointerCoordinateTransform(SDL_Window* window, POINT* pt)
{ {
WINCE_RenderData* data = (WINCE_RenderData*) window->renderer->driverdata; WINCE_RenderData* data = (WINCE_RenderData*) window->renderer->driverdata;
pt->x *= data->scale; pt->x = (LONG)(pt->x * data->scale);
pt->y *= data->scale; pt->y = (LONG)(pt->y * data->scale);
PointerRotate(pt, &data->fb, data->userOrientation); PointerRotate(pt, &data->fb, data->userOrientation);
} }
...@@ -758,44 +763,45 @@ void WINCE_PointerCoordinateTransform(SDL_Window* window, POINT* pt) ...@@ -758,44 +763,45 @@ void WINCE_PointerCoordinateTransform(SDL_Window* window, POINT* pt)
void WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height) void WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height)
{ {
if(data->systemOrientation != ORIENTATION_UP) if(data->systemOrientation != ORIENTATION_UP)
FrameBufferRotate(&data->fb, data->systemOrientation); FrameBufferRotate(&data->fb, data->systemOrientation);
if(data->fb.width != width || data->fb.height != height) if(data->fb.width != width || data->fb.height != height) {
switch(data->systemOrientation) switch(data->systemOrientation)
{ {
case ORIENTATION_UP: case ORIENTATION_UP:
case ORIENTATION_LEFT: data->userOrientation = ORIENTATION_RIGHT; break; case ORIENTATION_LEFT: data->userOrientation = ORIENTATION_RIGHT; break;
case ORIENTATION_RIGHT: case ORIENTATION_RIGHT:
case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break; case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break;
default: break; default: break;
}
} }
if(data->userOrientation != ORIENTATION_UP) if(data->userOrientation != ORIENTATION_UP)
FrameBufferRotate(&data->fb, data->userOrientation); FrameBufferRotate(&data->fb, data->userOrientation);
} }
void WINCE_LandscapeTransform(WINCE_RenderData* data, int width, int height) void WINCE_LandscapeTransform(WINCE_RenderData* data, int width, int height)
{ {
switch(data->systemOrientation) switch(data->systemOrientation)
{ {
case ORIENTATION_UP: FrameBufferRotate(&data->fb, ORIENTATION_LEFT); break; case ORIENTATION_UP: FrameBufferRotate(&data->fb, ORIENTATION_LEFT); break;
case ORIENTATION_LEFT:FrameBufferRotate(&data->fb, ORIENTATION_DOWN); break; case ORIENTATION_LEFT:FrameBufferRotate(&data->fb, ORIENTATION_DOWN); break;
case ORIENTATION_DOWN:FrameBufferRotate(&data->fb, ORIENTATION_RIGHT); break; case ORIENTATION_DOWN:FrameBufferRotate(&data->fb, ORIENTATION_RIGHT); break;
default: break; default: break;
} }
if(data->fb.width != width || data->fb.height != height) if(data->fb.width != width || data->fb.height != height)
switch(data->systemOrientation) switch(data->systemOrientation)
{ {
case ORIENTATION_UP: case ORIENTATION_UP:
case ORIENTATION_LEFT: data->userOrientation = ORIENTATION_RIGHT; break; case ORIENTATION_LEFT: data->userOrientation = ORIENTATION_RIGHT; break;
case ORIENTATION_RIGHT: case ORIENTATION_RIGHT:
case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break; case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break;
default: break; default: break;
} }
if(data->userOrientation != ORIENTATION_UP) if(data->userOrientation != ORIENTATION_UP)
FrameBufferRotate(&data->fb, data->userOrientation); FrameBufferRotate(&data->fb, data->userOrientation);
} }
void WINCE_SquareTransform(WINCE_RenderData* data, int width, int height) void WINCE_SquareTransform(WINCE_RenderData* data, int width, int height)
...@@ -807,43 +813,43 @@ int WINCE_FixedGeometry(FrameBufferInfo* fb, int bpp, int debug) ...@@ -807,43 +813,43 @@ int WINCE_FixedGeometry(FrameBufferInfo* fb, int bpp, int debug)
{ {
// check square // check square
if(GetSystemMetrics(SM_CXSCREEN) == GetSystemMetrics(SM_CYSCREEN) && if(GetSystemMetrics(SM_CXSCREEN) == GetSystemMetrics(SM_CYSCREEN) &&
fb->width != fb->height) fb->width != fb->height)
{ {
if(fb->width < fb->height) if(fb->width < fb->height)
fb->height = fb->width; fb->height = fb->width;
else else
if(fb->height < fb->width) if(fb->height < fb->width)
fb->width = fb->height; fb->width = fb->height;
} }
// check width // check width
if(__abs(fb->xpitch) == bpp && if(__abs(fb->xpitch) == bpp &&
fb->width != __abs(fb->ypitch) / bpp) fb->width != __abs(fb->ypitch) / bpp)
{ {
if(fb->height == __abs(fb->ypitch) / bpp) if(fb->height == __abs(fb->ypitch) / bpp)
{ {
__swap(&fb->width, &fb->height); __swap(&fb->width, &fb->height);
if(debug) if(debug)
printf("WINCE_FixedGeometry: width: %d, height: %d\n", fb->width, fb->height); printf("WINCE_FixedGeometry: width: %d, height: %d\n", fb->width, fb->height);
} }
else else
return -1; return -1;
} }
else else
// check height // check height
if(__abs(fb->ypitch) == bpp && if(__abs(fb->ypitch) == bpp &&
fb->height != __abs(fb->xpitch) / bpp) fb->height != __abs(fb->xpitch) / bpp)
{ {
if(fb->width == __abs(fb->xpitch) / bpp) if(fb->width == __abs(fb->xpitch) / bpp)
{ {
__swap(&fb->width, &fb->height); __swap(&fb->width, &fb->height);
if(debug) if(debug)
printf("WINCE_FixedGeometry: width: %d, height: %d\n", fb->width, fb->height); printf("WINCE_FixedGeometry: width: %d, height: %d\n", fb->width, fb->height);
} }
else else
return -1; return -1;
} }
return 0; return 0;
...@@ -865,8 +871,12 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd) ...@@ -865,8 +871,12 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
{ {
if(NULL == data->gapi) if(NULL == data->gapi)
{ {
const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER"); struct GXDisplayProperties gxProperties;
if(preferably && 0 != SDL_strcasecmp(preferably, GAPI_RENDER_NAME)) return 0; GXDeviceInfo gxInfo = { 0 };
HDC hdc;
int enable, result;
const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
if(preferably && 0 != SDL_strcasecmp(preferably, GAPI_RENDER_NAME)) return 0;
data->gapi = (GapiInfo *) SDL_calloc(1, sizeof(GapiInfo)); data->gapi = (GapiInfo *) SDL_calloc(1, sizeof(GapiInfo));
if(NULL == data->gapi) if(NULL == data->gapi)
...@@ -875,116 +885,116 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd) ...@@ -875,116 +885,116 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
return 0; return 0;
} }
data->gapi->hGapiLib = LoadLibrary(TEXT("\\Windows\\gx.dll")); data->gapi->hGapiLib = LoadLibrary(TEXT("\\Windows\\gx.dll"));
if(0 == data->gapi->hGapiLib) if(0 == data->gapi->hGapiLib)
{ {
data->gapi->hGapiLib = LoadLibrary(TEXT("gx.dll")); data->gapi->hGapiLib = LoadLibrary(TEXT("gx.dll"));
if(0 == data->gapi->hGapiLib) return 0; if(0 == data->gapi->hGapiLib) return 0;
} }
// load gapi library // load gapi library
#define LINK(type,name,import) name=(PFN##type)GetProcAddress(data->gapi->hGapiLib,TEXT(import)) #define LINK(type,name,import) name=(PFN##type)GetProcAddress(data->gapi->hGapiLib,TEXT(import))
LINK(GXOpenDisplay, data->gapi->GXOpenDisplay, "?GXOpenDisplay@@YAHPAUHWND__@@K@Z"); LINK(GXOpenDisplay, data->gapi->GXOpenDisplay, "?GXOpenDisplay@@YAHPAUHWND__@@K@Z");
LINK(GXCloseDisplay, data->gapi->GXCloseDisplay, "?GXCloseDisplay@@YAHXZ"); LINK(GXCloseDisplay, data->gapi->GXCloseDisplay, "?GXCloseDisplay@@YAHXZ");
LINK(GXBeginDraw, data->gapi->GXBeginDraw, "?GXBeginDraw@@YAPAXXZ"); LINK(GXBeginDraw, data->gapi->GXBeginDraw, "?GXBeginDraw@@YAPAXXZ");
LINK(GXEndDraw, data->gapi->GXEndDraw, "?GXEndDraw@@YAHXZ"); LINK(GXEndDraw, data->gapi->GXEndDraw, "?GXEndDraw@@YAHXZ");
LINK(GXGetDisplayProperties,data->gapi->GXGetDisplayProperties,"?GXGetDisplayProperties@@YA?AUGXDisplayProperties@@XZ"); LINK(GXGetDisplayProperties,data->gapi->GXGetDisplayProperties,"?GXGetDisplayProperties@@YA?AUGXDisplayProperties@@XZ");
LINK(GXSuspend, data->gapi->GXSuspend, "?GXSuspend@@YAHXZ"); LINK(GXSuspend, data->gapi->GXSuspend, "?GXSuspend@@YAHXZ");
LINK(GXResume, data->gapi->GXResume, "?GXResume@@YAHXZ"); LINK(GXResume, data->gapi->GXResume, "?GXResume@@YAHXZ");
#undef LINK #undef LINK
int enable = data->gapi->GXGetDisplayProperties && data->gapi->GXCloseDisplay && data->gapi->GXOpenDisplay && enable = data->gapi->GXGetDisplayProperties && data->gapi->GXCloseDisplay && data->gapi->GXOpenDisplay &&
data->gapi->GXBeginDraw && data->gapi->GXEndDraw && data->gapi->GXSuspend && data->gapi->GXResume; data->gapi->GXBeginDraw && data->gapi->GXEndDraw && data->gapi->GXSuspend && data->gapi->GXResume;
if(!enable) if(!enable)
{ {
SDL_SetError("GAPI_Init: error gx.dll: internal error"); SDL_SetError("GAPI_Init: error gx.dll: internal error");
GAPI_Quit(data); GAPI_Quit(data);
return 0; return 0;
} }
if(0 == data->gapi->GXOpenDisplay(hwnd, GX_FULLSCREEN)) if(0 == data->gapi->GXOpenDisplay(hwnd, GX_FULLSCREEN))
{ {
SDL_SetError("GAPI_Init: couldn't initialize GAPI"); SDL_SetError("GAPI_Init: couldn't initialize GAPI");
GAPI_Quit(data); GAPI_Quit(data);
return 0; return 0;
} }
struct GXDisplayProperties gxProperties = data->gapi->GXGetDisplayProperties(); gxProperties = data->gapi->GXGetDisplayProperties();
// fill FrameBufferInfo // fill FrameBufferInfo
data->fb.xpitch = gxProperties.cbxPitch; data->fb.xpitch = gxProperties.cbxPitch;
data->fb.ypitch = gxProperties.cbyPitch; data->fb.ypitch = gxProperties.cbyPitch;
data->fb.width = gxProperties.cxWidth; data->fb.width = gxProperties.cxWidth;
data->fb.height = gxProperties.cyHeight; data->fb.height = gxProperties.cyHeight;
data->fb.offset = 0; data->fb.offset = 0;
if((gxProperties.ffFormat & kfDirect565) || 16 == gxProperties.cBPP) if((gxProperties.ffFormat & kfDirect565) || 16 == gxProperties.cBPP)
data->format = SDL_PIXELFORMAT_RGB565; data->format = SDL_PIXELFORMAT_RGB565;
else else
if((gxProperties.ffFormat & kfDirect555) || 15 == gxProperties.cBPP) if((gxProperties.ffFormat & kfDirect555) || 15 == gxProperties.cBPP)
data->format = SDL_PIXELFORMAT_RGB555; data->format = SDL_PIXELFORMAT_RGB555;
else else
data->format = 0; data->format = 0;
// get pixels // get pixels
GXDeviceInfo gxInfo = { 0 }; hdc = GetDC(NULL);
HDC hdc = GetDC(NULL);
gxInfo.Version = 100;
gxInfo.Version = 100; result = ExtEscape(hdc, GETGXINFO, 0, NULL, sizeof(gxInfo), (char *) &gxInfo);
int result = ExtEscape(hdc, GETGXINFO, 0, NULL, sizeof(gxInfo), (char *) &gxInfo); ReleaseDC(NULL, hdc);
ReleaseDC(NULL, hdc);
if(result > 0)
if(result > 0) {
{ // more debug
// more debug if(data->debug)
if(data->debug) {
{ int i;
printf("GXDeviceInfo.pvFrameBuffer: %p\n", gxInfo.pvFrameBuffer);
printf("GXDeviceInfo.cxWidth: %d\n", gxInfo.cxWidth); printf("GXDeviceInfo.pvFrameBuffer: %p\n", gxInfo.pvFrameBuffer);
printf("GXDeviceInfo.cyHeight: %d\n", gxInfo.cyHeight); printf("GXDeviceInfo.cxWidth: %d\n", gxInfo.cxWidth);
printf("GXDeviceInfo.cbStride: %d\n", gxInfo.cbStride); printf("GXDeviceInfo.cyHeight: %d\n", gxInfo.cyHeight);
printf("GXDeviceInfo.cBPP: %d\n", gxInfo.cBPP); printf("GXDeviceInfo.cbStride: %d\n", gxInfo.cbStride);
printf("GXDeviceInfo.ffFormat: 0x%x\n", gxInfo.ffFormat); printf("GXDeviceInfo.cBPP: %d\n", gxInfo.cBPP);
printf("GXDeviceInfo.ffFormat: 0x%x\n", gxInfo.ffFormat);
printf("GXDeviceInfo.unk:\n");
int ii; for(ii = 0; ii < sizeof(gxInfo.unknown); ++ii) printf("GXDeviceInfo.unk:\n");
printf("0x%02hhX,", gxInfo.unknown[ii]); for(i = 0; i < sizeof(gxInfo.unknown); ++i)
printf("\n"); printf("0x%02hhX,", gxInfo.unknown[i]);
} printf("\n");
}
if(gxInfo.ffFormat && gxInfo.ffFormat != gxProperties.ffFormat)
{ if(gxInfo.ffFormat && gxInfo.ffFormat != gxProperties.ffFormat) {
if((gxInfo.ffFormat & kfDirect565) || 16 == gxInfo.cBPP) if((gxInfo.ffFormat & kfDirect565) || 16 == gxInfo.cBPP)
data->format = SDL_PIXELFORMAT_RGB565; data->format = SDL_PIXELFORMAT_RGB565;
else else
if((gxInfo.ffFormat & kfDirect555) || 15 == gxInfo.cBPP) if((gxInfo.ffFormat & kfDirect555) || 15 == gxInfo.cBPP)
data->format = SDL_PIXELFORMAT_RGB555; data->format = SDL_PIXELFORMAT_RGB555;
} }
data->pixels = gxInfo.pvFrameBuffer; data->pixels = gxInfo.pvFrameBuffer;
}
else
{
data->flags |= FB_SKIP_OFFSET;
data->pixels = data->gapi->GXBeginDraw();
data->gapi->GXEndDraw();
if(data->debug)
{
printf("GAPI_Init\n");
printf("use GXBeginDraw: %p\n", data->pixels);
printf("use skip offset\n");
}
}
if(0 == data->format ||
0 > WINCE_FixedGeometry(&data->fb, SDL_BYTESPERPIXEL(data->format), data->debug))
{
SDL_SetError("GAPI_Init: unknown hardware");
GAPI_Quit(data);
return 0;
} }
else
{
data->flags |= FB_SKIP_OFFSET;
data->pixels = data->gapi->GXBeginDraw();
data->gapi->GXEndDraw();
if(data->debug)
{
printf("GAPI_Init\n");
printf("use GXBeginDraw: %p\n", data->pixels);
printf("use skip offset\n");
}
}
if(0 == data->format ||
0 > WINCE_FixedGeometry(&data->fb, SDL_BYTESPERPIXEL(data->format), data->debug))
{
SDL_SetError("GAPI_Init: unknown hardware");
GAPI_Quit(data);
return 0;
}
} }
return data->gapi && data->pixels ? 1 : 0; return data->gapi && data->pixels ? 1 : 0;
...@@ -994,28 +1004,30 @@ void GAPI_Quit(WINCE_RenderData* data) ...@@ -994,28 +1004,30 @@ void GAPI_Quit(WINCE_RenderData* data)
{ {
if(data->gapi) if(data->gapi)
{ {
if(data->gapi->GXCloseDisplay) data->gapi->GXCloseDisplay(); if(data->gapi->GXCloseDisplay) data->gapi->GXCloseDisplay();
if(data->gapi->hGapiLib) FreeLibrary(data->gapi->hGapiLib); if(data->gapi->hGapiLib) FreeLibrary(data->gapi->hGapiLib);
SDL_free(data->gapi); SDL_free(data->gapi);
data->gapi = NULL; data->gapi = NULL;
} }
} }
int RAW_Init(WINCE_RenderData* data) int RAW_Init(WINCE_RenderData* data)
{ {
RawFrameBufferInfo rfbi = { 0 };
HDC hdc;
int result;
const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER"); const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
if(preferably && 0 != SDL_strcasecmp(preferably, RAW_RENDER_NAME)) return 0; if(preferably && 0 != SDL_strcasecmp(preferably, RAW_RENDER_NAME)) return 0;
RawFrameBufferInfo rfbi = { 0 }; hdc = GetDC(NULL);
HDC hdc = GetDC(NULL); result = ExtEscape(hdc, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char *) &rfbi);
int result = ExtEscape(hdc, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char *) &rfbi);
ReleaseDC(NULL, hdc); ReleaseDC(NULL, hdc);
//disable //disable
if(result == 0 || rfbi.pFramePointer == 0 || if(result == 0 || rfbi.pFramePointer == 0 ||
rfbi.cxPixels == 0 || rfbi.cyPixels == 0 || rfbi.cxPixels == 0 || rfbi.cyPixels == 0 ||
rfbi.cxStride == 0 || rfbi.cyStride == 0) return 0; rfbi.cxStride == 0 || rfbi.cyStride == 0) return 0;
data->flags = FB_RAW_MODE; data->flags = FB_RAW_MODE;
...@@ -1029,19 +1041,19 @@ int RAW_Init(WINCE_RenderData* data) ...@@ -1029,19 +1041,19 @@ int RAW_Init(WINCE_RenderData* data)
data->fb.offset = 0; data->fb.offset = 0;
if((FORMAT_565 & rfbi.wFormat) || 16 == rfbi.wBPP) if((FORMAT_565 & rfbi.wFormat) || 16 == rfbi.wBPP)
data->format = SDL_PIXELFORMAT_RGB565; data->format = SDL_PIXELFORMAT_RGB565;
else else
if((FORMAT_555 & rfbi.wFormat) || 15 == rfbi.wBPP) if((FORMAT_555 & rfbi.wFormat) || 15 == rfbi.wBPP)
data->format = SDL_PIXELFORMAT_RGB555; data->format = SDL_PIXELFORMAT_RGB555;
else else
data->format = 0; data->format = 0;
if(0 == data->format || if(0 == data->format ||
0 > WINCE_FixedGeometry(&data->fb, SDL_BYTESPERPIXEL(data->format), data->debug)) 0 > WINCE_FixedGeometry(&data->fb, SDL_BYTESPERPIXEL(data->format), data->debug))
{ {
SDL_SetError("RAW_Init: unknown hardware"); SDL_SetError("RAW_Init: unknown hardware");
RAW_Quit(data); RAW_Quit(data);
return 0; return 0;
} }
data->pixels = rfbi.pFramePointer; data->pixels = rfbi.pFramePointer;
...@@ -1060,50 +1072,50 @@ void FrameBufferInitialize(FrameBufferInfo* fb) ...@@ -1060,50 +1072,50 @@ void FrameBufferInitialize(FrameBufferInfo* fb)
// set correct start offset // set correct start offset
switch(orientation) switch(orientation)
{ {
case ORIENTATION_UP: case ORIENTATION_UP:
fb->offset = 0; fb->offset = 0;
break; break;
case ORIENTATION_LEFT: case ORIENTATION_LEFT:
fb->offset = __abs(fb->ypitch * (fb->height - 1)); fb->offset = __abs(fb->ypitch * (fb->height - 1));
break; break;
case ORIENTATION_RIGHT: case ORIENTATION_RIGHT:
fb->offset = __abs(fb->xpitch * (fb->width - 1)); fb->offset = __abs(fb->xpitch * (fb->width - 1));
break; break;
case ORIENTATION_DOWN: case ORIENTATION_DOWN:
fb->offset = __abs(fb->xpitch * (fb->width - 1) + fb->offset = __abs(fb->xpitch * (fb->width - 1) +
fb->ypitch * (fb->height - 1)); fb->ypitch * (fb->height - 1));
break; break;
default: break; default: break;
} }
//if(orientation != ORIENTATION_UP) //if(orientation != ORIENTATION_UP)
switch(orientation) switch(orientation)
{ {
case ORIENTATION_LEFT: FrameBufferRotate(fb, ORIENTATION_RIGHT); break; case ORIENTATION_LEFT: FrameBufferRotate(fb, ORIENTATION_RIGHT); break;
case ORIENTATION_RIGHT:FrameBufferRotate(fb, ORIENTATION_LEFT); break; case ORIENTATION_RIGHT:FrameBufferRotate(fb, ORIENTATION_LEFT); break;
case ORIENTATION_DOWN: FrameBufferRotate(fb, ORIENTATION_DOWN); break; case ORIENTATION_DOWN: FrameBufferRotate(fb, ORIENTATION_DOWN); break;
default: break; default: break;
} }
} }
int GetFrameBufferOrientation(const FrameBufferInfo* src) int GetFrameBufferOrientation(const FrameBufferInfo* src)
{ {
if(src->xpitch > 0 && src->ypitch > 0) if(src->xpitch > 0 && src->ypitch > 0)
return ORIENTATION_UP; return ORIENTATION_UP;
else else
if(src->xpitch > 0 && src->ypitch < 0) if(src->xpitch > 0 && src->ypitch < 0)
return ORIENTATION_LEFT; return ORIENTATION_LEFT;
else else
if(src->xpitch < 0 && src->ypitch > 0) if(src->xpitch < 0 && src->ypitch > 0)
return ORIENTATION_RIGHT; return ORIENTATION_RIGHT;
else else
if(src->xpitch < 0 && src->ypitch < 0) if(src->xpitch < 0 && src->ypitch < 0)
return ORIENTATION_DOWN; return ORIENTATION_DOWN;
return ORIENTATION_UNKNOWN; return ORIENTATION_UNKNOWN;
} }
...@@ -1117,28 +1129,28 @@ void FrameBufferRotate(FrameBufferInfo* dst, int orientation) ...@@ -1117,28 +1129,28 @@ void FrameBufferRotate(FrameBufferInfo* dst, int orientation)
switch(orientation) switch(orientation)
{ {
case ORIENTATION_LEFT: case ORIENTATION_LEFT:
dst->width = src.height; dst->width = src.height;
dst->height = src.width; dst->height = src.width;
dst->xpitch = src.ypitch; dst->xpitch = src.ypitch;
dst->ypitch = -src.xpitch; dst->ypitch = -src.xpitch;
dst->offset = src.offset + src.xpitch * (src.width - 1); dst->offset = src.offset + src.xpitch * (src.width - 1);
break; break;
case ORIENTATION_RIGHT: case ORIENTATION_RIGHT:
dst->width = src.height; dst->width = src.height;
dst->height = src.width; dst->height = src.width;
dst->xpitch = -src.ypitch; dst->xpitch = -src.ypitch;
dst->ypitch = src.xpitch; dst->ypitch = src.xpitch;
dst->offset = src.offset + src.ypitch * (src.height - 1); dst->offset = src.offset + src.ypitch * (src.height - 1);
break; break;
case ORIENTATION_DOWN: case ORIENTATION_DOWN:
FrameBufferRotate(dst, ORIENTATION_LEFT); FrameBufferRotate(dst, ORIENTATION_LEFT);
FrameBufferRotate(dst, ORIENTATION_LEFT); FrameBufferRotate(dst, ORIENTATION_LEFT);
break; break;
default: default:
break; break;
} }
} }
...@@ -1146,31 +1158,31 @@ void PointerRotate(POINT* pt, const FrameBufferInfo* fb, int orientation) ...@@ -1146,31 +1158,31 @@ void PointerRotate(POINT* pt, const FrameBufferInfo* fb, int orientation)
{ {
switch(orientation) switch(orientation)
{ {
case ORIENTATION_UP: case ORIENTATION_UP:
break; break;
case ORIENTATION_LEFT: case ORIENTATION_LEFT:
{ {
int temp = pt->y; int temp = pt->y;
pt->y = fb->height - pt->x; pt->y = fb->height - pt->x;
pt->x = temp; pt->x = temp;
} }
break; break;
case ORIENTATION_RIGHT: case ORIENTATION_RIGHT:
{ {
int temp = pt->x; int temp = pt->x;
pt->x = fb->width - pt->y; pt->x = fb->width - pt->y;
pt->y = temp; pt->y = temp;
} }
break; break;
case ORIENTATION_DOWN: case ORIENTATION_DOWN:
pt->x = fb->width - pt->x; pt->x = fb->width - pt->x;
pt->y = fb->height - pt->y; pt->y = fb->height - pt->y;
break; break;
default: break; default: break;
} }
} }
...@@ -1196,14 +1208,14 @@ int WINCE_GetDMOrientation(void) ...@@ -1196,14 +1208,14 @@ int WINCE_GetDMOrientation(void)
// DMDO_0, DMDO_90, DMDO_180, DMDO_270 // DMDO_0, DMDO_90, DMDO_180, DMDO_270
if(DISP_CHANGE_BADMODE != ChangeDisplaySettingsEx(NULL, &sDevMode, 0, CDS_TEST, NULL)) if(DISP_CHANGE_BADMODE != ChangeDisplaySettingsEx(NULL, &sDevMode, 0, CDS_TEST, NULL))
switch(sDevMode.dmDisplayOrientation) switch(sDevMode.dmDisplayOrientation)
{ {
case DMDO_0: return DMDO_0; case DMDO_0: return DMDO_0;
case DMDO_90: return DMDO_90; case DMDO_90: return DMDO_90;
case DMDO_180: return DMDO_180; case DMDO_180: return DMDO_180;
case DMDO_270: return DMDO_270; case DMDO_270: return DMDO_270;
default: break; default: break;
} }
SDL_SetError("WINCE_GetDMOrientation: ChangeDisplaySettingsEx return BADMODE"); SDL_SetError("WINCE_GetDMOrientation: ChangeDisplaySettingsEx return BADMODE");
return -1; return -1;
...@@ -1217,15 +1229,15 @@ int WINCE_SetDMOrientation(int orientation) ...@@ -1217,15 +1229,15 @@ int WINCE_SetDMOrientation(int orientation)
switch(orientation) switch(orientation)
{ {
case DMDO_0: sDevMode.dmDisplayOrientation = DMDO_0; break; case DMDO_0: sDevMode.dmDisplayOrientation = DMDO_0; break;
case DMDO_90: sDevMode.dmDisplayOrientation = DMDO_90; break; case DMDO_90: sDevMode.dmDisplayOrientation = DMDO_90; break;
case DMDO_180: sDevMode.dmDisplayOrientation = DMDO_180; break; case DMDO_180: sDevMode.dmDisplayOrientation = DMDO_180; break;
case DMDO_270: sDevMode.dmDisplayOrientation = DMDO_270; break; case DMDO_270: sDevMode.dmDisplayOrientation = DMDO_270; break;
default: return 0; default: return 0;
} }
if(DISP_CHANGE_BADMODE != ChangeDisplaySettingsEx(NULL, &sDevMode, 0, CDS_RESET, NULL)) if(DISP_CHANGE_BADMODE != ChangeDisplaySettingsEx(NULL, &sDevMode, 0, CDS_RESET, NULL))
return 1; return 1;
SDL_SetError("WINCE_SetDMOrientation: ChangeDisplaySettingsEx return BADMODE"); SDL_SetError("WINCE_SetDMOrientation: ChangeDisplaySettingsEx return BADMODE");
return -1; return -1;
...@@ -1233,13 +1245,15 @@ int WINCE_SetDMOrientation(int orientation) ...@@ -1233,13 +1245,15 @@ int WINCE_SetDMOrientation(int orientation)
void FrameBufferDumpInfo(const FrameBufferInfo* fb, const char* name) void FrameBufferDumpInfo(const FrameBufferInfo* fb, const char* name)
{ {
int orientation;
printf("%s fb.width: %d\n", name, fb->width); printf("%s fb.width: %d\n", name, fb->width);
printf("%s fb.height: %d\n", name, fb->height); printf("%s fb.height: %d\n", name, fb->height);
printf("%s fb.xpitch: %d\n", name, fb->xpitch); printf("%s fb.xpitch: %d\n", name, fb->xpitch);
printf("%s fb.ypitch: %d\n", name, fb->ypitch); printf("%s fb.ypitch: %d\n", name, fb->ypitch);
printf("%s fb.offset: %d\n", name, fb->offset); printf("%s fb.offset: %d\n", name, fb->offset);
int orientation = GetFrameBufferOrientation(fb); orientation = GetFrameBufferOrientation(fb);
printf("%s fb.orientation: %d, %s\n", name, orientation, GetOrientationName(orientation)); printf("%s fb.orientation: %d, %s\n", name, orientation, GetOrientationName(orientation));
} }
...@@ -1247,34 +1261,34 @@ void UpdateLine16to16(const FrameBufferInfo* fb, const Uint16* src, Uint16* dst, ...@@ -1247,34 +1261,34 @@ void UpdateLine16to16(const FrameBufferInfo* fb, const Uint16* src, Uint16* dst,
{ {
if(2 == fb->xpitch) if(2 == fb->xpitch)
{ {
switch(width) switch(width)
{ {
case 1: case 1:
*dst = *src; *dst = *src;
break; break;
case 2: case 2:
*((Uint32*) dst) = *((Uint32*) src); *((Uint32*) dst) = *((Uint32*) src);
break; break;
default: default:
SDL_memcpy(dst, src, width * 2); SDL_memcpy(dst, src, width * 2);
break; break;
} }
} }
else else
if(-2 == fb->xpitch) if(-2 == fb->xpitch)
{ {
while(width--) while(width--)
*dst-- = *src++; *dst-- = *src++;
} }
else else
{ {
while(width--) while(width--)
{ {
*dst = *src++; *dst = *src++;
dst += fb->xpitch / 2; dst += fb->xpitch / 2;
} }
} }
} }
......
src/video/windows/SDL_gdirender.c
View file @ 10b8372b
...@@ -167,8 +167,10 @@ GDI_CreateRenderer(SDL_Window * window, Uint32 flags) ...@@ -167,8 +167,10 @@ GDI_CreateRenderer(SDL_Window * window, Uint32 flags)
SDL_WindowData *windowdata = (SDL_WindowData *) window->driverdata; SDL_WindowData *windowdata = (SDL_WindowData *) window->driverdata;
SDL_Renderer *renderer; SDL_Renderer *renderer;
GDI_RenderData *data; GDI_RenderData *data;
#ifndef NO_GETDIBBITS
int bmi_size; int bmi_size;
HBITMAP hbm; HBITMAP hbm;
#endif
int i, n; int i, n;
renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer)); renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
......
src/video/windows/SDL_windowsevents.c
View file @ 10b8372b
...@@ -192,20 +192,20 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -192,20 +192,20 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
/* transform coords for VGA, WVGA... */ /* transform coords for VGA, WVGA... */
{ {
SDL_VideoData *videodata = data->videodata; SDL_VideoData *videodata = data->videodata;
if(videodata->CoordTransform && if(videodata->CoordTransform &&
(videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW)) (videodata->render == RENDER_GAPI || videodata->render == RENDER_RAW))
{ {
POINT pt; POINT pt;
pt.x = LOWORD(lParam); pt.x = LOWORD(lParam);
pt.y = HIWORD(lParam); pt.y = HIWORD(lParam);
videodata->CoordTransform(data->window, &pt); videodata->CoordTransform(data->window, &pt);
SDL_SendMouseMotion(data->window, 0, pt.x, pt.y); SDL_SendMouseMotion(data->window, 0, pt.x, pt.y);
break; break;
} }
} }
#endif #endif
SDL_SendMouseMotion(data->window, 0, LOWORD(lParam), HIWORD(lParam)); SDL_SendMouseMotion(data->window, 0, LOWORD(lParam), HIWORD(lParam));
break; break;
...@@ -252,12 +252,15 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -252,12 +252,15 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
break; break;
} }
#ifdef WM_MOUSELEAVE
/* FIXME: Do we need the SDL 1.2 hack to generate WM_MOUSELEAVE now? */
case WM_MOUSELEAVE: case WM_MOUSELEAVE:
if (SDL_GetMouseFocus() == data->window) { if (SDL_GetMouseFocus() == data->window) {
SDL_SetMouseFocus(NULL); SDL_SetMouseFocus(NULL);
} }
returnCode = 0; returnCode = 0;
break; break;
#endif /* WM_MOUSELEAVE */
case WM_SYSKEYDOWN: case WM_SYSKEYDOWN:
case WM_KEYDOWN: case WM_KEYDOWN:
...@@ -382,13 +385,16 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -382,13 +385,16 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
returnCode = 0; returnCode = 0;
break; break;
#ifdef WM_INPUTLANGCHANGE
case WM_INPUTLANGCHANGE: case WM_INPUTLANGCHANGE:
{ {
WIN_UpdateKeymap(); WIN_UpdateKeymap();
} }
returnCode = 1; returnCode = 1;
break; break;
#endif /* WM_INPUTLANGCHANGE */
#ifdef WM_GETMINMAXINFO
case WM_GETMINMAXINFO: case WM_GETMINMAXINFO:
{ {
MINMAXINFO *info; MINMAXINFO *info;
...@@ -447,6 +453,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -447,6 +453,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
} }
returnCode = 0; returnCode = 0;
break; break;
#endif /* WM_GETMINMAXINFO */
case WM_WINDOWPOSCHANGED: case WM_WINDOWPOSCHANGED:
{ {
...@@ -534,6 +541,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -534,6 +541,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
} }
return (1); return (1);
#if defined(SC_SCREENSAVE) || defined(SC_MONITORPOWER)
case WM_SYSCOMMAND: case WM_SYSCOMMAND:
{ {
/* Don't start the screensaver or blank the monitor in fullscreen apps */ /* Don't start the screensaver or blank the monitor in fullscreen apps */
...@@ -545,6 +553,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) ...@@ -545,6 +553,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
} }
} }
break; break;
#endif /* System has screensaver support */
case WM_CLOSE: case WM_CLOSE:
{ {
...@@ -656,7 +665,9 @@ SDL_RegisterApp(char *name, Uint32 style, void *hInst) ...@@ -656,7 +665,9 @@ SDL_RegisterApp(char *name, Uint32 style, void *hInst)
} }
if (!name && !SDL_Appname) { if (!name && !SDL_Appname) {
name = "SDL_app"; name = "SDL_app";
#if defined(CS_BYTEALIGNCLIENT) || defined(CS_OWNDC)
SDL_Appstyle = (CS_BYTEALIGNCLIENT | CS_OWNDC); SDL_Appstyle = (CS_BYTEALIGNCLIENT | CS_OWNDC);
#endif
SDL_Instance = hInst ? hInst : GetModuleHandle(NULL); SDL_Instance = hInst ? hInst : GetModuleHandle(NULL);
} }
......
src/video/windows/SDL_windowskeyboard.c
View file @ 10b8372b
...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#ifdef _WIN32_WCE
#define SDL_DISABLE_WINDOWS_IME
#endif
#include "SDL_windowsvideo.h" #include "SDL_windowsvideo.h"
#include "../../events/SDL_keyboard_c.h" #include "../../events/SDL_keyboard_c.h"
...@@ -29,10 +33,12 @@ ...@@ -29,10 +33,12 @@
#include <imm.h> #include <imm.h>
#include <oleauto.h> #include <oleauto.h>
#ifndef SDL_DISABLE_WINDOWS_IME
static void IME_Init(SDL_VideoData *videodata, HWND hwnd); static void IME_Init(SDL_VideoData *videodata, HWND hwnd);
static void IME_Enable(SDL_VideoData *videodata, HWND hwnd); static void IME_Enable(SDL_VideoData *videodata, HWND hwnd);
static void IME_Disable(SDL_VideoData *videodata, HWND hwnd); static void IME_Disable(SDL_VideoData *videodata, HWND hwnd);
static void IME_Quit(SDL_VideoData *videodata); static void IME_Quit(SDL_VideoData *videodata);
#endif /* !SDL_DISABLE_WINDOWS_IME */
#ifndef MAPVK_VK_TO_VSC #ifndef MAPVK_VK_TO_VSC
#define MAPVK_VK_TO_VSC 0 #define MAPVK_VK_TO_VSC 0
...@@ -172,12 +178,15 @@ WIN_UpdateKeymap() ...@@ -172,12 +178,15 @@ WIN_UpdateKeymap()
void void
WIN_QuitKeyboard(_THIS) WIN_QuitKeyboard(_THIS)
{ {
#ifndef SDL_DISABLE_WINDOWS_IME
IME_Quit((SDL_VideoData *)_this->driverdata); IME_Quit((SDL_VideoData *)_this->driverdata);
#endif
} }
void void
WIN_StartTextInput(_THIS) WIN_StartTextInput(_THIS)
{ {
#ifndef SDL_DISABLE_WINDOWS_IME
SDL_Window *window = SDL_GetKeyboardFocus(); SDL_Window *window = SDL_GetKeyboardFocus();
if (window) { if (window) {
HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd; HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
...@@ -186,11 +195,13 @@ WIN_StartTextInput(_THIS) ...@@ -186,11 +195,13 @@ WIN_StartTextInput(_THIS)
IME_Init(videodata, hwnd); IME_Init(videodata, hwnd);
IME_Enable(videodata, hwnd); IME_Enable(videodata, hwnd);
} }
#endif /* !SDL_DISABLE_WINDOWS_IME */
} }
void void
WIN_StopTextInput(_THIS) WIN_StopTextInput(_THIS)
{ {
#ifndef SDL_DISABLE_WINDOWS_IME
SDL_Window *window = SDL_GetKeyboardFocus(); SDL_Window *window = SDL_GetKeyboardFocus();
if (window) { if (window) {
HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd; HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
...@@ -198,6 +209,7 @@ WIN_StopTextInput(_THIS) ...@@ -198,6 +209,7 @@ WIN_StopTextInput(_THIS)
IME_Init(videodata, hwnd); IME_Init(videodata, hwnd);
IME_Disable(videodata, hwnd); IME_Disable(videodata, hwnd);
} }
#endif /* !SDL_DISABLE_WINDOWS_IME */
} }
void void
...@@ -207,6 +219,21 @@ WIN_SetTextInputRect(_THIS, SDL_Rect *rect) ...@@ -207,6 +219,21 @@ WIN_SetTextInputRect(_THIS, SDL_Rect *rect)
videodata->ime_rect = *rect; videodata->ime_rect = *rect;
} }
#ifdef SDL_DISABLE_WINDOWS_IME
SDL_bool
IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, SDL_VideoData *videodata)
{
return SDL_FALSE;
}
void IME_Present(SDL_VideoData *videodata)
{
}
#else
#ifdef __GNUC__ #ifdef __GNUC__
#undef DEFINE_GUID #undef DEFINE_GUID
#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) static const GUID n = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} #define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) static const GUID n = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
...@@ -1552,4 +1579,6 @@ void IME_Present(SDL_VideoData *videodata) ...@@ -1552,4 +1579,6 @@ void IME_Present(SDL_VideoData *videodata)
SDL_RenderCopy(videodata->ime_candtex, NULL, &videodata->ime_candlistrect); SDL_RenderCopy(videodata->ime_candtex, NULL, &videodata->ime_candlistrect);
} }
#endif /* SDL_DISABLE_WINDOWS_IME */
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */
src/video/windows/SDL_windowsmodes.c
View file @ 10b8372b
...@@ -23,13 +23,19 @@ ...@@ -23,13 +23,19 @@
#include "SDL_windowsvideo.h" #include "SDL_windowsvideo.h"
/* Windows CE compatibility */
#ifndef CDS_FULLSCREEN
#define CDS_FULLSCREEN 0
#endif
static SDL_bool static SDL_bool
WIN_GetDisplayMode(LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mode) WIN_GetDisplayMode(LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mode)
{ {
SDL_DisplayModeData *data; SDL_DisplayModeData *data;
DEVMODE devmode; DEVMODE devmode;
#ifndef _WIN32_WCE
HDC hdc; HDC hdc;
#endif
devmode.dmSize = sizeof(devmode); devmode.dmSize = sizeof(devmode);
devmode.dmDriverExtra = 0; devmode.dmDriverExtra = 0;
......
src/video/windows/SDL_windowsvideo.c
View file @ 10b8372b
...@@ -161,9 +161,9 @@ WIN_CreateDevice(int devindex) ...@@ -161,9 +161,9 @@ WIN_CreateDevice(int devindex)
data->userDLL = LoadLibrary(TEXT("USER32.DLL")); data->userDLL = LoadLibrary(TEXT("USER32.DLL"));
if (data->userDLL) { if (data->userDLL) {
data->CloseTouchInputHandle = (BOOL (WINAPI *)( HTOUCHINPUT )) GetProcAddress(data->userDLL, "CloseTouchInputHandle"); data->CloseTouchInputHandle = (BOOL (WINAPI *)( HTOUCHINPUT )) GetProcAddress(data->userDLL, TEXT("CloseTouchInputHandle"));
data->GetTouchInputInfo = (BOOL (WINAPI *)( HTOUCHINPUT, UINT, PTOUCHINPUT, int )) GetProcAddress(data->userDLL, "GetTouchInputInfo"); data->GetTouchInputInfo = (BOOL (WINAPI *)( HTOUCHINPUT, UINT, PTOUCHINPUT, int )) GetProcAddress(data->userDLL, TEXT("GetTouchInputInfo"));
data->RegisterTouchWindow = (BOOL (WINAPI *)( HWND, ULONG )) GetProcAddress(data->userDLL, "RegisterTouchWindow"); data->RegisterTouchWindow = (BOOL (WINAPI *)( HWND, ULONG )) GetProcAddress(data->userDLL, TEXT("RegisterTouchWindow"));
} }
/* Set the function pointers */ /* Set the function pointers */
...@@ -222,11 +222,7 @@ WIN_CreateDevice(int devindex) ...@@ -222,11 +222,7 @@ WIN_CreateDevice(int devindex)
} }
VideoBootStrap WINDOWS_bootstrap = { VideoBootStrap WINDOWS_bootstrap = {
#ifdef _WIN32_WCE "windows", "SDL Windows video driver", WIN_Available, WIN_CreateDevice
"wince", "SDL WinCE video driver", WINCE_Available, WIN_CreateDevice
#else
"windows", "SDL Win32/64 video driver", WIN_Available, WIN_CreateDevice
#endif
}; };
int int
......
src/video/windows/SDL_windowsvideo.h
View file @ 10b8372b
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <windows.h> #include <windows.h>
#ifndef __GNUC__ #if defined(_MSC_VER) && !defined(_WIN32_WCE)
#include <msctf.h> #include <msctf.h>
#else #else
#include "SDL_msctf.h" #include "SDL_msctf.h"
......
src/video/windows/SDL_windowswindow.c
View file @ 10b8372b
...@@ -32,6 +32,10 @@ ...@@ -32,6 +32,10 @@
#include "SDL_syswm.h" #include "SDL_syswm.h"
#include "SDL_gapirender.h" #include "SDL_gapirender.h"
/* Windows CE compatibility */
#ifndef SWP_NOCOPYBITS
#define SWP_NOCOPYBITS 0
#endif
/* Fake window to help with DirectInput events. */ /* Fake window to help with DirectInput events. */
HWND SDL_HelperWindow = NULL; HWND SDL_HelperWindow = NULL;
...@@ -68,13 +72,21 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created) ...@@ -68,13 +72,21 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
} }
/* Set up the window proc function */ /* Set up the window proc function */
#ifdef GWLP_WNDPROC
data->wndproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC); data->wndproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC);
if (data->wndproc == WIN_WindowProc) { if (data->wndproc == WIN_WindowProc) {
data->wndproc = NULL; data->wndproc = NULL;
} } else {
else {
SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) WIN_WindowProc); SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) WIN_WindowProc);
} }
#else
data->wndproc = (WNDPROC) GetWindowLong(hwnd, GWL_WNDPROC);
if (data->wndproc == WIN_WindowProc) {
data->wndproc = NULL;
} else {
SetWindowLong(hwnd, GWL_WNDPROC, (LONG_PTR) WIN_WindowProc);
}
#endif
/* Fill in the SDL window with the window data */ /* Fill in the SDL window with the window data */
{ {
...@@ -112,14 +124,20 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created) ...@@ -112,14 +124,20 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
} else { } else {
window->flags &= ~SDL_WINDOW_RESIZABLE; window->flags &= ~SDL_WINDOW_RESIZABLE;
} }
#ifdef WS_MAXIMIZE
if (style & WS_MAXIMIZE) { if (style & WS_MAXIMIZE) {
window->flags |= SDL_WINDOW_MAXIMIZED; window->flags |= SDL_WINDOW_MAXIMIZED;
} else { } else
#endif
{
window->flags &= ~SDL_WINDOW_MAXIMIZED; window->flags &= ~SDL_WINDOW_MAXIMIZED;
} }
#ifdef WS_MINIMIZE
if (style & WS_MINIMIZE) { if (style & WS_MINIMIZE) {
window->flags |= SDL_WINDOW_MINIMIZED; window->flags |= SDL_WINDOW_MINIMIZED;
} else { } else
#endif
{
window->flags &= ~SDL_WINDOW_MINIMIZED; window->flags &= ~SDL_WINDOW_MINIMIZED;
} }
} }
......
test/testgesture.c
View file @ 10b8372b
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
#define PRIu32 "u" #define PRIu32 "u"
#endif #endif
#ifndef PRIs64 #ifndef PRIs64
#ifdef __WINDOWS__ #ifdef __WIN32__
#define PRIs64 "I64" #define PRIs64 "I64"
#else #else
#define PRIs64 "lld" #define PRIs64 "lld"
#endif #endif
#endif #endif
#ifndef PRIu64 #ifndef PRIu64
#ifdef __WINDOWS__ #ifdef __WIN32__
#define PRIu64 "I64u" #define PRIu64 "I64u"
#else #else
#define PRIu64 "llu" #define PRIu64 "llu"
......
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