Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Removed the API changes to preserve SDL 1.2 stability
  • Loading branch information
slouken committed Mar 6, 2002
1 parent 0641106 commit c8a9f94
Show file tree
Hide file tree
Showing 21 changed files with 24 additions and 215 deletions.
12 changes: 0 additions & 12 deletions WhatsNew
Expand Up @@ -3,18 +3,6 @@ This is a list of API changes in SDL's version history.

Version 1.0:

1.2.4:
Added a new header file: SDL_loadso.h
It contains the following functions:
SDL_LoadObject(), SDL_LoadFunction(), SDL_UnloadObject()
The UNIX esd and arts audio code use these to dynamically load
their respective audio libraries.

Added SDL_LockRect() and SDL_UnlockRect() to lock a portion of a
surface. This may be more efficient than a full lock if you are
using a hardware surface and plan to make a few changes to small
areas in the surface.

1.2.0:
Added SDL_VIDEOEXPOSE event to signal that the screen needs to
be redrawn. This is currently only delivered to OpenGL windows
Expand Down
28 changes: 19 additions & 9 deletions configure.in
Expand Up @@ -15,7 +15,7 @@ dnl Set various version strings - taken gratefully from the GTk sources
SDL_MAJOR_VERSION=1
SDL_MINOR_VERSION=2
SDL_MICRO_VERSION=4
SDL_INTERFACE_AGE=0
SDL_INTERFACE_AGE=4
SDL_BINARY_AGE=4
SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION

Expand Down Expand Up @@ -328,11 +328,15 @@ CheckESD()
AM_PATH_ESD(0.2.8, use_esd=yes)
if test x$use_esd = xyes; then
AC_ARG_ENABLE(esd-shared,
[ --enable-esd-shared dynamically load ESD support [default=yes]],
, enable_esd_shared=yes)
[ --enable-esd-shared dynamically load ESD audio support [default=no]],
, enable_esd_shared=no)
esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
esd_lib=`ls $esd_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
echo "-- $esd_lib_spec -> $esd_lib"
if test x$enable_dlopen != xyes && \
test x$enable_esd_shared = xyes; then
AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option])
fi
if test x$enable_dlopen = xyes && \
test x$enable_esd_shared = xyes && test x$esd_lib != x; then
CFLAGS="$CFLAGS -DESD_SUPPORT -DESD_DYNAMIC=\$(esd_lib) $ESD_CFLAGS"
Expand Down Expand Up @@ -374,11 +378,15 @@ CheckARTSC()
AC_MSG_RESULT($audio_arts)
if test x$audio_arts = xyes; then
AC_ARG_ENABLE(arts-shared,
[ --enable-arts-shared dynamically load ESD support [default=yes]],
, enable_arts_shared=yes)
[ --enable-arts-shared dynamically load aRts audio support [default=no]],
, enable_arts_shared=no)
arts_lib_spec=`echo $ARTSC_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libarts.so.*/'`
arts_lib=`ls $arts_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
echo "-- $arts_lib_spec -> $arts_lib"
if test x$enable_dlopen != xyes && \
test x$enable_arts_shared = xyes; then
AC_MSG_ERROR([You must have dlopen() support and use the --enable-dlopen option])
fi
if test x$enable_dlopen = xyes && \
test x$enable_arts_shared = xyes && test x$arts_lib != x; then
CFLAGS="$CFLAGS -DARTSC_SUPPORT -DARTSC_DYNAMIC=\$(arts_lib) $ARTSC_CFLAGS"
Expand Down Expand Up @@ -998,7 +1006,9 @@ CheckOpenGL()
AC_MSG_RESULT($video_opengl)
if test x$video_opengl = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGL"
AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl")
if test x$use_dlopen != xyes; then
AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl")
fi
fi
fi
}
Expand Down Expand Up @@ -1383,8 +1393,8 @@ dnl Check for the dlfcn.h interface for dynamically loading objects
CheckDLOPEN()
{
AC_ARG_ENABLE(dlopen,
[ --enable-dlopen use dlopen for shared object loading [default=yes]],
, enable_dlopen=yes)
[ --enable-dlopen use dlopen for shared object loading [default=no]],
, enable_dlopen=no)
if test x$enable_dlopen = xyes; then
AC_MSG_CHECKING(for dlopen)
use_dlopen=no
Expand All @@ -1398,7 +1408,7 @@ CheckDLOPEN()

if test x$use_dlopen = xyes; then
CFLAGS="$CFLAGS -DUSE_DLOPEN"
SYSTEM_LIBS="$SYSTEM_LIBS -ldl"
AC_CHECK_LIB(dl, dlopen, SYSTEM_LIBS="$SYSTEM_LIBS -ldl")
fi
fi
}
Expand Down
2 changes: 0 additions & 2 deletions docs.html
Expand Up @@ -16,8 +16,6 @@ <H2>
Major changes since SDL 1.0.0:
</H2>
<UL>
<LI> 1.2.4: Added shared object loading functions in SDL_loadso.h
<LI> 1.2.4: Added SDL_LockRect() and SDL_UnlockRect()
<LI> 1.2.4: Incorporated XFree86 extension libraries into the source
<LI> 1.2.4: Added initial support for Atari (thanks Patrice!)
<LI> 1.2.4: Added support for joysticks on *BSD (thanks Wilbern!)
Expand Down
1 change: 0 additions & 1 deletion include/Makefile.am
Expand Up @@ -18,7 +18,6 @@ libSDLinclude_HEADERS = \
SDL_joystick.h \
SDL_keyboard.h \
SDL_keysym.h \
SDL_loadso.h \
SDL_main.h \
SDL_mouse.h \
SDL_mutex.h \
Expand Down
1 change: 0 additions & 1 deletion include/SDL.h
Expand Up @@ -34,7 +34,6 @@ static char rcsid =
#include "SDL_types.h"
#include "SDL_getenv.h"
#include "SDL_error.h"
#include "SDL_loadso.h"
#include "SDL_rwops.h"
#include "SDL_timer.h"
#include "SDL_audio.h"
Expand Down
20 changes: 0 additions & 20 deletions include/SDL_video.h
Expand Up @@ -531,26 +531,6 @@ extern DECLSPEC void SDL_FreeSurface(SDL_Surface *surface);
extern DECLSPEC int SDL_LockSurface(SDL_Surface *surface);
extern DECLSPEC void SDL_UnlockSurface(SDL_Surface *surface);

/*
* SDL_LockRect() locks a portion of the surface designated by the 'rect'
* parameter, and saves the resulting pixels and pitch in the arguments.
* The rect will be clipped if it extends beyond the bounds of the surface
*
* This may be more efficient than a full lock if you are using a hardware
* surface and plan to make a few changes to small areas in the surface.
*
* While a rectangle is locked, no other lock or blit call may be called
* on the surface. No operating system or library calls should be made
* between lock/unlock pairs, as critical system locks may be held during
* this time.
*
* After the surface is unlocked, the pixels pointer is no longer valid.
*
* SDL_LockRect() returns 0, or -1 if the surface couldn't be locked.
*/
extern DECLSPEC int SDL_LockRect(SDL_Surface *surface, SDL_Rect *rect, void **pixels, int *pitch);
extern DECLSPEC void SDL_UnlockRect(SDL_Surface *surface);

/*
* Load a surface from a seekable SDL data source (memory or file.)
* If 'freesrc' is non-zero, the source will be closed after being read.
Expand Down
2 changes: 1 addition & 1 deletion sdl-config.in
Expand Up @@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@
exec_prefix_set=no

usage="\
Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"

if test $# -eq 0; then
echo "${usage}" 1>&2
Expand Down
3 changes: 2 additions & 1 deletion src/Makefile.am
Expand Up @@ -38,5 +38,6 @@ GENERAL_SRCS = \
SDL_fatal.c \
SDL_fatal.h \
SDL_getenv.c \
SDL_loadso.c
SDL_loadso.c \
SDL_loadso.h

1 change: 1 addition & 0 deletions src/SDL_loadso.c
Expand Up @@ -44,6 +44,7 @@ static char rcsid =
/*#error Unsupported dynamic link environment*/
#endif /* system type */

#include "SDL_types.h"
#include "SDL_error.h"
#include "SDL_loadso.h"

Expand Down
1 change: 1 addition & 0 deletions include/SDL_loadso.h → src/SDL_loadso.h
Expand Up @@ -27,6 +27,7 @@ static char rcsid =

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* System dependent library loading routines */
/* Note: This API isn't meant for public release until SDL 1.3 */

#ifndef _SDL_loadso_h
#define _SDL_loadso_h
Expand Down
1 change: 0 additions & 1 deletion src/main/beos/exports/Makefile
Expand Up @@ -12,7 +12,6 @@ HEADERS = \
../../../../include/SDL_joystick.h \
../../../../include/SDL_keyboard.h \
../../../../include/SDL_keysym.h \
../../../../include/SDL_loadso.h \
../../../../include/SDL_main.h \
../../../../include/SDL_mouse.h \
../../../../include/SDL_mutex.h \
Expand Down
5 changes: 0 additions & 5 deletions src/main/beos/exports/SDL.exp
Expand Up @@ -74,9 +74,6 @@ _SDL_GetKeyState
_SDL_GetModState
_SDL_SetModState
_SDL_GetKeyName
_SDL_LoadObject
_SDL_LoadFunction
_SDL_UnloadObject
_SDL_SetModuleHandle
_SDL_RegisterApp
_SDL_InitQuickDraw
Expand Down Expand Up @@ -147,8 +144,6 @@ _SDL_CreateRGBSurfaceFrom
_SDL_FreeSurface
_SDL_LockSurface
_SDL_UnlockSurface
_SDL_LockRect
_SDL_UnlockRect
_SDL_LoadBMP_RW
_SDL_SaveBMP_RW
_SDL_SetColorKey
Expand Down
1 change: 0 additions & 1 deletion src/main/macos/exports/Makefile
Expand Up @@ -14,7 +14,6 @@ HEADERS = \
../../../../include/SDL_joystick.h \
../../../../include/SDL_keyboard.h \
../../../../include/SDL_keysym.h \
../../../../include/SDL_loadso.h \
../../../../include/SDL_mouse.h \
../../../../include/SDL_mutex.h \
../../../../include/SDL_quit.h \
Expand Down
5 changes: 0 additions & 5 deletions src/main/macos/exports/SDL.x
Expand Up @@ -76,9 +76,6 @@
SDL_GetModState
SDL_SetModState
SDL_GetKeyName
SDL_LoadObject
SDL_LoadFunction
SDL_UnloadObject
SDL_GetMouseState
SDL_GetRelativeMouseState
SDL_WarpMouse
Expand Down Expand Up @@ -146,8 +143,6 @@
SDL_FreeSurface
SDL_LockSurface
SDL_UnlockSurface
SDL_LockRect
SDL_UnlockRect
SDL_LoadBMP_RW
SDL_SaveBMP_RW
SDL_SetColorKey
Expand Down
1 change: 0 additions & 1 deletion src/main/macosx/exports/Makefile
Expand Up @@ -13,7 +13,6 @@ HEADERS = \
../../../../include/SDL_joystick.h \
../../../../include/SDL_keyboard.h \
../../../../include/SDL_keysym.h \
../../../../include/SDL_loadso.h \
../../../../include/SDL_mouse.h \
../../../../include/SDL_mutex.h \
../../../../include/SDL_quit.h \
Expand Down
5 changes: 0 additions & 5 deletions src/main/macosx/exports/SDL.x
Expand Up @@ -74,9 +74,6 @@
_SDL_GetModState
_SDL_SetModState
_SDL_GetKeyName
_SDL_LoadObject
_SDL_LoadFunction
_SDL_UnloadObject
_SDL_GetMouseState
_SDL_GetRelativeMouseState
_SDL_WarpMouse
Expand Down Expand Up @@ -144,8 +141,6 @@
_SDL_FreeSurface
_SDL_LockSurface
_SDL_UnlockSurface
_SDL_LockRect
_SDL_UnlockRect
_SDL_LoadBMP_RW
_SDL_SaveBMP_RW
_SDL_SetColorKey
Expand Down
1 change: 0 additions & 1 deletion src/main/win32/exports/Makefile
Expand Up @@ -13,7 +13,6 @@ HEADERS = \
../../../../include/SDL_joystick.h \
../../../../include/SDL_keyboard.h \
../../../../include/SDL_keysym.h \
../../../../include/SDL_loadso.h \
../../../../include/SDL_main.h \
../../../../include/SDL_mouse.h \
../../../../include/SDL_mutex.h \
Expand Down
5 changes: 0 additions & 5 deletions src/main/win32/exports/SDL.def
Expand Up @@ -74,9 +74,6 @@
SDL_GetModState
SDL_SetModState
SDL_GetKeyName
SDL_LoadObject
SDL_LoadFunction
SDL_UnloadObject
SDL_SetModuleHandle
SDL_RegisterApp
SDL_InitQuickDraw
Expand Down Expand Up @@ -147,8 +144,6 @@
SDL_FreeSurface
SDL_LockSurface
SDL_UnlockSurface
SDL_LockRect
SDL_UnlockRect
SDL_LoadBMP_RW
SDL_SaveBMP_RW
SDL_SetColorKey
Expand Down

0 comments on commit c8a9f94

Please sign in to comment.