diff --git a/bin_win32/DbgHelp_RemoveThisPartIfOnWin98.DLL b/bin_win32/DbgHelp_RemoveThisPartIfOnWin98.DLL new file mode 100644 index 00000000..2ce5f018 Binary files /dev/null and b/bin_win32/DbgHelp_RemoveThisPartIfOnWin98.DLL differ diff --git a/bin_win32/SDL.dll b/bin_win32/SDL.dll index 0aed950b..a5da7bbd 100755 Binary files a/bin_win32/SDL.dll and b/bin_win32/SDL.dll differ diff --git a/bin_win32/SDL_image.dll b/bin_win32/SDL_image.dll index afccf8fe..c536a5b2 100755 Binary files a/bin_win32/SDL_image.dll and b/bin_win32/SDL_image.dll differ diff --git a/bin_win32/SDL_mixer.dll b/bin_win32/SDL_mixer.dll index 532a40c2..4a10a256 100644 Binary files a/bin_win32/SDL_mixer.dll and b/bin_win32/SDL_mixer.dll differ diff --git a/bin_win32/Microsoft.VC80.CRT.manifest b/bin_win32/ac_client.exe.manifest similarity index 99% rename from bin_win32/Microsoft.VC80.CRT.manifest rename to bin_win32/ac_client.exe.manifest index 6a8a0e23..b89cafd7 100644 --- a/bin_win32/Microsoft.VC80.CRT.manifest +++ b/bin_win32/ac_client.exe.manifest @@ -1,8 +1,8 @@ - - - - - n9On8FItNsK/DmT8UQxu6jYDtWQ= - 0KJ/VTwP4OUHx98HlIW2AdW1kuY= - YJuB+9Os2oxW4mY+2oC/r8lICZE= + + + + + n9On8FItNsK/DmT8UQxu6jYDtWQ= + 0KJ/VTwP4OUHx98HlIW2AdW1kuY= + YJuB+9Os2oxW4mY+2oC/r8lICZE= \ No newline at end of file diff --git a/bin_win32/ac_server.exe.manifest b/bin_win32/ac_server.exe.manifest new file mode 100644 index 00000000..b89cafd7 --- /dev/null +++ b/bin_win32/ac_server.exe.manifest @@ -0,0 +1,8 @@ + + + + + n9On8FItNsK/DmT8UQxu6jYDtWQ= + 0KJ/VTwP4OUHx98HlIW2AdW1kuY= + YJuB+9Os2oxW4mY+2oC/r8lICZE= + \ No newline at end of file diff --git a/bin_win32/jpeg.dll b/bin_win32/jpeg.dll index 1f3c43cb..28759ab9 100755 Binary files a/bin_win32/jpeg.dll and b/bin_win32/jpeg.dll differ diff --git a/bin_win32/libogg-0.dll b/bin_win32/libogg-0.dll new file mode 100644 index 00000000..fa3eb894 Binary files /dev/null and b/bin_win32/libogg-0.dll differ diff --git a/bin_win32/libpng12-0.dll b/bin_win32/libpng12-0.dll new file mode 100644 index 00000000..23a6d30e Binary files /dev/null and b/bin_win32/libpng12-0.dll differ diff --git a/bin_win32/libpng12.dll b/bin_win32/libpng12.dll deleted file mode 100644 index f9709be3..00000000 Binary files a/bin_win32/libpng12.dll and /dev/null differ diff --git a/bin_win32/libvorbis-0.dll b/bin_win32/libvorbis-0.dll new file mode 100644 index 00000000..8bde11e4 Binary files /dev/null and b/bin_win32/libvorbis-0.dll differ diff --git a/bin_win32/libvorbisfile-3.dll b/bin_win32/libvorbisfile-3.dll new file mode 100644 index 00000000..a3531793 Binary files /dev/null and b/bin_win32/libvorbisfile-3.dll differ diff --git a/bin_win32/smpeg.dll b/bin_win32/smpeg.dll new file mode 100644 index 00000000..b6eed35a Binary files /dev/null and b/bin_win32/smpeg.dll differ diff --git a/bin_win32/zlib1.dll b/bin_win32/zlib1.dll index 1cf8a476..007afc43 100644 Binary files a/bin_win32/zlib1.dll and b/bin_win32/zlib1.dll differ diff --git a/source/include/SDL_config.h b/source/include/SDL_config.h index 8970ec3d..c82f42ad 100644 --- a/source/include/SDL_config.h +++ b/source/include/SDL_config.h @@ -26,14 +26,14 @@ #include "SDL_platform.h" /* Add any platform that doesn't build using the configure system */ -#if defined(__AMIGA__) -#include "SDL_config_amiga.h" -#elif defined(__DREAMCAST__) +#if defined(__DREAMCAST__) #include "SDL_config_dreamcast.h" #elif defined(__MACOS__) #include "SDL_config_macos.h" #elif defined(__MACOSX__) #include "SDL_config_macosx.h" +#elif defined(__SYMBIAN32__) +#include "SDL_config_symbian.h" /* must be before win32! */ #elif defined(__WIN32__) #include "SDL_config_win32.h" #elif defined(__OS2__) diff --git a/source/include/SDL_config_macosx.h b/source/include/SDL_config_macosx.h index 8f04930d..481c22ed 100644 --- a/source/include/SDL_config_macosx.h +++ b/source/include/SDL_config_macosx.h @@ -25,6 +25,9 @@ #include "SDL_platform.h" +/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */ +#include + /* This is a set of defines to configure the SDL features */ #define SDL_HAS_64BIT_TYPE 1 @@ -114,7 +117,7 @@ /* Enable various video drivers */ #define SDL_VIDEO_DRIVER_DUMMY 1 -#if TARGET_API_MAC_CARBON +#if ((defined TARGET_API_MAC_CARBON) && (TARGET_API_MAC_CARBON)) #define SDL_VIDEO_DRIVER_TOOLBOX 1 #else #define SDL_VIDEO_DRIVER_QUARTZ 1 diff --git a/source/include/SDL_config_win32.h b/source/include/SDL_config_win32.h index 23e4868c..cfb44d2a 100644 --- a/source/include/SDL_config_win32.h +++ b/source/include/SDL_config_win32.h @@ -27,7 +27,7 @@ /* This is a set of defines to configure the SDL features */ -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__DMC__) #define HAVE_STDINT_H 1 #elif defined(_MSC_VER) typedef signed __int8 int8_t; @@ -46,6 +46,13 @@ typedef unsigned int uintptr_t; #endif #define _UINTPTR_T_DEFINED #endif +/* Older Visual C++ headers don't have the Win64-compatible typedefs... */ +#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR))) +#define DWORD_PTR DWORD +#endif +#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR))) +#define LONG_PTR LONG +#endif #else /* !__GNUC__ && !_MSC_VER */ typedef signed char int8_t; typedef unsigned char uint8_t; diff --git a/source/include/SDL_endian.h b/source/include/SDL_endian.h index 6257a649..8f8db4cc 100755 --- a/source/include/SDL_endian.h +++ b/source/include/SDL_endian.h @@ -56,7 +56,7 @@ extern "C" { header should only be included in files that actually use them. */ #if defined(__GNUC__) && defined(__i386__) && \ - !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */) + !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */) static __inline__ Uint16 SDL_Swap16(Uint16 x) { __asm__("xchgb %b0,%h0" : "=q" (x) : "0" (x)); @@ -88,7 +88,8 @@ static __inline__ Uint16 SDL_Swap16(Uint16 x) { } #endif -#if defined(__GNUC__) && defined(__i386__) +#if defined(__GNUC__) && defined(__i386__) && \ + !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */) static __inline__ Uint32 SDL_Swap32(Uint32 x) { __asm__("bswap %0" : "=r" (x) : "0" (x)); @@ -123,7 +124,8 @@ static __inline__ Uint32 SDL_Swap32(Uint32 x) { #endif #ifdef SDL_HAS_64BIT_TYPE -#if defined(__GNUC__) && defined(__i386__) +#if defined(__GNUC__) && defined(__i386__) && \ + !(__GNUC__ == 2 && __GNUC_MINOR__ <= 95 /* broken gcc version */) static __inline__ Uint64 SDL_Swap64(Uint64 x) { union { diff --git a/source/include/SDL_image.h b/source/include/SDL_image.h index d5b5da6e..7bc332c3 100755 --- a/source/include/SDL_image.h +++ b/source/include/SDL_image.h @@ -38,7 +38,7 @@ extern "C" { */ #define SDL_IMAGE_MAJOR_VERSION 1 #define SDL_IMAGE_MINOR_VERSION 2 -#define SDL_IMAGE_PATCHLEVEL 5 +#define SDL_IMAGE_PATCHLEVEL 6 /* This macro can be used to fill a version structure with the compile-time * version of the SDL_image library. diff --git a/source/include/SDL_mixer.h b/source/include/SDL_mixer.h index 4a4fdeaf..e2c1aca0 100755 --- a/source/include/SDL_mixer.h +++ b/source/include/SDL_mixer.h @@ -20,7 +20,7 @@ slouken@libsdl.org */ -/* $Id: SDL_mixer.h,v 1.2 2006-11-06 13:03:16 eihrul Exp $ */ +/* $Id: SDL_mixer.h,v 1.3 2007-08-13 06:40:34 eihrul Exp $ */ #ifndef _SDL_MIXER_H #define _SDL_MIXER_H @@ -28,7 +28,7 @@ #include "SDL_types.h" #include "SDL_rwops.h" #include "SDL_audio.h" -#include "SDL_byteorder.h" +#include "SDL_endian.h" #include "SDL_version.h" #include "begin_code.h" @@ -41,7 +41,7 @@ extern "C" { */ #define SDL_MIXER_MAJOR_VERSION 1 #define SDL_MIXER_MINOR_VERSION 2 -#define SDL_MIXER_PATCHLEVEL 6 +#define SDL_MIXER_PATCHLEVEL 8 /* This macro can be used to fill a version structure with the compile-time * version of the SDL_mixer library. @@ -82,7 +82,7 @@ extern DECLSPEC const SDL_version * SDLCALL Mix_Linked_Version(void); #define MIX_MAX_VOLUME 128 /* Volume of a chunk */ /* The internal format for an audio chunk */ -typedef struct { +typedef struct Mix_Chunk { int allocated; Uint8 *abuf; Uint32 alen; @@ -103,7 +103,8 @@ typedef enum { MUS_MOD, MUS_MID, MUS_OGG, - MUS_MP3 + MUS_MP3, + MUS_MP3_MAD } Mix_MusicType; /* The internal format for a music chunk interpreted via mikmod */ @@ -130,11 +131,9 @@ extern DECLSPEC Mix_Chunk * SDLCALL Mix_LoadWAV_RW(SDL_RWops *src, int freesrc); #define Mix_LoadWAV(file) Mix_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1) extern DECLSPEC Mix_Music * SDLCALL Mix_LoadMUS(const char *file); -#ifdef USE_RWOPS /* This hasn't been hooked into music.c yet */ -/* Load a music file from an SDL_RWop object (MikMod-specific currently) +/* Load a music file from an SDL_RWop object (Ogg and MikMod specific currently) Matt Campbell (matt@campbellhome.dhs.org) April 2000 */ extern DECLSPEC Mix_Music * SDLCALL Mix_LoadMUS_RW(SDL_RWops *rw); -#endif /* Load a wave file of the mixer format from a memory buffer */ extern DECLSPEC Mix_Chunk * SDLCALL Mix_QuickLoad_WAV(Uint8 *mem); @@ -183,7 +182,7 @@ extern DECLSPEC void * SDLCALL Mix_GetMusicHookData(void); extern DECLSPEC void SDLCALL Mix_ChannelFinished(void (*channel_finished)(int channel)); -/* Special Effects API by ryan c. gordon. (icculus@linuxgames.com) */ +/* Special Effects API by ryan c. gordon. (icculus@icculus.org) */ #define MIX_CHANNEL_POST -2 diff --git a/source/include/SDL_platform.h b/source/include/SDL_platform.h index 80274bc4..1bfee29e 100644 --- a/source/include/SDL_platform.h +++ b/source/include/SDL_platform.h @@ -29,10 +29,6 @@ #undef __AIX__ #define __AIX__ 1 #endif -#if defined(AMIGA) || defined(__AMIGA) || defined(__amigados__) -#undef __AMIGA__ -#define __AMIGA__ 1 -#endif #if defined(__BEOS__) #undef __BEOS__ #define __BEOS__ 1 diff --git a/source/include/SDL_rwops.h b/source/include/SDL_rwops.h index d7e01d8f..8c177017 100755 --- a/source/include/SDL_rwops.h +++ b/source/include/SDL_rwops.h @@ -62,10 +62,15 @@ typedef struct SDL_RWops { Uint32 type; union { -#ifdef __WIN32__ +#if defined(__WIN32__) && !defined(__SYMBIAN32__) struct { - int append; - void* h; + int append; + void *h; + struct { + void *data; + int size; + int left; + } buffer; } win32io; #endif #ifdef HAVE_STDIO_H diff --git a/source/include/SDL_stdinc.h b/source/include/SDL_stdinc.h index 62535629..891a9ac8 100644 --- a/source/include/SDL_stdinc.h +++ b/source/include/SDL_stdinc.h @@ -91,7 +91,9 @@ typedef uint32_t Uint32; #ifdef SDL_HAS_64BIT_TYPE typedef int64_t Sint64; +#ifndef SYMBIAN32_GCCE typedef uint64_t Uint64; +#endif #else /* This is really just a hack to prevent the compiler from complaining */ typedef struct { @@ -127,7 +129,9 @@ typedef enum { DUMMY_ENUM_VALUE } SDL_DUMMY_ENUM; +#ifndef __NDS__ SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int)); +#endif #include "begin_code.h" @@ -181,10 +185,10 @@ extern DECLSPEC void SDLCALL SDL_free(void *mem); # endif #endif #ifdef HAVE_ALLOCA -#define SDL_stack_alloc(type, count) (type*)alloca(sizeof(type)*count) +#define SDL_stack_alloc(type, count) (type*)alloca(sizeof(type)*(count)) #define SDL_stack_free(data) #else -#define SDL_stack_alloc(type, count) (type*)SDL_malloc(sizeof(type)*count) +#define SDL_stack_alloc(type, count) (type*)SDL_malloc(sizeof(type)*(count)) #define SDL_stack_free(data) SDL_free(data) #endif @@ -263,7 +267,10 @@ do { \ } while(0) #endif -#if defined(__GNUC__) && defined(i386) +/* We can count on memcpy existing on Mac OS X and being well-tuned. */ +#if defined(__MACH__) && defined(__APPLE__) +#define SDL_memcpy(dst, src, len) memcpy(dst, src, len) +#elif defined(__GNUC__) && defined(i386) #define SDL_memcpy(dst, src, len) \ do { \ int u0, u1, u2; \ @@ -292,7 +299,10 @@ extern DECLSPEC void * SDLCALL SDL_memcpy(void *dst, const void *src, size_t len #endif #endif -#if defined(__GNUC__) && defined(i386) +/* We can count on memcpy existing on Mac OS X and being well-tuned. */ +#if defined(__MACH__) && defined(__APPLE__) +#define SDL_memcpy4(dst, src, len) memcpy(dst, src, (len)*4) +#elif defined(__GNUC__) && defined(i386) #define SDL_memcpy4(dst, src, len) \ do { \ int ecx, edi, esi; \ @@ -561,19 +571,17 @@ extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char #define SDL_iconv_t iconv_t #define SDL_iconv_open iconv_open #define SDL_iconv_close iconv_close -extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); #else typedef struct _SDL_iconv_t *SDL_iconv_t; extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode, const char *fromcode); extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd); -extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); #endif +extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); /* This function converts a string between encodings in one pass, returning a string that must be freed with SDL_free() or NULL on error. */ -extern DECLSPEC char * SDLCALL SDL_iconv_string(const char *tocode, const char *fromcode, char *inbuf, size_t inbytesleft); -#define SDL_iconv_utf8_ascii(S) SDL_iconv_string("ASCII", "UTF-8", S, SDL_strlen(S)+1) -#define SDL_iconv_utf8_latin1(S) SDL_iconv_string("LATIN1", "UTF-8", S, SDL_strlen(S)+1) +extern DECLSPEC char * SDLCALL SDL_iconv_string(const char *tocode, const char *fromcode, const char *inbuf, size_t inbytesleft); +#define SDL_iconv_utf8_locale(S) SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1) #define SDL_iconv_utf8_ucs2(S) (Uint16 *)SDL_iconv_string("UCS-2", "UTF-8", S, SDL_strlen(S)+1) #define SDL_iconv_utf8_ucs4(S) (Uint32 *)SDL_iconv_string("UCS-4", "UTF-8", S, SDL_strlen(S)+1) diff --git a/source/include/SDL_syswm.h b/source/include/SDL_syswm.h index e7f35139..010dd1bc 100755 --- a/source/include/SDL_syswm.h +++ b/source/include/SDL_syswm.h @@ -86,7 +86,8 @@ typedef struct SDL_SysWMinfo { Display *display; /* The X11 display */ Window window; /* The X11 display window */ /* These locking functions should be called around - any X11 functions using the display variable. + any X11 functions using the display variable, + but not the gfxdisplay variable. They lock the event thread, so should not be called around event functions or from event filters. */ @@ -96,6 +97,9 @@ typedef struct SDL_SysWMinfo { /* Introduced in SDL 1.0.2 */ Window fswindow; /* The X11 fullscreen window */ Window wmwindow; /* The X11 managed input window */ + + /* Introduced in SDL 1.2.12 */ + Display *gfxdisplay; /* The X11 display to which rendering is done */ } x11; } info; } SDL_SysWMinfo; diff --git a/source/include/SDL_thread.h b/source/include/SDL_thread.h index e0a35b1a..403ee462 100755 --- a/source/include/SDL_thread.h +++ b/source/include/SDL_thread.h @@ -45,7 +45,7 @@ struct SDL_Thread; typedef struct SDL_Thread SDL_Thread; /* Create a thread */ -#if (defined(__WIN32__) && !defined(HAVE_LIBC)) || defined(__OS2__) +#if ((defined(__WIN32__) && !defined(HAVE_LIBC)) || defined(__OS2__)) && !defined(__SYMBIAN32__) /* We compile SDL into a DLL on OS/2. This means, that it's the DLL which creates a new thread for the calling process with the SDL_CreateThread() diff --git a/source/include/SDL_version.h b/source/include/SDL_version.h index 262aa7b5..610ffe67 100755 --- a/source/include/SDL_version.h +++ b/source/include/SDL_version.h @@ -37,7 +37,7 @@ extern "C" { */ #define SDL_MAJOR_VERSION 1 #define SDL_MINOR_VERSION 2 -#define SDL_PATCHLEVEL 11 +#define SDL_PATCHLEVEL 12 typedef struct SDL_version { Uint8 major; diff --git a/source/include/SDL_video.h b/source/include/SDL_video.h index 720022e3..f6baccee 100755 --- a/source/include/SDL_video.h +++ b/source/include/SDL_video.h @@ -447,13 +447,15 @@ extern DECLSPEC int SDLCALL SDL_SetPalette(SDL_Surface *surface, int flags, * Maps an RGB triple to an opaque pixel value for a given pixel format */ extern DECLSPEC Uint32 SDLCALL SDL_MapRGB - (SDL_PixelFormat *format, Uint8 r, Uint8 g, Uint8 b); +(const SDL_PixelFormat * const format, + const Uint8 r, const Uint8 g, const Uint8 b); /* * Maps an RGBA quadruple to a pixel value for a given pixel format */ -extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(SDL_PixelFormat *format, - Uint8 r, Uint8 g, Uint8 b, Uint8 a); +extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA +(const SDL_PixelFormat * const format, + const Uint8 r, const Uint8 g, const Uint8 b, const Uint8 a); /* * Maps a pixel value into the RGB components for a given pixel format diff --git a/source/include/begin_code.h b/source/include/begin_code.h index 40279337..b03787f4 100755 --- a/source/include/begin_code.h +++ b/source/include/begin_code.h @@ -83,11 +83,15 @@ #endif #endif /* SDLCALL */ -/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */ #ifdef __SYMBIAN32__ +#ifndef EKA2 #undef DECLSPEC #define DECLSPEC -#endif /* __SYMBIAN32__ */ +#elif !defined(__WINS__) +#undef DECLSPEC +#define DECLSPEC __declspec(dllexport) +#endif //EKA2 +#endif //__SYMBIAN32__ /* Force structure packing at 4 byte alignment. This is necessary if the header is included in code which has structure @@ -116,14 +120,16 @@ #if defined(_MSC_VER) || defined(__BORLANDC__) || \ defined(__DMC__) || defined(__SC__) || \ defined(__WATCOMC__) || defined(__LCC__) || \ - defined(__DECC) + defined(__DECC) || defined(__EABI__) #ifndef __inline__ #define __inline__ __inline #endif #define SDL_INLINE_OKAY #else #if !defined(__MRC__) && !defined(_SGI_SOURCE) +#ifndef __inline__ #define __inline__ inline +#endif #define SDL_INLINE_OKAY #endif /* Not a funky compiler */ #endif /* Visual C++ */ diff --git a/source/include/zconf.h b/source/include/zconf.h index 841e727f..80b7c21a 100755 --- a/source/include/zconf.h +++ b/source/include/zconf.h @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: zconf.h,v 1.2 2006-11-06 13:03:18 eihrul Exp $ */ +/* @(#) $Id: zconf.h,v 1.3 2007-08-13 06:40:34 eihrul Exp $ */ #ifndef ZCONF_H #define ZCONF_H diff --git a/source/lib/SDL.lib b/source/lib/SDL.lib index 5d954074..993fd2ba 100755 Binary files a/source/lib/SDL.lib and b/source/lib/SDL.lib differ diff --git a/source/lib/SDL_image.lib b/source/lib/SDL_image.lib index 95b80d6d..50b46768 100755 Binary files a/source/lib/SDL_image.lib and b/source/lib/SDL_image.lib differ diff --git a/source/lib/SDL_mixer.lib b/source/lib/SDL_mixer.lib index 3f9809db..0a397327 100755 Binary files a/source/lib/SDL_mixer.lib and b/source/lib/SDL_mixer.lib differ diff --git a/source/lib/SDLmain.lib b/source/lib/SDLmain.lib index f703d1b1..1a88abe1 100755 Binary files a/source/lib/SDLmain.lib and b/source/lib/SDLmain.lib differ