Sam Lantinga - Sat Apr 13 07:49:47 PDT 2002

* Updated autogen.sh for new versions of automake * Specify the SDL API calling convention (C by default)
libsdl-org · Apr 13, 2002 · e05e8db · e05e8db
1 parent 15b4c78
commit e05e8db
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 30 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,8 @@
 
 1.2.2:
+Sam Lantinga - Sat Apr 13 07:49:47 PDT 2002
+ * Updated autogen.sh for new versions of automake
+ * Specify the SDL API calling convention (C by default)
 Mattias Engdeg�rd - Fri Dec 28 17:54:31 PST 2001
  * Worked around exit() in the jpeg image library
 

diff --git a/SDL_image.h b/SDL_image.h
@@ -43,43 +43,42 @@ extern "C" {
    surface afterwards by calling:
 	SDL_SetColorKey(image, SDL_RLEACCEL, image->format->colorkey);
  */
-extern DECLSPEC SDL_Surface *IMG_LoadTyped_RW(SDL_RWops *src, int freesrc,
-					      char *type);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadTyped_RW(SDL_RWops *src, int freesrc, char *type);
 /* Convenience functions */
-extern DECLSPEC SDL_Surface *IMG_Load(const char *file);
-extern DECLSPEC SDL_Surface *IMG_Load_RW(SDL_RWops *src, int freesrc);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_Load(const char *file);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_Load_RW(SDL_RWops *src, int freesrc);
 
 /* Invert the alpha of a surface for use with OpenGL
    This function is now a no-op, and only provided for backwards compatibility.
 */
-extern DECLSPEC int IMG_InvertAlpha(int on);
+extern DECLSPEC int SDLCALL IMG_InvertAlpha(int on);
 
 /* Functions to detect a file type, given a seekable source */
-extern DECLSPEC int IMG_isBMP(SDL_RWops *src);
-extern DECLSPEC int IMG_isPNM(SDL_RWops *src);
-extern DECLSPEC int IMG_isXPM(SDL_RWops *src);
-extern DECLSPEC int IMG_isXCF(SDL_RWops *src);
-extern DECLSPEC int IMG_isPCX(SDL_RWops *src);
-extern DECLSPEC int IMG_isGIF(SDL_RWops *src);
-extern DECLSPEC int IMG_isJPG(SDL_RWops *src);
-extern DECLSPEC int IMG_isTIF(SDL_RWops *src);
-extern DECLSPEC int IMG_isPNG(SDL_RWops *src);
-extern DECLSPEC int IMG_isLBM(SDL_RWops *src);
+extern DECLSPEC int SDLCALL IMG_isBMP(SDL_RWops *src);
+extern DECLSPEC int SDLCALL IMG_isPNM(SDL_RWops *src);
+extern DECLSPEC int SDLCALL IMG_isXPM(SDL_RWops *src);
+extern DECLSPEC int SDLCALL IMG_isXCF(SDL_RWops *src);
+extern DECLSPEC int SDLCALL IMG_isPCX(SDL_RWops *src);
+extern DECLSPEC int SDLCALL IMG_isGIF(SDL_RWops *src);
+extern DECLSPEC int SDLCALL IMG_isJPG(SDL_RWops *src);
+extern DECLSPEC int SDLCALL IMG_isTIF(SDL_RWops *src);
+extern DECLSPEC int SDLCALL IMG_isPNG(SDL_RWops *src);
+extern DECLSPEC int SDLCALL IMG_isLBM(SDL_RWops *src);
 
 /* Individual loading functions */
-extern DECLSPEC SDL_Surface *IMG_LoadBMP_RW(SDL_RWops *src);
-extern DECLSPEC SDL_Surface *IMG_LoadPNM_RW(SDL_RWops *src);
-extern DECLSPEC SDL_Surface *IMG_LoadXPM_RW(SDL_RWops *src);
-extern DECLSPEC SDL_Surface *IMG_LoadXCF_RW(SDL_RWops *src);
-extern DECLSPEC SDL_Surface *IMG_LoadPCX_RW(SDL_RWops *src);
-extern DECLSPEC SDL_Surface *IMG_LoadGIF_RW(SDL_RWops *src);
-extern DECLSPEC SDL_Surface *IMG_LoadJPG_RW(SDL_RWops *src);
-extern DECLSPEC SDL_Surface *IMG_LoadTIF_RW(SDL_RWops *src);
-extern DECLSPEC SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src);
-extern DECLSPEC SDL_Surface *IMG_LoadTGA_RW(SDL_RWops *src);
-extern DECLSPEC SDL_Surface *IMG_LoadLBM_RW(SDL_RWops *src);
-
-extern DECLSPEC SDL_Surface *IMG_ReadXPMFromArray(char **xpm);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadBMP_RW(SDL_RWops *src);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadPNM_RW(SDL_RWops *src);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadXPM_RW(SDL_RWops *src);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadXCF_RW(SDL_RWops *src);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadPCX_RW(SDL_RWops *src);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadGIF_RW(SDL_RWops *src);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadJPG_RW(SDL_RWops *src);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadTIF_RW(SDL_RWops *src);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadPNG_RW(SDL_RWops *src);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadTGA_RW(SDL_RWops *src);
+extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadLBM_RW(SDL_RWops *src);
+
+extern DECLSPEC SDL_Surface * SDLCALL IMG_ReadXPMFromArray(char **xpm);
 
 /* We'll use SDL for reporting errors */
 #define IMG_SetError	SDL_SetError

diff --git a/autogen.sh b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 aclocal
-automake --foreign
+automake --foreign --include-deps --add-missing --copy
 autoconf
 
 #./configure $*

diff --git a/configure.in b/configure.in
@@ -74,7 +74,7 @@ case "$target" in
 esac
 
 dnl Check for SDL
-SDL_VERSION=1.2.0
+SDL_VERSION=1.2.4
 AM_PATH_SDL($SDL_VERSION,
             :,
 	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])