Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
  • Loading branch information
slouken committed Jul 10, 2006
1 parent 38ab2fa commit 466d3a4
Show file tree
Hide file tree
Showing 686 changed files with 121,608 additions and 102,713 deletions.
1 change: 1 addition & 0 deletions .indent.pro
@@ -0,0 +1 @@
-i4 -nut -nsc -br -ce -cdw -npcs
Binary file modified CWprojects.sea.bin
Binary file not shown.
1 change: 1 addition & 0 deletions Makefile.dc
Expand Up @@ -55,6 +55,7 @@ SRCS = \
src/video/dummy/SDL_nullevents.c \
src/video/dummy/SDL_nullmouse.c \
src/video/dummy/SDL_nullvideo.c \
src/video/glsdl/SDL_glsdl.c \
src/video/SDL_blit.c \
src/video/SDL_blit_0.c \
src/video/SDL_blit_1.c \
Expand Down
23 changes: 23 additions & 0 deletions Makefile.in
Expand Up @@ -167,6 +167,29 @@ dist $(distfile):
rpm: $(distfile)
rpmbuild -ta $?

# Run indent on the source to standardize coding style
indent:
@echo "Running indent... modified files:"
@cd $(srcdir) && \
find . \( \
-name '*.h' -o \
-name '*.c' -o \
-name '*.cc' \) \
-print | \
while read file; do \
indent "$$file" -o "$$file.indent"; \
if cmp "$$file" "$$file.indent" >/dev/null; then \
rm -f "$$file.indent"; \
else \
echo "$$file"; \
mv -f "$$file.indent" "$$file"; \
fi; \
done

# Run indent and then commit modified files
commit: indent
svn commit

# Create a SVN snapshot that people can run update on
snapshot:
svn co svn://libsdl.org/trunk/SDL
Expand Down
16 changes: 7 additions & 9 deletions README.OS2
Expand Up @@ -3,7 +3,7 @@
SDL on OS/2
===========

Last updated on May. 17, 2006.
Last updated on May. 1, 2006.


1. How to compile?
Expand All @@ -13,6 +13,8 @@ To compile this, you'll need the followings installed:
- The OS/2 Developer's Toolkit
- The OpenWatcom compiler
(http://www.openwatcom.org)
- The FSLib library
(ftp://ftp.netlabs.org/pub/SDL)

First of all, you have to unzip the Watcom-OS2.zip file. This will result in a
file called "makefile" and a file called "setvars.cmd" in this folder (and some
Expand All @@ -30,7 +32,7 @@ is full of printf()'s, so if something goes wrong, its output can help a lot
for debugging.

Then run "wmake".
This should create the SDL12.DLL and the corresponding SDL12.LIB file here.
This should create the SDL.DLL and the corresponding SDL.LIB file here.

To test applications, it's a good idea to use the 'debug' build of SDL, and
redirect the standard output and standard error output to files, to see what
Expand All @@ -46,8 +48,8 @@ wmake
2. How to compile the testapps?
-------------------------------

Once you have SDL12.DLL compiled, navigate into the 'test' folder, copy in
there the newly built SDL12.DLL, and copy in there FSLib.DLL.
Once you have SDL.DLL compiled, navigate into the 'test' folder, copy in there
the newly built SDL.DLL, and copy in there FSLib.DLL.

Then run "wmake" in there to compile some of the testapps.

Expand Down Expand Up @@ -189,10 +191,6 @@ please, be our guest and contact us!
10. Changelog of the OS/2 port
------------------------------

Version 1.2.10 - 2006-05-17 - Doodle
- Small modifications for v1.2.10 release
- Changed DLL name to include version info (currently SDL12.dll)

Version 1.2 - 2006-05-01 - Doodle
- Modified makefile system to have only one makefile
- Included FSLib headers, DLL and LIB file
Expand All @@ -218,7 +216,7 @@ Version 1.2.7 - 2005-12-22 - Doodle
SET SDL_USE_PROPORTIONAL_WINDOW=1
dosbox.exe
)
or, if you have the HOME environment variable set, then SDL12.DLL will
or, if you have the HOME environment variable set, then SDL.DLL will
create a file in that directory called .sdl.proportionals, and you can
put there the name of executable files that will be automatically made
proportional.
Expand Down
3 changes: 3 additions & 0 deletions TODO
Expand Up @@ -2,6 +2,9 @@
Wish list for the 1.3 development branch:
http://bugzilla.libsdl.org/

* Add a way to register custom events
* Add internal support for adding video modes and refresh rates
* Support querying and setting refresh rate with video modes
* Add mousewheel events (new unified event architecture?)
* DirectInput joystick support needs to be implemented
* Be able to enumerate and select available audio and video drivers
Expand Down
1 change: 1 addition & 0 deletions UNDER_CONSTRUCTION.txt
@@ -0,0 +1 @@
WARNING: This code is under construction, may not build, and is unstable!
Binary file modified VisualC.zip
Binary file not shown.
Binary file modified Watcom-OS2.zip
Binary file not shown.
10 changes: 5 additions & 5 deletions WhatsNew
@@ -1,7 +1,11 @@

This is a list of API changes in SDL's version history.

Version 1.0:
1.3.0:
Added SDL_GetNumVideoDrivers() and SDL_GetVideoDriver().
Replaced SDL_VideoDriverName() with SDL_GetCurrentVideoDriver()
Added SDL_GetNumAudioDrivers() and SDL_GetAudioDriver().
Replaced SDL_AudioDriverName() with SDL_GetCurrentAudioDriver()

1.2.10:
If SDL_OpenAudio() is passed zero for the desired format
Expand Down Expand Up @@ -416,8 +420,6 @@ Version 1.0:
1.0.0:
New public release

Version 0.11:

0.11.5:
A new function SDL_GetVideoSurface() has been added, and returns
a pointer to the current display surface.
Expand All @@ -436,8 +438,6 @@ Version 0.11:
installing fatal signal handlers on operating systems that support
them.

Version 0.9:

0.9.15:
SDL_CreateColorCursor() has been removed. Color cursors should
be implemented as sprites, blitted by the application when the
Expand Down
78 changes: 51 additions & 27 deletions configure.in
Expand Up @@ -15,10 +15,10 @@ dnl Set various version strings - taken gratefully from the GTk sources
# set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0.
#
SDL_MAJOR_VERSION=1
SDL_MINOR_VERSION=2
SDL_MICRO_VERSION=11
SDL_MINOR_VERSION=3
SDL_MICRO_VERSION=0
SDL_INTERFACE_AGE=0
SDL_BINARY_AGE=11
SDL_BINARY_AGE=0
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION

AC_SUBST(SDL_MAJOR_VERSION)
Expand Down Expand Up @@ -1533,6 +1533,20 @@ CheckMacGL()
fi
}

dnl Find glSDL
CheckglSDL()
{
AC_ARG_ENABLE(video-glsdl,
[ --enable-video-glsdl use glSDL video driver [default=yes]],
, enable_video_glsdl=yes)
AC_MSG_CHECKING(for glSDL support)
AC_MSG_RESULT($video_opengl)
if test x$video_opengl = xyes -a x$enable_video_glsdl = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_GLSDL)
SOURCES="$SOURCES $srcdir/src/video/glsdl/*.c"
fi
}

dnl Check for Mesa offscreen rendering
CheckAtariOSMesa()
{
Expand Down Expand Up @@ -1847,13 +1861,6 @@ AC_HELP_STRING([--enable-stdio-redirect], [Redirect STDIO to files on Win32 [[de
if test x$enable_stdio_redirect != xyes; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_STDIO_REDIRECT"
fi

if test x$enable_video = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB)
SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c"
SOURCES="$SOURCES $srcdir/src/video/windib/*.c"
have_video=yes
fi
}

dnl Find the DirectX includes and libraries
Expand All @@ -1863,18 +1870,9 @@ CheckDIRECTX()
AC_HELP_STRING([--enable-directx], [use DirectX for Win32 audio/video [[default=yes]]]),
, enable_directx=yes)
if test x$enable_directx = xyes; then
have_directx=no
AC_CHECK_HEADER(ddraw.h, have_ddraw=yes)
AC_CHECK_HEADER(d3d9.h, have_d3d=yes)
AC_CHECK_HEADER(dsound.h, have_dsound=yes)
AC_CHECK_HEADER(dinput.h, use_dinput=yes)
if test x$have_ddraw = xyes -a x$have_dsound = xyes -a x$use_dinput = xyes; then
have_directx=yes
fi
if test x$enable_video = xyes -a x$have_directx = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW)
SOURCES="$SOURCES $srcdir/src/video/windx5/*.c"
have_video=yes
fi
fi
}

Expand Down Expand Up @@ -2155,6 +2153,7 @@ case "$host" in
CheckQtopia
CheckPicoGUI
CheckOpenGLX11
CheckglSDL
CheckInputEvents
CheckTslib
CheckUSBHID
Expand Down Expand Up @@ -2253,6 +2252,7 @@ case "$host" in
CheckPHOTON
CheckX11
CheckOpenGLX11
CheckglSDL
CheckPTHREAD
# Set up files for the audio library
if test x$enable_audio = xyes; then
Expand Down Expand Up @@ -2290,22 +2290,46 @@ case "$host" in
CheckDummyAudio
CheckWIN32
CheckWIN32GL
CheckglSDL
CheckDIRECTX
CheckNASM
# Set up files for the video library
if test x$enable_video = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_WIN32)
SOURCES="$SOURCES $srcdir/src/video/win32/*.c"
have_video=yes
AC_ARG_ENABLE(render-gdi,
AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]),
, enable_render_gdi=yes)
if test x$enable_render_gdi = xyes; then
AC_DEFINE(SDL_VIDEO_RENDER_GDI)
fi
AC_ARG_ENABLE(render-d3d,
AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[default=yes]]]),
, enable_render_d3d=yes)
if test x$enable_render_d3d = xyes -a x$have_d3d = xyes; then
AC_DEFINE(SDL_VIDEO_RENDER_D3D)
fi
fi
# Set up files for the audio library
if test x$enable_audio = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT)
SOURCES="$SOURCES $srcdir/src/audio/windib/*.c"
if test x$have_directx = xyes; then
if test x$have_dsound = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND)
SOURCES="$SOURCES $srcdir/src/audio/windx5/*.c"
fi
have_audio=yes
fi
# Set up files for the joystick library
if test x$enable_joystick = xyes; then
AC_DEFINE(SDL_JOYSTICK_WINMM)
SOURCES="$SOURCES $srcdir/src/joystick/win32/*.c"
if test x$have_dinput = xyes; then
AC_DEFINE(SDL_JOYSTICK_DINPUT)
SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c"
else
AC_DEFINE(SDL_JOYSTICK_WINMM)
SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c"
fi
have_joystick=yes
fi
# Set up files for the cdrom library
Expand Down Expand Up @@ -2336,10 +2360,7 @@ case "$host" in
have_loadso=yes
fi
# Set up the system libraries we need
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm"
if test x$have_directx = xyes; then
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldxguid"
fi
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lmsimg32 -lwinmm"
# The Win32 platform requires special setup
SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c"
SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
Expand All @@ -2354,6 +2375,7 @@ case "$host" in
CheckNASM
CheckBWINDOW
CheckBeGL
CheckglSDL
# Set up files for the audio library
if test x$enable_audio = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO)
Expand Down Expand Up @@ -2435,6 +2457,7 @@ case "$host" in
CheckX11
CheckMacGL
CheckOpenGLX11
CheckglSDL
CheckPTHREAD
CheckAltivec

Expand Down Expand Up @@ -2496,6 +2519,7 @@ case "$host" in
CheckAtariAudio
CheckAtariLdg
CheckAtariOSMesa
CheckglSDL
CheckPTH
# Set up files for the audio library
if test x$enable_threads = xyes -a x$enable_pth = xyes; then
Expand Down
58 changes: 0 additions & 58 deletions docs.html
Expand Up @@ -14,64 +14,6 @@

<H2> <A HREF="docs/index.html">API Documentation</A> </H2>

<H2> SDL 1.2.11 Release Notes </H2>
<P>
SDL 1.2.11 is a minor bug fix release.
</P>

<H3> Unix Notes </H3>

<BLOCKQUOTE>
<P>
Dynamic X11 loading is only enabled with gcc 4 supporting -fvisibility=hidden. This fixes crashes related to symbol collisions, and allows building on Solaris and IRIX.
</P>
<P>
Fixed building SDL with Xinerama disabled.
</P>
<P>
Fixed DRI OpenGL library loading, using RTLD_GLOBAL in dlopen().
</P>
<P>
Added pkgconfig configuration support.
</P>
</BLOCKQUOTE>

<H3> Windows Notes </H3>

<BLOCKQUOTE>
<P>
Setting SDL_GL_SWAP_CONTROL now works with Windows OpenGL.
</P>
<P>
The Win32 window positioning code works properly for windows with menus.
</P>
<P>
DirectSound audio quality has been improved on certain sound cards.
</P>
<P>
Fixed 5.1 audio channel ordering on Windows and Mac OS X.
</P>
<P>
Plugged a couple of minor memory leaks in the windib video driver.
</P>
<P>
Fixed type collision with stdint.h when building with gcc on Win32.
</P>
<P>
Fixed building with the Digital Mars Compiler on Win32.
</P>
</BLOCKQUOTE>

<H3> Mac OS X Notes </H3>

<BLOCKQUOTE>
<P>
The Quartz video driver supports 32x32 cursors on Mac OS X 10.3 and above.
</P>
</BLOCKQUOTE>

<IMG SRC="docs/images/rainbow.gif" ALT="[separator]" WIDTH="100%">

<H2> SDL 1.2.10 Release Notes </H2>
<P>
SDL 1.2.10 is a major release, featuring a revamp of the build system and many API improvements and bug fixes.
Expand Down

0 comments on commit 466d3a4

Please sign in to comment.