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
Expand all Show 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
This diff is collapsed.
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
...@@ -197,8 +197,8 @@ const char* GetOrientationName(int orientation); ...@@ -197,8 +197,8 @@ 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"
...@@ -251,6 +251,7 @@ SDL_RenderDriver RAW_RenderDriver = { ...@@ -251,6 +251,7 @@ SDL_RenderDriver RAW_RenderDriver = {
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
...@@ -266,7 +267,7 @@ int WINCE_Available(void) ...@@ -266,7 +267,7 @@ int WINCE_Available(void)
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);
...@@ -448,14 +449,15 @@ int WINCE_CreateTexture(SDL_Renderer* renderer, SDL_Texture* texture) ...@@ -448,14 +449,15 @@ int WINCE_CreateTexture(SDL_Renderer* renderer, SDL_Texture* texture)
if(SDL_ISPIXELFORMAT_FOURCC(texture->format)) if(SDL_ISPIXELFORMAT_FOURCC(texture->format))
{ {
SDL_Window* window = renderer->window;
SDL_VideoDisplay* display = window->display;
texturedata->yuv = SDL_SW_CreateYUVTexture(texture->format, texture->w, texture->h); 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;
SDL_VideoDisplay* display = window->display;
texturedata->format = display->current_mode.format; texturedata->format = display->current_mode.format;
} }
else else
...@@ -538,6 +540,7 @@ int WINCE_LockTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Re ...@@ -538,6 +540,7 @@ int WINCE_LockTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Re
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)
...@@ -555,15 +558,17 @@ int WINCE_RenderCopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rec ...@@ -555,15 +558,17 @@ 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)
...@@ -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;
...@@ -649,7 +654,7 @@ void WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height) ...@@ -649,7 +654,7 @@ void WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height)
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;
...@@ -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);
} }
...@@ -760,7 +765,7 @@ void WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height) ...@@ -760,7 +765,7 @@ 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:
...@@ -769,6 +774,7 @@ void WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height) ...@@ -769,6 +774,7 @@ void WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height)
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);
...@@ -865,6 +871,10 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd) ...@@ -865,6 +871,10 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
{ {
if(NULL == data->gapi) if(NULL == data->gapi)
{ {
struct GXDisplayProperties gxProperties;
GXDeviceInfo gxInfo = { 0 };
HDC hdc;
int enable, result;
const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER"); const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
if(preferably && 0 != SDL_strcasecmp(preferably, GAPI_RENDER_NAME)) return 0; if(preferably && 0 != SDL_strcasecmp(preferably, GAPI_RENDER_NAME)) return 0;
...@@ -893,7 +903,7 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd) ...@@ -893,7 +903,7 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
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)
...@@ -910,7 +920,7 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd) ...@@ -910,7 +920,7 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
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;
...@@ -928,11 +938,10 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd) ...@@ -928,11 +938,10 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
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;
int result = ExtEscape(hdc, GETGXINFO, 0, NULL, sizeof(gxInfo), (char *) &gxInfo); result = ExtEscape(hdc, GETGXINFO, 0, NULL, sizeof(gxInfo), (char *) &gxInfo);
ReleaseDC(NULL, hdc); ReleaseDC(NULL, hdc);
if(result > 0) if(result > 0)
...@@ -940,6 +949,8 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd) ...@@ -940,6 +949,8 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
// more debug // more debug
if(data->debug) if(data->debug)
{ {
int i;
printf("GXDeviceInfo.pvFrameBuffer: %p\n", gxInfo.pvFrameBuffer); printf("GXDeviceInfo.pvFrameBuffer: %p\n", gxInfo.pvFrameBuffer);
printf("GXDeviceInfo.cxWidth: %d\n", gxInfo.cxWidth); printf("GXDeviceInfo.cxWidth: %d\n", gxInfo.cxWidth);
printf("GXDeviceInfo.cyHeight: %d\n", gxInfo.cyHeight); printf("GXDeviceInfo.cyHeight: %d\n", gxInfo.cyHeight);
...@@ -948,13 +959,12 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd) ...@@ -948,13 +959,12 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
printf("GXDeviceInfo.ffFormat: 0x%x\n", gxInfo.ffFormat); printf("GXDeviceInfo.ffFormat: 0x%x\n", gxInfo.ffFormat);
printf("GXDeviceInfo.unk:\n"); printf("GXDeviceInfo.unk:\n");
int ii; for(ii = 0; ii < sizeof(gxInfo.unknown); ++ii) for(i = 0; i < sizeof(gxInfo.unknown); ++i)
printf("0x%02hhX,", gxInfo.unknown[ii]); printf("0x%02hhX,", gxInfo.unknown[i]);
printf("\n"); 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
...@@ -1004,12 +1014,14 @@ void GAPI_Quit(WINCE_RenderData* data) ...@@ -1004,12 +1014,14 @@ void GAPI_Quit(WINCE_RenderData* data)
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
...@@ -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));
} }
......
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
...@@ -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
This diff is collapsed.
src/video/windows/SDL_windowsmodes.c
View file @ 10b8372b
This diff is collapsed.
src/video/windows/SDL_windowsvideo.c
View file @ 10b8372b
This diff is collapsed.
src/video/windows/SDL_windowsvideo.h
View file @ 10b8372b
This diff is collapsed.
src/video/windows/SDL_windowswindow.c
View file @ 10b8372b
This diff is collapsed.
test/testgesture.c
View file @ 10b8372b
This diff is collapsed.
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