Commit 1840f4d0 authored by Eric Wing's avatar Eric Wing

merged: might need to check main.c in the iOS template to make sure no changes were abandoned.

parents d89219fa b13cdc5d
...@@ -12,30 +12,31 @@ LOCAL_MODULE := SDL ...@@ -12,30 +12,31 @@ LOCAL_MODULE := SDL
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_SRC_FILES := src/SDL_android.cpp \ LOCAL_SRC_FILES := \
$(subst $(LOCAL_PATH)/,, \ $(subst $(LOCAL_PATH)/,, \
$(wildcard $(LOCAL_PATH)/src/*.c) \ $(wildcard $(LOCAL_PATH)/src/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/*.c) \ $(wildcard $(LOCAL_PATH)/src/audio/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
$(LOCAL_PATH)/src/atomic/SDL_atomic.c \ $(LOCAL_PATH)/src/atomic/SDL_atomic.c \
$(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \ $(LOCAL_PATH)/src/atomic/SDL_spinlock.c.arm \
$(wildcard $(LOCAL_PATH)/src/core/android/*.cpp) \
$(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \ $(wildcard $(LOCAL_PATH)/src/cpuinfo/*.c) \
$(wildcard $(LOCAL_PATH)/src/events/*.c) \ $(wildcard $(LOCAL_PATH)/src/events/*.c) \
$(wildcard $(LOCAL_PATH)/src/file/*.c) \ $(wildcard $(LOCAL_PATH)/src/file/*.c) \
$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \ $(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
$(wildcard $(LOCAL_PATH)/src/power/*.c) \
$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \ $(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
$(wildcard $(LOCAL_PATH)/src/thread/*.c) \ $(wildcard $(LOCAL_PATH)/src/thread/*.c) \
$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
$(wildcard $(LOCAL_PATH)/src/video/*.c) \
$(wildcard $(LOCAL_PATH)/src/power/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/audio/dummy/*.c) \
$(wildcard $(LOCAL_PATH)/src/video/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
$(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \ $(wildcard $(LOCAL_PATH)/src/thread/pthread/*.c) \
$(wildcard $(LOCAL_PATH)/src/timer/*.c) \
$(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \ $(wildcard $(LOCAL_PATH)/src/timer/unix/*.c) \
$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c)) $(wildcard $(LOCAL_PATH)/src/video/*.c) \
$(wildcard $(LOCAL_PATH)/src/video/android/*.c))
LOCAL_LDLIBS := -ldl -lGLESv1_CM -llog LOCAL_LDLIBS := -ldl -lGLESv1_CM -llog
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(SDL) (SDL)
Version 1.2 Version 1.3
--- ---
http://www.libsdl.org/ http://www.libsdl.org/
...@@ -12,10 +12,9 @@ This is the Simple DirectMedia Layer, a general API that provides low ...@@ -12,10 +12,9 @@ This is the Simple DirectMedia Layer, a general API that provides low
level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL,
and 2D framebuffer across multiple platforms. and 2D framebuffer across multiple platforms.
The current version supports Linux, Windows, Windows CE, BeOS, MacOS, The current version supports Windows, Windows CE, Mac OS X, Linux, FreeBSD,
Mac OS X, FreeBSD, NetBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX. NetBSD, OpenBSD, BSD/OS, Solaris, QNX, iOS, and Android. The code contains
The code contains support for AIX, OSF/Tru64, RISC OS, and SymbianOS, support for other operating systems but those are not officially supported.
but these are not officially supported.
SDL is written in C, but works with C++ natively, and has bindings to SDL is written in C, but works with C++ natively, and has bindings to
several other languages, including Ada, C#, Eiffel, Erlang, Euphoria, several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,
......
This is a list of the platforms SDL supports, and who maintains them.
Officially supported platforms
==============================
(code compiles, and thoroughly tested for release)
==============================
Windows XP
Windows Vista
Windows 7
Mac OS X 10.4+
Linux 2.6+
iOS 3.2+
Android 1.6+
Unofficially supported platforms
================================
(code compiles, but not thoroughly tested)
================================
Windows CE
FreeBSD
NetBSD
OpenBSD
Solaris
Platforms supported by volunteers
=================================
Pandora - maintained by Scott Smith <pickle136@sbcglobal.net>
Platforms that need maintainers
===============================
Nintendo DS
QNX
Haiku
Readme for RISC OS port of SDL
==============================
This document last updated on 2nd Februrary 2006
This is a RISC OS port of the Simple Direct Media Layer (SDL) by Alan Buckley with contributions from Peter Naulls.
Details of the SDL can be found at http://www.libsdl.org.
The source code including the RISC OS version can be obtained from:
http://www.libsdl.org.
Pre built libraries and many games and applications compiled for RISC OS using this library can be downloaded from The Unix Porting Project at http://www.riscos.info/unix/.
This is released under the LGPL see the file COPYING for details.
Compiling applications under RISC OS
====================================
Add -ISDL: for the C compiler flags if you include the files in the SDL directory. e.g. #include "SDL/SDL.h"
Add -ISDL:SDL for the C compiler flags if you include the files directly. e.g. #include "SDL/SDL.h"
Add -LSDL: -lSDL to the link stage of compilation.
For example, to compile the testbitmap.c sample you could use:
gcc -ISDL:SDL -LSDL: -lSDL testbitmap.c -otestbitmap
RISC OS port of SDL runtime information
=======================================
Runtime requirements
--------------------
This library currently needs a minimum of RISC OS 3.6. The source code for the library (and a lot of the programs built with it) also need long file names.
To use the audio you also need 16 bit sound and to have installed the DigitalRender module by Andreas Dehmel version 0.51 available from his
web site: http://home.t-online.de/~zarquon
This is loaded when needed by UnixLib.
Note: As most programs ported from other OSes use high resolution graphics and a memory back buffer a machine with a StrongARM processor and 1 or 2MB of VRAM (or a better machine) is recomended.
RISC OS runtime parameters
--------------------------
Several environmental variables have been defined to make porting programs easier (i.e. By setting these variable you do not need to have source code differences between OSes).
They are all defined on an application basis.
The <appname> used below is found as follows:
1. Use the name of the program unless it is !RunImage
2. Check the folder specification for the folder !RunImage is run from. If it is a folder name use that name, otherwise if it is an environmental variable of the form <XXX$Dir> use the value of XXX.
The variables are:
SDL$<appname>$TaskName
The name of the task for RISC OS. If omitted then <appname> is used for the task name,
SDL$<appname>$BackBuffer
Set to 1 to use a system memory back buffer for the screen in full screen mode. Some programs on other systems assume their is always a back buffer even though the SDL specification specifies this is not the case. The current RISC OS implementation uses direct writes to the screen if a hardware fullscreen is requested.
Set to 2 to use an ARM code full word copy. This is faster than the standard back buffer, but uses aligned words only so it is possible (but unlikely) for it to corrupt the screen for 8bpp and 16bpp modes.
Set to 3 to use a RISC OS sprite as the back buffer. This is usually the slowest for most SDL applications, however it may be useful in the future as Sprite acceleration is added to various hardware that runs RISC OS.
SDL$<appname>$CloseAction - set the action for the close icon. Again as programs don't match the specification you can set this to 0 to remove the close icon from the main window for applications where this does not affect the program.
RISC OS SDL port API notes
==========================
Current level of implementation
-------------------------------
The following list is an overview of how much of the SDL is implemented. The areas match the main areas of the SDL.
video - Mostly done. Doesn't cover gamma, YUV-overlay or OpenGL.
Window Manager - Mostly done. SetIcon/IconifyWindow not implemented.
Events - Mostly done. Resize and some joystick events missing.
Joystick - Currently assumes a single joystick with 4 buttons.
Audio - Done
Threads - Done
Timers - Done
Thread support can be removed by defining DISABLE_THREADS and recompiling the library.
SDL API notes
-------------
This section contains additional notes on some specific commands.
SDL_SetVideoMode
On RISC OS a fullscreen mode directly accesses the screen. This can be modified by the environmental variable (SDL$<appname>$BackBuffer) or by using the SDL_SWSURFACE flag to write to an offscreen buffer that is updated using SDL_UpdateRects.
Open GL is not supported so SDL_OPENGL and SDL_OPENGLBLIT flags fail.
SDL_RESIZEABLE and SDL_NOFRAME flags are not supported.
SDL_SetColors
In a wimp mode the screen colours are not changed for a hardware palette instead the RISC OS sprite colour mapping is used to get the best matching colours.
SDL_CreateCursor
Inverted colour is not supported.
SDL_WM_ToggleFullScreen
Currently this won't work if the application starts up in Fullscreen mode.
Toggling to fullscreen will only work if the monitor is set up to support the exact screen size requested.
SDL_EnableUNICODE
Unicode translation used here is only really accurate for 7 bit characters.
SDL_NumJoysticks/JoystickName etc.
Hardcoded to expect only 1 joystick with 4 buttons if the Joystick module is loaded.
SDL_GetTicks
Timer used has only a centisecond accuracy. This applies to other time related functions.
SDL_Delay
Modified to poll keyboard/mouse during the delay on the event thread.
Notes on current implementation
-------------------------------
Keyboard and mouse are polled so if too long a time is spent between a call to SDL_PumpEvents, functions that use it, or SDL_Delay events can be missed.
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;" CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;" CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -647,10 +647,6 @@ ...@@ -647,10 +647,6 @@
RelativePath="..\..\src\atomic\SDL_atomic.c" RelativePath="..\..\src\atomic\SDL_atomic.c"
> >
</File> </File>
<File
RelativePath="..\..\src\atomic\SDL_spinlock.c"
>
</File>
<File <File
RelativePath="..\..\src\audio\SDL_audio.c" RelativePath="..\..\src\audio\SDL_audio.c"
> >
...@@ -1047,6 +1043,10 @@ ...@@ -1047,6 +1043,10 @@
RelativePath="..\..\src\video\SDL_shape_internals.h" RelativePath="..\..\src\video\SDL_shape_internals.h"
> >
</File> </File>
<File
RelativePath="..\..\src\atomic\SDL_spinlock.c"
>
</File>
<File <File
RelativePath="..\..\src\stdlib\SDL_stdlib.c" RelativePath="..\..\src\stdlib\SDL_stdlib.c"
> >
...@@ -1163,6 +1163,22 @@ ...@@ -1163,6 +1163,22 @@
RelativePath="..\..\src\audio\SDL_wave.h" RelativePath="..\..\src\audio\SDL_wave.h"
> >
</File> </File>
<File
RelativePath="..\..\src\events\SDL_windowevents.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_windowevents_c.h"
>
</File>
<File
RelativePath="..\..\src\core\windows\SDL_windows.c"
>
</File>
<File
RelativePath="..\..\src\core\windows\SDL_windows.h"
>
</File>
<File <File
RelativePath="..\..\src\video\windows\SDL_windowsclipboard.c" RelativePath="..\..\src\video\windows\SDL_windowsclipboard.c"
> >
...@@ -1243,14 +1259,6 @@ ...@@ -1243,14 +1259,6 @@
RelativePath="..\..\src\video\windows\SDL_windowswindow.h" RelativePath="..\..\src\video\windows\SDL_windowswindow.h"
> >
</File> </File>
<File
RelativePath="..\..\src\events\SDL_windowevents.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_windowevents_c.h"
>
</File>
<File <File
RelativePath="..\..\src\video\SDL_yuv_mmx.c" RelativePath="..\..\src\video\SDL_yuv_mmx.c"
> >
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;" CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadfood&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;" CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadfood&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -1150,6 +1150,22 @@ ...@@ -1150,6 +1150,22 @@
RelativePath="..\..\src\audio\SDL_wave.h" RelativePath="..\..\src\audio\SDL_wave.h"
> >
</File> </File>
<File
RelativePath="..\..\src\events\SDL_windowevents.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_windowevents_c.h"
>
</File>
<File
RelativePath="..\..\src\core\windows\SDL_windows.c"
>
</File>
<File
RelativePath="..\..\src\core\windows\SDL_windows.h"
>
</File>
<File <File
RelativePath="..\..\src\video\windows\SDL_windowsclipboard.c" RelativePath="..\..\src\video\windows\SDL_windowsclipboard.c"
> >
...@@ -1230,14 +1246,6 @@ ...@@ -1230,14 +1246,6 @@
RelativePath="..\..\src\video\windows\SDL_windowswindow.h" RelativePath="..\..\src\video\windows\SDL_windowswindow.h"
> >
</File> </File>
<File
RelativePath="..\..\src\events\SDL_windowevents.c"
>
</File>
<File
RelativePath="..\..\src\events\SDL_windowevents_c.h"
>
</File>
<File <File
RelativePath="..\..\src\video\SDL_yuv_mmx.c" RelativePath="..\..\src\video\SDL_yuv_mmx.c"
> >
......
...@@ -74,14 +74,12 @@ ...@@ -74,14 +74,12 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent> <PreBuildEvent>
<Message>Making sure basic SDL headers are in place...</Message> <Message>Making sure basic SDL headers are in place...</Message>
<Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY <Command>echo Copying SDL_config_windows.h to SDL_config.h...
echo Copying SDL_config_windows.h to SDL_config.h... copy /Y "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
:SDLCONFIGOKAY
if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
echo Creating stub SDL_revision.h file... echo Creating stub SDL_revision.h file...
echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h" echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
:SDLREVISIONOKAY :SDLREVISIONOKAY
</Command> </Command>
</PreBuildEvent> </PreBuildEvent>
...@@ -154,14 +152,12 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h" ...@@ -154,14 +152,12 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent> <PreBuildEvent>
<Message>Making sure basic SDL headers are in place...</Message> <Message>Making sure basic SDL headers are in place...</Message>
<Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY <Command>echo Copying SDL_config_windows.h to SDL_config.h...
echo Copying SDL_config_windows.h to SDL_config.h... copy /Y "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
:SDLCONFIGOKAY
if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
echo Creating stub SDL_revision.h file... echo Creating stub SDL_revision.h file...
echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h" echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
:SDLREVISIONOKAY :SDLREVISIONOKAY
</Command> </Command>
</PreBuildEvent> </PreBuildEvent>
...@@ -272,6 +268,7 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h" ...@@ -272,6 +268,7 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ClInclude Include="..\..\include\SDL_types.h" /> <ClInclude Include="..\..\include\SDL_types.h" />
<ClInclude Include="..\..\include\SDL_version.h" /> <ClInclude Include="..\..\include\SDL_version.h" />
<ClInclude Include="..\..\include\SDL_video.h" /> <ClInclude Include="..\..\include\SDL_video.h" />
<ClInclude Include="..\..\src\core\windows\SDL_windows.h" />
<ClInclude Include="..\..\src\events\blank_cursor.h" /> <ClInclude Include="..\..\src\events\blank_cursor.h" />
<ClInclude Include="..\..\src\events\default_cursor.h" /> <ClInclude Include="..\..\src\events\default_cursor.h" />
<ClInclude Include="..\..\src\audio\windx5\directx.h" /> <ClInclude Include="..\..\src\audio\windx5\directx.h" />
...@@ -345,6 +342,7 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h" ...@@ -345,6 +342,7 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ClInclude Include="..\..\src\video\windows\wmmsg.h" /> <ClInclude Include="..\..\src\video\windows\wmmsg.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\core\windows\SDL_windows.c" />
<ClCompile Include="..\..\src\events\SDL_clipboardevents.c" /> <ClCompile Include="..\..\src\events\SDL_clipboardevents.c" />
<ClCompile Include="..\..\src\events\SDL_gesture.c" /> <ClCompile Include="..\..\src\events\SDL_gesture.c" />
<ClCompile Include="..\..\src\events\SDL_touch.c" /> <ClCompile Include="..\..\src\events\SDL_touch.c" />
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;" CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;" CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;" CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;" CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;" CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
Description="Making sure basic SDL headers are in place..." Description="Making sure basic SDL headers are in place..."
CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;" CommandLine="echo Copying SDL_config_windows.h to SDL_config.h...&#x0D;&#x0A;copy /Y &quot;$(ProjectDir)\..\..\include\SDL_config_windows.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION &quot;hg-0:baadf00d&quot; &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
/> />
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
......
...@@ -101,14 +101,12 @@ ...@@ -101,14 +101,12 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent> <PreBuildEvent>
<Message>Making sure basic SDL headers are in place...</Message> <Message>Making sure basic SDL headers are in place...</Message>
<Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY <Command>echo Copying SDL_config_windows.h to SDL_config.h...
echo Copying SDL_config_windows.h to SDL_config.h... copy /Y "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
:SDLCONFIGOKAY
if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
echo Creating stub SDL_revision.h file... echo Creating stub SDL_revision.h file...
echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h" echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
:SDLREVISIONOKAY</Command> :SDLREVISIONOKAY</Command>
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
...@@ -154,14 +152,12 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h" ...@@ -154,14 +152,12 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoSTDIO|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoSTDIO|Win32'">
<PreBuildEvent> <PreBuildEvent>
<Message>Making sure basic SDL headers are in place...</Message> <Message>Making sure basic SDL headers are in place...</Message>
<Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY <Command>echo Copying SDL_config_windows.h to SDL_config.h...
echo Copying SDL_config_windows.h to SDL_config.h... copy /Y "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
:SDLCONFIGOKAY
if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
echo Creating stub SDL_revision.h file... echo Creating stub SDL_revision.h file...
echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h" echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
:SDLREVISIONOKAY</Command> :SDLREVISIONOKAY</Command>
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
...@@ -207,14 +203,12 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h" ...@@ -207,14 +203,12 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent> <PreBuildEvent>
<Message>Making sure basic SDL headers are in place...</Message> <Message>Making sure basic SDL headers are in place...</Message>
<Command>if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY <Command>echo Copying SDL_config_windows.h to SDL_config.h...
echo Copying SDL_config_windows.h to SDL_config.h... copy /Y "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h"
:SDLCONFIGOKAY
if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY
echo Creating stub SDL_revision.h file... echo Creating stub SDL_revision.h file...
echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h" echo #define SDL_REVISION "hg-0:baadf00d" &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
:SDLREVISIONOKAY</Command> :SDLREVISIONOKAY</Command>
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
...@@ -261,4 +255,4 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h" ...@@ -261,4 +255,4 @@ echo #define SDL_REVISION 0 &gt;"$(ProjectDir)\..\..\include\SDL_revision.h"
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>
......
 
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}"
......
This diff is collapsed.
<?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
......
<?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"
/> />
......
<?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"
/> />
......
<?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"
/> />
......
<?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"
/> />
......
...@@ -34,7 +34,7 @@ static SDL_Color bg_color = { 50, 50, 100, 255 }; /* color of background * ...@@ -34,7 +34,7 @@ static SDL_Color bg_color = { 50, 50, 100, 255 }; /* color of background *
*/ */
typedef struct typedef struct
{ {
SDL_scancode scancode; /* scancode of the key we want to map */ SDL_ScanCode scancode; /* scancode of the key we want to map */
int allow_no_mod; /* is the map valid if the key has no modifiers? */ int allow_no_mod; /* is the map valid if the key has no modifiers? */
SDLMod mod; /* what modifiers are allowed for the mapping */ SDLMod mod; /* what modifiers are allowed for the mapping */
int index; /* what index in the font does the scancode map to */ int index; /* what index in the font does the scancode map to */
...@@ -103,7 +103,7 @@ fontMapping map[TABLE_SIZE] = { ...@@ -103,7 +103,7 @@ fontMapping map[TABLE_SIZE] = {
}; };
/* /*
This function maps an SDL_keysym to an index in the bitmap font. This function maps an SDL_KeySym to an index in the bitmap font.
It does so by scanning through the font mapping table one entry It does so by scanning through the font mapping table one entry
at a time. at a time.
...@@ -113,7 +113,7 @@ fontMapping map[TABLE_SIZE] = { ...@@ -113,7 +113,7 @@ fontMapping map[TABLE_SIZE] = {
If there is no entry for the key, -1 is returned If there is no entry for the key, -1 is returned
*/ */
int int
keyToIndex(SDL_keysym key) keyToIndex(SDL_KeySym key)
{ {
int i, index = -1; int i, index = -1;
for (i = 0; i < TABLE_SIZE; i++) { for (i = 0; i < TABLE_SIZE; i++) {
...@@ -240,7 +240,7 @@ main(int argc, char *argv[]) ...@@ -240,7 +240,7 @@ main(int argc, char *argv[])
SDL_Window *window; SDL_Window *window;
SDL_Event event; /* last event received */ SDL_Event event; /* last event received */
SDLMod mod; /* key modifiers of last key we pushed */ SDLMod mod; /* key modifiers of last key we pushed */
SDL_scancode scancode; /* scancode of last key we pushed */ SDL_ScanCode scancode; /* scancode of last key we pushed */
if (SDL_Init(SDL_INIT_VIDEO) < 0) { if (SDL_Init(SDL_INIT_VIDEO) < 0) {
printf("Error initializing SDL: %s", SDL_GetError()); printf("Error initializing SDL: %s", SDL_GetError());
......
...@@ -123,6 +123,10 @@ ...@@ -123,6 +123,10 @@
00D8DA2A1195093100638393 /* testsdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8DA1A1195093100638393 /* testsdl.c */; }; 00D8DA2A1195093100638393 /* testsdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 00D8DA1A1195093100638393 /* testsdl.c */; };
044E5F8511E6051C0076F181 /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 044E5F8411E6051C0076F181 /* SDL_clipboard.h */; settings = {ATTRIBUTES = (Public, ); }; }; 044E5F8511E6051C0076F181 /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 044E5F8411E6051C0076F181 /* SDL_clipboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
044E5F8611E6051C0076F181 /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 044E5F8411E6051C0076F181 /* SDL_clipboard.h */; }; 044E5F8611E6051C0076F181 /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 044E5F8411E6051C0076F181 /* SDL_clipboard.h */; };
0469A10B12EE4BF100B846D6 /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0469A10912EE4BF100B846D6 /* SDL_blendmode.h */; settings = {ATTRIBUTES = (Public, ); }; };
0469A10C12EE4BF100B846D6 /* SDL_scalemode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0469A10A12EE4BF100B846D6 /* SDL_scalemode.h */; settings = {ATTRIBUTES = (Public, ); }; };
0469A10D12EE4BF100B846D6 /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0469A10912EE4BF100B846D6 /* SDL_blendmode.h */; };
0469A10E12EE4BF100B846D6 /* SDL_scalemode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0469A10A12EE4BF100B846D6 /* SDL_scalemode.h */; };
04BD000812E6671800899322 /* SDL_diskaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD8812E6671700899322 /* SDL_diskaudio.c */; }; 04BD000812E6671800899322 /* SDL_diskaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD8812E6671700899322 /* SDL_diskaudio.c */; };
04BD000912E6671800899322 /* SDL_diskaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFD8912E6671700899322 /* SDL_diskaudio.h */; }; 04BD000912E6671800899322 /* SDL_diskaudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BDFD8912E6671700899322 /* SDL_diskaudio.h */; };
04BD001012E6671800899322 /* SDL_dummyaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD9412E6671700899322 /* SDL_dummyaudio.c */; }; 04BD001012E6671800899322 /* SDL_dummyaudio.c in Sources */ = {isa = PBXBuildFile; fileRef = 04BDFD9412E6671700899322 /* SDL_dummyaudio.c */; };
...@@ -578,7 +582,7 @@ ...@@ -578,7 +582,7 @@
04DEA57311E6006A00386CAC /* SDL_input.h in Headers */ = {isa = PBXBuildFile; fileRef = 04DEA56F11E6006A00386CAC /* SDL_input.h */; }; 04DEA57311E6006A00386CAC /* SDL_input.h in Headers */ = {isa = PBXBuildFile; fileRef = 04DEA56F11E6006A00386CAC /* SDL_input.h */; };
04F2AF691104AC4500D6DDF7 /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F2AF681104AC4500D6DDF7 /* SDL_assert.h */; settings = {ATTRIBUTES = (Public, ); }; }; 04F2AF691104AC4500D6DDF7 /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F2AF681104AC4500D6DDF7 /* SDL_assert.h */; settings = {ATTRIBUTES = (Public, ); }; };
04F2AF6A1104AC4500D6DDF7 /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F2AF681104AC4500D6DDF7 /* SDL_assert.h */; }; 04F2AF6A1104AC4500D6DDF7 /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = 04F2AF681104AC4500D6DDF7 /* SDL_assert.h */; };
453773821207C518002F0F45 /* SDL_shape.h in Headers */ = {isa = PBXBuildFile; fileRef = 453773811207C518002F0F45 /* SDL_shape.h */; }; 453773821207C518002F0F45 /* SDL_shape.h in Headers */ = {isa = PBXBuildFile; fileRef = 453773811207C518002F0F45 /* SDL_shape.h */; settings = {ATTRIBUTES = (Public, ); }; };
8CB0A77811F6A87F00CBA2DE /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CB0A77611F6A87F00CBA2DE /* SDL_gesture.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8CB0A77811F6A87F00CBA2DE /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CB0A77611F6A87F00CBA2DE /* SDL_gesture.h */; settings = {ATTRIBUTES = (Public, ); }; };
8CB0A77911F6A87F00CBA2DE /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CB0A77711F6A87F00CBA2DE /* SDL_touch.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8CB0A77911F6A87F00CBA2DE /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CB0A77711F6A87F00CBA2DE /* SDL_touch.h */; settings = {ATTRIBUTES = (Public, ); }; };
BECDF6760761BA81005FE872 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CF8DC405C444E400E5DC7F /* SDL_cpuinfo.h */; }; BECDF6760761BA81005FE872 /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CF8DC405C444E400E5DC7F /* SDL_cpuinfo.h */; };
...@@ -711,6 +715,8 @@ ...@@ -711,6 +715,8 @@
00D8DA1A1195093100638393 /* testsdl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testsdl.c; path = ../../test/automated/testsdl.c; sourceTree = SOURCE_ROOT; }; 00D8DA1A1195093100638393 /* testsdl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testsdl.c; path = ../../test/automated/testsdl.c; sourceTree = SOURCE_ROOT; };
00F5D79E0990CA0D0051C449 /* UniversalBinaryNotes.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = UniversalBinaryNotes.rtf; sourceTree = "<group>"; }; 00F5D79E0990CA0D0051C449 /* UniversalBinaryNotes.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = UniversalBinaryNotes.rtf; sourceTree = "<group>"; };
044E5F8411E6051C0076F181 /* SDL_clipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_clipboard.h; path = ../../include/SDL_clipboard.h; sourceTree = SOURCE_ROOT; }; 044E5F8411E6051C0076F181 /* SDL_clipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_clipboard.h; path = ../../include/SDL_clipboard.h; sourceTree = SOURCE_ROOT; };
0469A10912EE4BF100B846D6 /* SDL_blendmode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_blendmode.h; path = ../../include/SDL_blendmode.h; sourceTree = SOURCE_ROOT; };
0469A10A12EE4BF100B846D6 /* SDL_scalemode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_scalemode.h; path = ../../include/SDL_scalemode.h; sourceTree = SOURCE_ROOT; };
04BDFD7412E6671700899322 /* SDL_atomic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_atomic.c; sourceTree = "<group>"; }; 04BDFD7412E6671700899322 /* SDL_atomic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_atomic.c; sourceTree = "<group>"; };
04BDFD7512E6671700899322 /* SDL_spinlock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_spinlock.c; sourceTree = "<group>"; }; 04BDFD7512E6671700899322 /* SDL_spinlock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_spinlock.c; sourceTree = "<group>"; };
04BDFD8812E6671700899322 /* SDL_diskaudio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_diskaudio.c; sourceTree = "<group>"; }; 04BDFD8812E6671700899322 /* SDL_diskaudio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_diskaudio.c; sourceTree = "<group>"; };
...@@ -1141,14 +1147,13 @@ ...@@ -1141,14 +1147,13 @@
0153844A006D81B07F000001 /* Public Headers */ = { 0153844A006D81B07F000001 /* Public Headers */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
8CB0A77611F6A87F00CBA2DE /* SDL_gesture.h */,
8CB0A77711F6A87F00CBA2DE /* SDL_touch.h */,
0C5AF5E501191D2B7F000001 /* begin_code.h */, 0C5AF5E501191D2B7F000001 /* begin_code.h */,
0C5AF5E601191D2B7F000001 /* close_code.h */, 0C5AF5E601191D2B7F000001 /* close_code.h */,
0C5AF5FF01191D2B7F000001 /* SDL.h */, 0C5AF5FF01191D2B7F000001 /* SDL.h */,
04F2AF681104AC4500D6DDF7 /* SDL_assert.h */, 04F2AF681104AC4500D6DDF7 /* SDL_assert.h */,
00CFA67A106B44CE00758660 /* SDL_atomic.h */, 00CFA67A106B44CE00758660 /* SDL_atomic.h */,
0C5AF5E801191D2B7F000001 /* SDL_audio.h */, 0C5AF5E801191D2B7F000001 /* SDL_audio.h */,
0469A10912EE4BF100B846D6 /* SDL_blendmode.h */,
044E5F8411E6051C0076F181 /* SDL_clipboard.h */, 044E5F8411E6051C0076F181 /* SDL_clipboard.h */,
00CFA67B106B44CE00758660 /* SDL_compat.h */, 00CFA67B106B44CE00758660 /* SDL_compat.h */,
00162D3709BD1FA90037C8D0 /* SDL_config.h */, 00162D3709BD1FA90037C8D0 /* SDL_config.h */,
...@@ -1158,6 +1163,7 @@ ...@@ -1158,6 +1163,7 @@
0C5AF5EC01191D2B7F000001 /* SDL_endian.h */, 0C5AF5EC01191D2B7F000001 /* SDL_endian.h */,
0C5AF5ED01191D2B7F000001 /* SDL_error.h */, 0C5AF5ED01191D2B7F000001 /* SDL_error.h */,
0C5AF5EE01191D2B7F000001 /* SDL_events.h */, 0C5AF5EE01191D2B7F000001 /* SDL_events.h */,
8CB0A77611F6A87F00CBA2DE /* SDL_gesture.h */,
00CFA67C106B44CE00758660 /* SDL_haptic.h */, 00CFA67C106B44CE00758660 /* SDL_haptic.h */,
04DEA56F11E6006A00386CAC /* SDL_input.h */, 04DEA56F11E6006A00386CAC /* SDL_input.h */,
0C5AF5F001191D2B7F000001 /* SDL_joystick.h */, 0C5AF5F001191D2B7F000001 /* SDL_joystick.h */,
...@@ -1176,6 +1182,7 @@ ...@@ -1176,6 +1182,7 @@
00CFA67F106B44CE00758660 /* SDL_rect.h */, 00CFA67F106B44CE00758660 /* SDL_rect.h */,
00A6EBD91078D569001EEA06 /* SDL_revision.h */, 00A6EBD91078D569001EEA06 /* SDL_revision.h */,
0C5AF5F801191D2B7F000001 /* SDL_rwops.h */, 0C5AF5F801191D2B7F000001 /* SDL_rwops.h */,
0469A10A12EE4BF100B846D6 /* SDL_scalemode.h */,
00CFA680106B44CE00758660 /* SDL_scancode.h */, 00CFA680106B44CE00758660 /* SDL_scancode.h */,
453773811207C518002F0F45 /* SDL_shape.h */, 453773811207C518002F0F45 /* SDL_shape.h */,
00162D3909BD1FA90037C8D0 /* SDL_stdinc.h */, 00162D3909BD1FA90037C8D0 /* SDL_stdinc.h */,
...@@ -1183,6 +1190,7 @@ ...@@ -1183,6 +1190,7 @@
0C5AF5F901191D2B7F000001 /* SDL_syswm.h */, 0C5AF5F901191D2B7F000001 /* SDL_syswm.h */,
0C5AF5FA01191D2B7F000001 /* SDL_thread.h */, 0C5AF5FA01191D2B7F000001 /* SDL_thread.h */,
0C5AF5FB01191D2B7F000001 /* SDL_timer.h */, 0C5AF5FB01191D2B7F000001 /* SDL_timer.h */,
8CB0A77711F6A87F00CBA2DE /* SDL_touch.h */,
0C5AF5FC01191D2B7F000001 /* SDL_types.h */, 0C5AF5FC01191D2B7F000001 /* SDL_types.h */,
0C5AF5FD01191D2B7F000001 /* SDL_version.h */, 0C5AF5FD01191D2B7F000001 /* SDL_version.h */,
0C5AF5FE01191D2B7F000001 /* SDL_video.h */, 0C5AF5FE01191D2B7F000001 /* SDL_video.h */,
...@@ -1952,6 +1960,8 @@ ...@@ -1952,6 +1960,8 @@
04BD020712E6671800899322 /* Xvlib.h in Headers */, 04BD020712E6671800899322 /* Xvlib.h in Headers */,
04BD020812E6671800899322 /* Xvproto.h in Headers */, 04BD020812E6671800899322 /* Xvproto.h in Headers */,
04BD021512E6671800899322 /* Xvlibint.h in Headers */, 04BD021512E6671800899322 /* Xvlibint.h in Headers */,
0469A10B12EE4BF100B846D6 /* SDL_blendmode.h in Headers */,
0469A10C12EE4BF100B846D6 /* SDL_scalemode.h in Headers */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -2080,6 +2090,8 @@ ...@@ -2080,6 +2090,8 @@
04BD041F12E6671800899322 /* Xvlib.h in Headers */, 04BD041F12E6671800899322 /* Xvlib.h in Headers */,
04BD042012E6671800899322 /* Xvproto.h in Headers */, 04BD042012E6671800899322 /* Xvproto.h in Headers */,
04BD042C12E6671800899322 /* Xvlibint.h in Headers */, 04BD042C12E6671800899322 /* Xvlibint.h in Headers */,
0469A10D12EE4BF100B846D6 /* SDL_blendmode.h in Headers */,
0469A10E12EE4BF100B846D6 /* SDL_scalemode.h in Headers */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -2280,7 +2292,7 @@ ...@@ -2280,7 +2292,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "# The underlying scripts require calling hg to get revision info.\n# Since hg may not be in the standard Xcode path, I am sourcing .bashrc\n# But I don't know what to do if people are using other shells.\nif test -f ~/.bash_profile; then source ~/.bash_profile; fi\nif test -f ~/.bashrc; then source ~/.bashrc; fi\nsh ../../build-scripts/updaterev.sh\n"; shellScript = "# The official HG installer puts the binary in /usr/local/bin, so add that\n# to Xcode's path and see if the hg executable is found. Otherwise, source\n# the user's bash settings file as a last resort.\nPATH=$PATH:/usr/local/bin\nif ! which -s hg ; then\n if test -f ~/.bash_profile; then source ~/.bash_profile; fi\nfi\nsh ../../build-scripts/updaterev.sh\n";
}; };
0083103E1072EA5700A531F1 /* ShellScript */ = { 0083103E1072EA5700A531F1 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
......
...@@ -3014,7 +3014,7 @@ mingw* | pw32*) ...@@ -3014,7 +3014,7 @@ mingw* | pw32*)
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid' lt_cv_file_magic_cmd='func_win32_libid'
else else
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f' lt_cv_file_magic_cmd='$OBJDUMP -f'
fi fi
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
......
...@@ -2560,7 +2560,7 @@ func_win32_libid () ...@@ -2560,7 +2560,7 @@ func_win32_libid ()
;; ;;
*ar\ archive*) # could be an import, or static *ar\ archive*) # could be an import, or static
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
$EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | win32_nmres=`eval $NM -f posix -A $1 |
$SED -n -e ' $SED -n -e '
1,100{ 1,100{
......
...@@ -301,6 +301,7 @@ if test x$enable_gcc_atomics = xyes; then ...@@ -301,6 +301,7 @@ if test x$enable_gcc_atomics = xyes; then
int a; int a;
void *x, *y, *z; void *x, *y, *z;
__sync_lock_test_and_set(&a, 4); __sync_lock_test_and_set(&a, 4);
__sync_lock_test_and_set(&x, y);
__sync_fetch_and_add(&a, 1); __sync_fetch_and_add(&a, 1);
__sync_bool_compare_and_swap(&a, 5, 10); __sync_bool_compare_and_swap(&a, 5, 10);
__sync_bool_compare_and_swap(&x, y, z); __sync_bool_compare_and_swap(&x, y, z);
...@@ -317,6 +318,7 @@ if test x$enable_gcc_atomics = xyes; then ...@@ -317,6 +318,7 @@ if test x$enable_gcc_atomics = xyes; then
],[ ],[
int a; int a;
__sync_lock_test_and_set(&a, 1); __sync_lock_test_and_set(&a, 1);
__sync_lock_release(&a);
],[ ],[
have_gcc_sync_lock_test_and_set=yes have_gcc_sync_lock_test_and_set=yes
]) ])
...@@ -2446,6 +2448,10 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau ...@@ -2446,6 +2448,10 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
CheckWINDOWS CheckWINDOWS
CheckWINDOWSGL CheckWINDOWSGL
CheckDIRECTX CheckDIRECTX
# Set up the core platform files
SOURCES="$SOURCES $srcdir/src/core/windows/*.c"
# Set up files for the video library # Set up files for the video library
if test x$enable_video = xyes; then if test x$enable_video = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS) AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS)
...@@ -2662,32 +2668,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau ...@@ -2662,32 +2668,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
fi fi
;; ;;
*-riscos)
ARCH=riscos
CheckOSS
CheckPTHREAD
# Set up files for the video library
if test x$enable_video = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS)
SOURCES="$SOURCES $srcdir/src/video/riscos/*.c"
SOURCES="$SOURCES $srcdir/src/video/riscos/*.S"
have_video=yes
fi
# Set up files for the joystick library
if test x$enable_joystick = xyes; then
AC_DEFINE(SDL_JOYSTICK_RISCOS)
SOURCES="$SOURCES $srcdir/src/joystick/riscos/*.c"
have_joystick=yes
fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
AC_DEFINE(SDL_TIMER_RISCOS)
SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c"
have_timers=yes
fi
# The RISC OS platform requires special setup.
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ljpeg -ltiff -lpng -lz"
;;
*) *)
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Unsupported host: Please add to configure.in *** Unsupported host: Please add to configure.in
...@@ -2732,10 +2712,10 @@ if test x$SDLMAIN_SOURCES = x; then ...@@ -2732,10 +2712,10 @@ if test x$SDLMAIN_SOURCES = x; then
fi fi
OBJECTS=`echo $SOURCES` OBJECTS=`echo $SOURCES`
DEPENDS=`echo $SOURCES` DEPENDS=`echo $SOURCES | tr ' ' '\n'`
for EXT in asm cc m c S; do for EXT in asm cc m c S; do
OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.'$EXT',$(objects)/\1.lo,g'` OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.'$EXT',$(objects)/\1.lo,g'`
DEPENDS=`echo "$DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.$EXT,\\\\ DEPENDS=`echo "$DEPENDS" | sed "s,^\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.$EXT\\$,\\\\
\\$(objects)/\\2.lo: \\1/\\2.$EXT\\\\ \\$(objects)/\\2.lo: \\1/\\2.$EXT\\\\
\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` \\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
done done
......
...@@ -116,7 +116,6 @@ extern "C" { ...@@ -116,7 +116,6 @@ extern "C" {
#define SDL_INIT_JOYSTICK 0x00000200 #define SDL_INIT_JOYSTICK 0x00000200
#define SDL_INIT_HAPTIC 0x00001000 #define SDL_INIT_HAPTIC 0x00001000
#define SDL_INIT_NOPARACHUTE 0x00100000 /**< Don't catch fatal signals */ #define SDL_INIT_NOPARACHUTE 0x00100000 /**< Don't catch fatal signals */
#define SDL_INIT_EVENTTHREAD 0x01000000 /**< Not supported on all OS's */
#define SDL_INIT_EVERYTHING 0x0000FFFF #define SDL_INIT_EVERYTHING 0x0000FFFF
/*@}*/ /*@}*/
......
...@@ -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__)))
......
This diff is collapsed.
...@@ -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
...@@ -223,6 +223,9 @@ struct SDL_SysWMinfo; ...@@ -223,6 +223,9 @@ struct SDL_SysWMinfo;
*/ */
/*@{*/ /*@{*/
#define SDL_keysym SDL_KeySym
#define SDL_scancode SDL_ScanCode
/** /**
* \name Renamed keys * \name Renamed keys
* *
...@@ -341,6 +344,13 @@ typedef SDL_Window* SDL_WindowID; ...@@ -341,6 +344,13 @@ typedef SDL_Window* SDL_WindowID;
#define SDL_RenderFill(X) (X) ? SDL_RenderFillRect(X) : SDL_RenderClear() #define SDL_RenderFill(X) (X) ? SDL_RenderFillRect(X) : SDL_RenderClear()
#define SDL_KillThread(X) #define SDL_KillThread(X)
/* The timeslice and timer resolution are no longer relevant */
#define SDL_TIMESLICE 10
#define TIMER_RESOLUTION 10
typedef Uint32 (SDLCALL * SDL_OldTimerCallback) (Uint32 interval);
extern DECLSPEC int SDLCALL SDL_SetTimer(Uint32 interval, SDL_OldTimerCallback callback);
extern DECLSPEC int SDLCALL SDL_putenv(const char *variable); extern DECLSPEC int SDLCALL SDL_putenv(const char *variable);
/*@}*//*Compatibility*/ /*@}*//*Compatibility*/
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
#undef HAVE_REALLOC #undef HAVE_REALLOC
#undef HAVE_FREE #undef HAVE_FREE
#undef HAVE_ALLOCA #undef HAVE_ALLOCA
#ifndef __WINDOWS__ /* Don't use C runtime versions of these on Windows */ #ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */
#undef HAVE_GETENV #undef HAVE_GETENV
#undef HAVE_SETENV #undef HAVE_SETENV
#undef HAVE_PUTENV #undef HAVE_PUTENV
...@@ -221,7 +221,6 @@ ...@@ -221,7 +221,6 @@
#undef SDL_JOYSTICK_IOKIT #undef SDL_JOYSTICK_IOKIT
#undef SDL_JOYSTICK_LINUX #undef SDL_JOYSTICK_LINUX
#undef SDL_JOYSTICK_NDS #undef SDL_JOYSTICK_NDS
#undef SDL_JOYSTICK_RISCOS
#undef SDL_JOYSTICK_WINMM #undef SDL_JOYSTICK_WINMM
#undef SDL_JOYSTICK_USBHID #undef SDL_JOYSTICK_USBHID
#undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
...@@ -251,7 +250,6 @@ ...@@ -251,7 +250,6 @@
#undef SDL_TIMER_BEOS #undef SDL_TIMER_BEOS
#undef SDL_TIMER_DUMMY #undef SDL_TIMER_DUMMY
#undef SDL_TIMER_NDS #undef SDL_TIMER_NDS
#undef SDL_TIMER_RISCOS
#undef SDL_TIMER_UNIX #undef SDL_TIMER_UNIX
#undef SDL_TIMER_WINDOWS #undef SDL_TIMER_WINDOWS
#undef SDL_TIMER_WINCE #undef SDL_TIMER_WINCE
...@@ -265,7 +263,6 @@ ...@@ -265,7 +263,6 @@
#undef SDL_VIDEO_DRIVER_NDS #undef SDL_VIDEO_DRIVER_NDS
#undef SDL_VIDEO_DRIVER_PHOTON #undef SDL_VIDEO_DRIVER_PHOTON
#undef SDL_VIDEO_DRIVER_QNXGF #undef SDL_VIDEO_DRIVER_QNXGF
#undef SDL_VIDEO_DRIVER_RISCOS
#undef SDL_VIDEO_DRIVER_WINDOWS #undef SDL_VIDEO_DRIVER_WINDOWS
#undef SDL_VIDEO_DRIVER_X11 #undef SDL_VIDEO_DRIVER_X11
#undef SDL_VIDEO_DRIVER_X11_DYNAMIC #undef SDL_VIDEO_DRIVER_X11_DYNAMIC
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -151,7 +151,7 @@ typedef struct SDL_KeyboardEvent ...@@ -151,7 +151,7 @@ typedef struct SDL_KeyboardEvent
Uint8 repeat; /**< Non-zero if this is a key repeat */ Uint8 repeat; /**< Non-zero if this is a key repeat */
Uint8 padding2; Uint8 padding2;
Uint8 padding3; Uint8 padding3;
SDL_keysym keysym; /**< The key that was pressed or released */ SDL_KeySym keysym; /**< The key that was pressed or released */
} SDL_KeyboardEvent; } SDL_KeyboardEvent;
#define SDL_TEXTEDITINGEVENT_TEXT_SIZE (32) #define SDL_TEXTEDITINGEVENT_TEXT_SIZE (32)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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