Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgraded external libraries (libpng 1.4.1, zlib 1.2.4, openal-soft 1.12.854) on Windows

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1496 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-04-07 07:57:32 +00:00
parent 14d0b8a483
commit a6b9dbfd39
14 changed files with 3389 additions and 3667 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
DSFML/samples/dsfml/bin/openal32.dll
View File

Binary file not shown.

BIN
dotnet/extlibs/openal32.dll
View File

Binary file not shown.

BIN
extlibs/bin/openal32.dll
View File

Binary file not shown.

7
extlibs/headers/AL/al.h
View File

@ -6,15 +6,14 @@ extern "C" {
#endif #endif
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)
/* _OPENAL32LIB is deprecated */ #if defined(AL_BUILD_LIBRARY)
#if defined(AL_BUILD_LIBRARY) || defined (_OPENAL32LIB)
#define AL_API __declspec(dllexport) #define AL_API __declspec(dllexport)
#else #else
#define AL_API __declspec(dllimport) #define AL_API __declspec(dllimport)
#endif #endif
#else #else
#if defined(AL_BUILD_LIBRARY) && defined(HAVE_GCC_VISIBILITY) #if defined(AL_BUILD_LIBRARY) && defined(HAVE_GCC_VISIBILITY)
#define AL_API __attribute__((visibility("default"))) #define AL_API __attribute__((visibility("protected")))
#else #else
#define AL_API extern #define AL_API extern
#endif #endif
@ -53,7 +52,7 @@ typedef char ALboolean;
typedef char ALchar; typedef char ALchar;
/** signed 8-bit 2's complement integer */ /** signed 8-bit 2's complement integer */
typedef char ALbyte; typedef signed char ALbyte;
/** unsigned 8-bit integer */ /** unsigned 8-bit integer */
typedef unsigned char ALubyte; typedef unsigned char ALubyte;

7
extlibs/headers/AL/alc.h
View File

@ -6,15 +6,14 @@ extern "C" {
#endif #endif
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)
/* _OPENAL32LIB is deprecated */ #if defined(AL_BUILD_LIBRARY)
#if defined(AL_BUILD_LIBRARY) || defined (_OPENAL32LIB)
#define ALC_API __declspec(dllexport) #define ALC_API __declspec(dllexport)
#else #else
#define ALC_API __declspec(dllimport) #define ALC_API __declspec(dllimport)
#endif #endif
#else #else
#if defined(AL_BUILD_LIBRARY) && defined(HAVE_GCC_VISIBILITY) #if defined(AL_BUILD_LIBRARY) && defined(HAVE_GCC_VISIBILITY)
#define ALC_API __attribute__((visibility("default"))) #define ALC_API __attribute__((visibility("protected")))
#else #else
#define ALC_API extern #define ALC_API extern
#endif #endif
@ -52,7 +51,7 @@ typedef char ALCboolean;
typedef char ALCchar; typedef char ALCchar;
/** signed 8-bit 2's complement integer */ /** signed 8-bit 2's complement integer */
typedef char ALCbyte; typedef signed char ALCbyte;
/** unsigned 8-bit integer */ /** unsigned 8-bit integer */
typedef unsigned char ALCubyte; typedef unsigned char ALCubyte;

60
extlibs/headers/AL/alext.h
View File

@ -21,6 +21,8 @@
#ifndef AL_ALEXT_H #ifndef AL_ALEXT_H
#define AL_ALEXT_H #define AL_ALEXT_H
#include <stddef.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -91,6 +93,17 @@ extern "C" {
#define AL_FORMAT_71CHN32 0x1212 #define AL_FORMAT_71CHN32 0x1212
#endif #endif
#ifndef AL_EXT_MULAW_MCFORMATS
#define AL_EXT_MULAW_MCFORMATS 1
#define AL_FORMAT_MONO_MULAW 0x10014
#define AL_FORMAT_STEREO_MULAW 0x10015
#define AL_FORMAT_QUAD_MULAW 0x10021
#define AL_FORMAT_REAR_MULAW 0x10022
#define AL_FORMAT_51CHN_MULAW 0x10023
#define AL_FORMAT_61CHN_MULAW 0x10024
#define AL_FORMAT_71CHN_MULAW 0x10025
#endif
#ifndef AL_EXT_IMA4 #ifndef AL_EXT_IMA4
#define AL_EXT_IMA4 1 #define AL_EXT_IMA4 1
#define AL_FORMAT_MONO_IMA4 0x1300 #define AL_FORMAT_MONO_IMA4 0x1300
@ -101,17 +114,24 @@ extern "C" {
#define AL_EXT_buffer_sub_data 1 #define AL_EXT_buffer_sub_data 1
#define AL_BYTE_RW_OFFSETS_EXT 0x1031 #define AL_BYTE_RW_OFFSETS_EXT 0x1031
#define AL_SAMPLE_RW_OFFSETS_EXT 0x1032 #define AL_SAMPLE_RW_OFFSETS_EXT 0x1032
#define AL_SEC_RW_OFFSETS_EXT 0x1033
typedef ALvoid (AL_APIENTRY*PFNALBUFFERSUBDATAEXTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei); typedef ALvoid (AL_APIENTRY*PFNALBUFFERSUBDATAEXTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei);
#ifdef AL_ALEXT_PROTOTYPES
AL_API ALvoid AL_APIENTRY alBufferSubDataEXT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length);
#endif
#endif #endif
#ifndef AL_EXT_STATIC_BUFFER #ifndef AL_EXT_STATIC_BUFFER
#define AL_EXT_STATIC_BUFFER 1 #define AL_EXT_STATIC_BUFFER 1
typedef ALvoid (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid*,ALsizei,ALsizei); typedef ALvoid (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid*,ALsizei,ALsizei);
#ifdef AL_ALEXT_PROTOTYPES
AL_API ALvoid AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format, ALvoid *data, ALsizei len, ALsizei freq);
#endif
#endif #endif
#ifndef AL_EXT_sample_buffer_object #ifndef AL_EXT_sample_buffer_object
#define AL_EXT_sample_buffer_object 1 #define AL_EXT_sample_buffer_object 1
typedef ptrdiff_t ALintptrEXT;
typedef ptrdiff_t ALsizeiptrEXT;
#define AL_SAMPLE_SOURCE_EXT 0x1040 #define AL_SAMPLE_SOURCE_EXT 0x1040
#define AL_SAMPLE_SINK_EXT 0x1041 #define AL_SAMPLE_SINK_EXT 0x1041
#define AL_READ_ONLY_EXT 0x1042 #define AL_READ_ONLY_EXT 0x1042
@ -129,9 +149,9 @@ typedef ALvoid (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid
typedef ALvoid (AL_APIENTRY*PFNALGENDATABUFFERSEXTPROC)(ALsizei n,ALuint *puiBuffers); typedef ALvoid (AL_APIENTRY*PFNALGENDATABUFFERSEXTPROC)(ALsizei n,ALuint *puiBuffers);
typedef ALvoid (AL_APIENTRY*PFNALDELETEDATABUFFERSEXTPROC)(ALsizei n, const ALuint *puiBuffers); typedef ALvoid (AL_APIENTRY*PFNALDELETEDATABUFFERSEXTPROC)(ALsizei n, const ALuint *puiBuffers);
typedef ALboolean (AL_APIENTRY*PFNALISDATABUFFEREXTPROC)(ALuint uiBuffer); typedef ALboolean (AL_APIENTRY*PFNALISDATABUFFEREXTPROC)(ALuint uiBuffer);
typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERDATAEXTPROC)(ALuint buffer,const ALvoid *data,ALsizei size,ALenum usage); typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERDATAEXTPROC)(ALuint buffer,const ALvoid *data,ALsizeiptrEXT size,ALenum usage);
typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERSUBDATAEXTPROC)(ALuint buffer, ALuint start, ALsizei length, const ALvoid *); typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERSUBDATAEXTPROC)(ALuint buffer, ALintptrEXT start, ALsizeiptrEXT length, const ALvoid *);
typedef ALvoid (AL_APIENTRY*PFNALGETDATABUFFERSUBDATAEXTPROC)(ALuint buffer, ALuint start, ALsizei length, ALvoid *); typedef ALvoid (AL_APIENTRY*PFNALGETDATABUFFERSUBDATAEXTPROC)(ALuint buffer, ALintptrEXT start, ALsizeiptrEXT length, ALvoid *);
typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERFEXTPROC)(ALuint buffer, ALenum eParam, ALfloat flValue); typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERFEXTPROC)(ALuint buffer, ALenum eParam, ALfloat flValue);
typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERFVEXTPROC)(ALuint buffer, ALenum eParam, const ALfloat* flValues); typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERFVEXTPROC)(ALuint buffer, ALenum eParam, const ALfloat* flValues);
typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERIEXTPROC)(ALuint buffer, ALenum eParam, ALint lValue); typedef ALvoid (AL_APIENTRY*PFNALDATABUFFERIEXTPROC)(ALuint buffer, ALenum eParam, ALint lValue);
@ -141,8 +161,32 @@ typedef ALvoid (AL_APIENTRY*PFNALGETDATABUFFERFVEXTPROC)(ALuint buffer, ALenum e
typedef ALvoid (AL_APIENTRY*PFNALGETDATABUFFERIEXTPROC)(ALuint buffer, ALenum eParam, ALint *plValue); typedef ALvoid (AL_APIENTRY*PFNALGETDATABUFFERIEXTPROC)(ALuint buffer, ALenum eParam, ALint *plValue);
typedef ALvoid (AL_APIENTRY*PFNALGETDATABUFFERIVEXTPROC)(ALuint buffer, ALenum eParam, ALint* plValues); typedef ALvoid (AL_APIENTRY*PFNALGETDATABUFFERIVEXTPROC)(ALuint buffer, ALenum eParam, ALint* plValues);
typedef ALvoid (AL_APIENTRY*PFNALSELECTDATABUFFEREXTPROC)(ALenum target, ALuint uiBuffer); typedef ALvoid (AL_APIENTRY*PFNALSELECTDATABUFFEREXTPROC)(ALenum target, ALuint uiBuffer);
typedef ALvoid* (AL_APIENTRY*PFNALMAPDATABUFFEREXTPROC)(ALuint uiBuffer, ALuint start, ALsizei length, ALenum access); typedef ALvoid* (AL_APIENTRY*PFNALMAPDATABUFFEREXTPROC)(ALuint uiBuffer, ALintptrEXT start, ALsizeiptrEXT length, ALenum access);
typedef ALvoid (AL_APIENTRY*PFNALUNMAPDATABUFFEREXTPROC)(ALuint uiBuffer); typedef ALvoid (AL_APIENTRY*PFNALUNMAPDATABUFFEREXTPROC)(ALuint uiBuffer);
#ifdef AL_ALEXT_PROTOTYPES
AL_API ALvoid AL_APIENTRY alGenDatabuffersEXT(ALsizei n,ALuint *puiBuffers);
AL_API ALvoid AL_APIENTRY alDeleteDatabuffersEXT(ALsizei n, const ALuint *puiBuffers);
AL_API ALboolean AL_APIENTRY alIsDatabufferEXT(ALuint uiBuffer);
AL_API ALvoid AL_APIENTRY alDatabufferDataEXT(ALuint buffer,const ALvoid *data,ALsizeiptrEXT size,ALenum usage);
AL_API ALvoid AL_APIENTRY alDatabufferSubDataEXT(ALuint buffer, ALintptrEXT start, ALsizeiptrEXT length, const ALvoid *data);
AL_API ALvoid AL_APIENTRY alGetDatabufferSubDataEXT(ALuint buffer, ALintptrEXT start, ALsizeiptrEXT length, ALvoid *data);
AL_API ALvoid AL_APIENTRY alDatabufferfEXT(ALuint buffer, ALenum eParam, ALfloat flValue);
AL_API ALvoid AL_APIENTRY alDatabufferfvEXT(ALuint buffer, ALenum eParam, const ALfloat* flValues);
AL_API ALvoid AL_APIENTRY alDatabufferiEXT(ALuint buffer, ALenum eParam, ALint lValue);
AL_API ALvoid AL_APIENTRY alDatabufferivEXT(ALuint buffer, ALenum eParam, const ALint* plValues);
AL_API ALvoid AL_APIENTRY alGetDatabufferfEXT(ALuint buffer, ALenum eParam, ALfloat *pflValue);
AL_API ALvoid AL_APIENTRY alGetDatabufferfvEXT(ALuint buffer, ALenum eParam, ALfloat* pflValues);
AL_API ALvoid AL_APIENTRY alGetDatabufferiEXT(ALuint buffer, ALenum eParam, ALint *plValue);
AL_API ALvoid AL_APIENTRY alGetDatabufferivEXT(ALuint buffer, ALenum eParam, ALint* plValues);
AL_API ALvoid AL_APIENTRY alSelectDatabufferEXT(ALenum target, ALuint uiBuffer);
AL_API ALvoid* AL_APIENTRY alMapDatabufferEXT(ALuint uiBuffer, ALintptrEXT start, ALsizeiptrEXT length, ALenum access);
AL_API ALvoid AL_APIENTRY alUnmapDatabufferEXT(ALuint uiBuffer);
#endif
#endif
#ifndef ALC_EXT_EFX
#define ALC_EXT_EFX 1
#include "efx.h"
#endif #endif
#ifndef ALC_EXT_disconnect #ifndef ALC_EXT_disconnect
@ -152,8 +196,12 @@ typedef ALvoid (AL_APIENTRY*PFNALUNMAPDATABUFFEREXTPROC)(ALuint uiBuffer);
#ifndef ALC_EXT_thread_local_context #ifndef ALC_EXT_thread_local_context
#define ALC_EXT_thread_local_context 1 #define ALC_EXT_thread_local_context 1
typedef ALCboolean (ALC_APIENTRY*PFNALCMAKECURRENTPROC)(ALCcontext *context); typedef ALCboolean (ALC_APIENTRY*PFNALCSETTHREADCONTEXTPROC)(ALCcontext *context);
typedef ALCcontext* (ALC_APIENTRY*PFNALCGETTHREADCONTEXTPROC)(void); typedef ALCcontext* (ALC_APIENTRY*PFNALCGETTHREADCONTEXTPROC)(void);
#ifdef AL_ALEXT_PROTOTYPES
ALC_API ALCboolean ALC_APIENTRY alcSetThreadContext(ALCcontext *context);
ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void);
#endif
#endif #endif
#ifndef AL_EXT_source_distance_model #ifndef AL_EXT_source_distance_model

2287
extlibs/headers/png/png.h
View File

File diff suppressed because it is too large Load Diff

977
extlibs/headers/png/pngconf.h
View File

File diff suppressed because it is too large Load Diff

748
extlibs/headers/zlib/zconf.h → extlibs/headers/png/zconf.h
View File

@ -1,332 +1,416 @@
/* zconf.h -- configuration of the zlib compression library /* zconf.h -- configuration of the zlib compression library
* Copyright (C) 1995-2005 Jean-loup Gailly. * Copyright (C) 1995-2010 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h * For conditions of distribution and use, see copyright notice in zlib.h
*/ */
/* @(#) $Id$ */ /* @(#) $Id$ */
#ifndef ZCONF_H #ifndef ZCONF_H
#define ZCONF_H #define ZCONF_H
/* /*
* If you *really* need a unique prefix for all types and library functions, * If you *really* need a unique prefix for all types and library functions,
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
*/ * Even better than compiling with -DZ_PREFIX would be to use configure to set
#ifdef Z_PREFIX * this permanently in zconf.h using "./configure --zprefix".
# define deflateInit_ z_deflateInit_ */
# define deflate z_deflate #ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
# define deflateEnd z_deflateEnd
# define inflateInit_ z_inflateInit_ /* all linked symbols */
# define inflate z_inflate # define _dist_code z__dist_code
# define inflateEnd z_inflateEnd # define _length_code z__length_code
# define deflateInit2_ z_deflateInit2_ # define _tr_align z__tr_align
# define deflateSetDictionary z_deflateSetDictionary # define _tr_flush_block z__tr_flush_block
# define deflateCopy z_deflateCopy # define _tr_init z__tr_init
# define deflateReset z_deflateReset # define _tr_stored_block z__tr_stored_block
# define deflateParams z_deflateParams # define _tr_tally z__tr_tally
# define deflateBound z_deflateBound # define adler32 z_adler32
# define deflatePrime z_deflatePrime # define adler32_combine z_adler32_combine
# define inflateInit2_ z_inflateInit2_ # define adler32_combine64 z_adler32_combine64
# define inflateSetDictionary z_inflateSetDictionary # define compress z_compress
# define inflateSync z_inflateSync # define compress2 z_compress2
# define inflateSyncPoint z_inflateSyncPoint # define compressBound z_compressBound
# define inflateCopy z_inflateCopy # define crc32 z_crc32
# define inflateReset z_inflateReset # define crc32_combine z_crc32_combine
# define inflateBack z_inflateBack # define crc32_combine64 z_crc32_combine64
# define inflateBackEnd z_inflateBackEnd # define deflate z_deflate
# define compress z_compress # define deflateBound z_deflateBound
# define compress2 z_compress2 # define deflateCopy z_deflateCopy
# define compressBound z_compressBound # define deflateEnd z_deflateEnd
# define uncompress z_uncompress # define deflateInit2_ z_deflateInit2_
# define adler32 z_adler32 # define deflateInit_ z_deflateInit_
# define crc32 z_crc32 # define deflateParams z_deflateParams
# define get_crc_table z_get_crc_table # define deflatePrime z_deflatePrime
# define zError z_zError # define deflateReset z_deflateReset
# define deflateSetDictionary z_deflateSetDictionary
# define alloc_func z_alloc_func # define deflateSetHeader z_deflateSetHeader
# define free_func z_free_func # define deflateTune z_deflateTune
# define in_func z_in_func # define deflate_copyright z_deflate_copyright
# define out_func z_out_func # define get_crc_table z_get_crc_table
# define Byte z_Byte # define gz_error z_gz_error
# define uInt z_uInt # define gz_intmax z_gz_intmax
# define uLong z_uLong # define gz_strwinerror z_gz_strwinerror
# define Bytef z_Bytef # define gzbuffer z_gzbuffer
# define charf z_charf # define gzclearerr z_gzclearerr
# define intf z_intf # define gzclose z_gzclose
# define uIntf z_uIntf # define gzclose_r z_gzclose_r
# define uLongf z_uLongf # define gzclose_w z_gzclose_w
# define voidpf z_voidpf # define gzdirect z_gzdirect
# define voidp z_voidp # define gzdopen z_gzdopen
#endif # define gzeof z_gzeof
# define gzerror z_gzerror
#if defined(__MSDOS__) && !defined(MSDOS) # define gzflush z_gzflush
# define MSDOS # define gzgetc z_gzgetc
#endif # define gzgets z_gzgets
#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) # define gzoffset z_gzoffset
# define OS2 # define gzoffset64 z_gzoffset64
#endif # define gzopen z_gzopen
#if defined(_WINDOWS) && !defined(WINDOWS) # define gzopen64 z_gzopen64
# define WINDOWS # define gzprintf z_gzprintf
#endif # define gzputc z_gzputc
#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) # define gzputs z_gzputs
# ifndef WIN32 # define gzread z_gzread
# define WIN32 # define gzrewind z_gzrewind
# endif # define gzseek z_gzseek
#endif # define gzseek64 z_gzseek64
#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) # define gzsetparams z_gzsetparams
# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) # define gztell z_gztell
# ifndef SYS16BIT # define gztell64 z_gztell64
# define SYS16BIT # define gzungetc z_gzungetc
# endif # define gzwrite z_gzwrite
# endif # define inflate z_inflate
#endif # define inflateBack z_inflateBack
# define inflateBackEnd z_inflateBackEnd
/* # define inflateBackInit_ z_inflateBackInit_
* Compile with -DMAXSEG_64K if the alloc function cannot allocate more # define inflateCopy z_inflateCopy
* than 64k bytes at a time (needed on systems with 16-bit int). # define inflateEnd z_inflateEnd
*/ # define inflateGetHeader z_inflateGetHeader
#ifdef SYS16BIT # define inflateInit2_ z_inflateInit2_
# define MAXSEG_64K # define inflateInit_ z_inflateInit_
#endif # define inflateMark z_inflateMark
#ifdef MSDOS # define inflatePrime z_inflatePrime
# define UNALIGNED_OK # define inflateReset z_inflateReset
#endif # define inflateReset2 z_inflateReset2
# define inflateSetDictionary z_inflateSetDictionary
#ifdef __STDC_VERSION__ # define inflateSync z_inflateSync
# ifndef STDC # define inflateSyncPoint z_inflateSyncPoint
# define STDC # define inflateUndermine z_inflateUndermine
# endif # define inflate_copyright z_inflate_copyright
# if __STDC_VERSION__ >= 199901L # define inflate_fast z_inflate_fast
# ifndef STDC99 # define inflate_table z_inflate_table
# define STDC99 # define uncompress z_uncompress
# endif # define zError z_zError
# endif # define zcalloc z_zcalloc
#endif # define zcfree z_zcfree
#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) # define zlibCompileFlags z_zlibCompileFlags
# define STDC # define zlibVersion z_zlibVersion
#endif
#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) /* all zlib typedefs in zlib.h and zconf.h */
# define STDC # define Byte z_Byte
#endif # define Bytef z_Bytef
#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) # define alloc_func z_alloc_func
# define STDC # define charf z_charf
#endif # define free_func z_free_func
#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) # define gzFile z_gzFile
# define STDC # define gz_header z_gz_header
#endif # define gz_headerp z_gz_headerp
# define in_func z_in_func
#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ # define intf z_intf
# define STDC # define out_func z_out_func
#endif # define uInt z_uInt
# define uIntf z_uIntf
#ifndef STDC # define uLong z_uLong
# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ # define uLongf z_uLongf
# define const /* note: need a more gentle solution here */ # define voidp z_voidp
# endif # define voidpc z_voidpc
#endif # define voidpf z_voidpf
/* Some Mac compilers merge all .h files incorrectly: */ /* all zlib structs in zlib.h and zconf.h */
#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) # define gz_header_s z_gz_header_s
# define NO_DUMMY_DECL # define internal_state z_internal_state
#endif
#endif
/* Maximum value for memLevel in deflateInit2 */
#ifndef MAX_MEM_LEVEL #if defined(__MSDOS__) && !defined(MSDOS)
# ifdef MAXSEG_64K # define MSDOS
# define MAX_MEM_LEVEL 8 #endif
# else #if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
# define MAX_MEM_LEVEL 9 # define OS2
# endif #endif
#endif #if defined(_WINDOWS) && !defined(WINDOWS)
# define WINDOWS
/* Maximum value for windowBits in deflateInit2 and inflateInit2. #endif
* WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files #if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
* created by gzip. (Files created by minigzip can still be extracted by # ifndef WIN32
* gzip.) # define WIN32
*/ # endif
#ifndef MAX_WBITS #endif
# define MAX_WBITS 15 /* 32K LZ77 window */ #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
#endif # if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
# ifndef SYS16BIT
/* The memory requirements for deflate are (in bytes): # define SYS16BIT
(1 << (windowBits+2)) + (1 << (memLevel+9)) # endif
that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) # endif
plus a few kilobytes for small objects. For example, if you want to reduce #endif
the default memory requirements from 256K to 128K, compile with
make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" /*
Of course this will generally degrade compression (there's no free lunch). * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
* than 64k bytes at a time (needed on systems with 16-bit int).
The memory requirements for inflate are (in bytes) 1 << windowBits */
that is, 32K for windowBits=15 (default value) plus a few kilobytes #ifdef SYS16BIT
for small objects. # define MAXSEG_64K
*/ #endif
#ifdef MSDOS
/* Type declarations */ # define UNALIGNED_OK
#endif
#ifndef OF /* function prototypes */
# ifdef STDC #ifdef __STDC_VERSION__
# define OF(args) args # ifndef STDC
# else # define STDC
# define OF(args) () # endif
# endif # if __STDC_VERSION__ >= 199901L
#endif # ifndef STDC99
# define STDC99
/* The following definitions for FAR are needed only for MSDOS mixed # endif
* model programming (small or medium model with some far allocations). # endif
* This was tested only with MSC; for other MSDOS compilers you may have #endif
* to define NO_MEMCPY in zutil.h. If you don't need the mixed model, #if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
* just define FAR to be empty. # define STDC
*/ #endif
#ifdef SYS16BIT #if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
# if defined(M_I86SM) || defined(M_I86MM) # define STDC
/* MSC small or medium model */ #endif
# define SMALL_MEDIUM #if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
# ifdef _MSC_VER # define STDC
# define FAR _far #endif
# else #if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
# define FAR far # define STDC
# endif #endif
# endif
# if (defined(__SMALL__) || defined(__MEDIUM__)) #if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
/* Turbo C small or medium model */ # define STDC
# define SMALL_MEDIUM #endif
# ifdef __BORLANDC__
# define FAR _far #ifndef STDC
# else # ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
# define FAR far # define const /* note: need a more gentle solution here */
# endif # endif
# endif #endif
#endif
/* Some Mac compilers merge all .h files incorrectly: */
#if defined(WINDOWS) || defined(WIN32) #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
/* If building or using zlib as a DLL, define ZLIB_DLL. # define NO_DUMMY_DECL
* This is not mandatory, but it offers a little performance increase. #endif
*/
# ifdef ZLIB_DLL /* Maximum value for memLevel in deflateInit2 */
# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) #ifndef MAX_MEM_LEVEL
# ifdef ZLIB_INTERNAL # ifdef MAXSEG_64K
# define ZEXTERN extern __declspec(dllexport) # define MAX_MEM_LEVEL 8
# else # else
# define ZEXTERN extern __declspec(dllimport) # define MAX_MEM_LEVEL 9
# endif # endif
# endif #endif
# endif /* ZLIB_DLL */
/* If building or using zlib with the WINAPI/WINAPIV calling convention, /* Maximum value for windowBits in deflateInit2 and inflateInit2.
* define ZLIB_WINAPI. * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
* Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. * created by gzip. (Files created by minigzip can still be extracted by
*/ * gzip.)
# ifdef ZLIB_WINAPI */
# ifdef FAR #ifndef MAX_WBITS
# undef FAR # define MAX_WBITS 15 /* 32K LZ77 window */
# endif #endif
# include <windows.h>
/* No need for _export, use ZLIB.DEF instead. */ /* The memory requirements for deflate are (in bytes):
/* For complete Windows compatibility, use WINAPI, not __stdcall. */ (1 << (windowBits+2)) + (1 << (memLevel+9))
# define ZEXPORT WINAPI that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
# ifdef WIN32 plus a few kilobytes for small objects. For example, if you want to reduce
# define ZEXPORTVA WINAPIV the default memory requirements from 256K to 128K, compile with
# else make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
# define ZEXPORTVA FAR CDECL Of course this will generally degrade compression (there's no free lunch).
# endif
# endif The memory requirements for inflate are (in bytes) 1 << windowBits
#endif that is, 32K for windowBits=15 (default value) plus a few kilobytes
for small objects.
#if defined (__BEOS__) */
# ifdef ZLIB_DLL
# ifdef ZLIB_INTERNAL /* Type declarations */
# define ZEXPORT __declspec(dllexport)
# define ZEXPORTVA __declspec(dllexport) #ifndef OF /* function prototypes */
# else # ifdef STDC
# define ZEXPORT __declspec(dllimport) # define OF(args) args
# define ZEXPORTVA __declspec(dllimport) # else
# endif # define OF(args) ()
# endif # endif
#endif #endif
#ifndef ZEXTERN /* The following definitions for FAR are needed only for MSDOS mixed
# define ZEXTERN extern * model programming (small or medium model with some far allocations).
#endif * This was tested only with MSC; for other MSDOS compilers you may have
#ifndef ZEXPORT * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
# define ZEXPORT * just define FAR to be empty.
#endif */
#ifndef ZEXPORTVA #ifdef SYS16BIT
# define ZEXPORTVA # if defined(M_I86SM) || defined(M_I86MM)
#endif /* MSC small or medium model */
# define SMALL_MEDIUM
#ifndef FAR # ifdef _MSC_VER
# define FAR # define FAR _far
#endif # else
# define FAR far
#if !defined(__MACTYPES__) # endif
typedef unsigned char Byte; /* 8 bits */ # endif
#endif # if (defined(__SMALL__) || defined(__MEDIUM__))
typedef unsigned int uInt; /* 16 bits or more */ /* Turbo C small or medium model */
typedef unsigned long uLong; /* 32 bits or more */ # define SMALL_MEDIUM
# ifdef __BORLANDC__
#ifdef SMALL_MEDIUM # define FAR _far
/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ # else
# define Bytef Byte FAR # define FAR far
#else # endif
typedef Byte FAR Bytef; # endif
#endif #endif
typedef char FAR charf;
typedef int FAR intf; #if defined(WINDOWS) || defined(WIN32)
typedef uInt FAR uIntf; /* If building or using zlib as a DLL, define ZLIB_DLL.
typedef uLong FAR uLongf; * This is not mandatory, but it offers a little performance increase.
*/
#ifdef STDC # ifdef ZLIB_DLL
typedef void const *voidpc; # if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
typedef void FAR *voidpf; # ifdef ZLIB_INTERNAL
typedef void *voidp; # define ZEXTERN extern __declspec(dllexport)
#else # else
typedef Byte const *voidpc; # define ZEXTERN extern __declspec(dllimport)
typedef Byte FAR *voidpf; # endif
typedef Byte *voidp; # endif
#endif # endif /* ZLIB_DLL */
/* If building or using zlib with the WINAPI/WINAPIV calling convention,
#if 0 /* HAVE_UNISTD_H -- this line is updated by ./configure */ * define ZLIB_WINAPI.
# include <sys/types.h> /* for off_t */ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
# include <unistd.h> /* for SEEK_* and off_t */ */
# ifdef VMS # ifdef ZLIB_WINAPI
# include <unixio.h> /* for off_t */ # ifdef FAR
# endif # undef FAR
# define z_off_t off_t # endif
#endif # include <windows.h>
#ifndef SEEK_SET /* No need for _export, use ZLIB.DEF instead. */
# define SEEK_SET 0 /* Seek from beginning of file. */ /* For complete Windows compatibility, use WINAPI, not __stdcall. */
# define SEEK_CUR 1 /* Seek from current position. */ # define ZEXPORT WINAPI
# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ # ifdef WIN32
#endif # define ZEXPORTVA WINAPIV
#ifndef z_off_t # else
# define z_off_t long # define ZEXPORTVA FAR CDECL
#endif # endif
# endif
#if defined(__OS400__) #endif
# define NO_vsnprintf
#endif #if defined (__BEOS__)
# ifdef ZLIB_DLL
#if defined(__MVS__) # ifdef ZLIB_INTERNAL
# define NO_vsnprintf # define ZEXPORT __declspec(dllexport)
# ifdef FAR # define ZEXPORTVA __declspec(dllexport)
# undef FAR # else
# endif # define ZEXPORT __declspec(dllimport)
#endif # define ZEXPORTVA __declspec(dllimport)
# endif
/* MVS linker does not support external names larger than 8 bytes */ # endif
#if defined(__MVS__) #endif
# pragma map(deflateInit_,"DEIN")
# pragma map(deflateInit2_,"DEIN2") #ifdef HAVE_VISIBILITY_PRAGMA
# pragma map(deflateEnd,"DEEND") # define ZEXTERN __attribute__((visibility ("default"))) extern
# pragma map(deflateBound,"DEBND") #endif
# pragma map(inflateInit_,"ININ")
# pragma map(inflateInit2_,"ININ2") #ifndef ZEXTERN
# pragma map(inflateEnd,"INEND") # define ZEXTERN extern
# pragma map(inflateSync,"INSY") #endif
# pragma map(inflateSetDictionary,"INSEDI") #ifndef ZEXPORT
# pragma map(compressBound,"CMBND") # define ZEXPORT
# pragma map(inflate_table,"INTABL") #endif
# pragma map(inflate_fast,"INFA") #ifndef ZEXPORTVA
# pragma map(inflate_copyright,"INCOPY") # define ZEXPORTVA
#endif #endif
#endif /* ZCONF_H */ #ifndef FAR
# define FAR
#endif
#if !defined(__MACTYPES__)
typedef unsigned char Byte; /* 8 bits */
#endif
typedef unsigned int uInt; /* 16 bits or more */
typedef unsigned long uLong; /* 32 bits or more */
#ifdef SMALL_MEDIUM
/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
# define Bytef Byte FAR
#else
typedef Byte FAR Bytef;
#endif
typedef char FAR charf;
typedef int FAR intf;
typedef uInt FAR uIntf;
typedef uLong FAR uLongf;
#ifdef STDC
typedef void const *voidpc;
typedef void FAR *voidpf;
typedef void *voidp;
#else
typedef Byte const *voidpc;
typedef Byte FAR *voidpf;
typedef Byte *voidp;
#endif
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
# define Z_HAVE_UNISTD_H
#endif
#ifdef Z_HAVE_UNISTD_H
# include <sys/types.h> /* for off_t */
# include <unistd.h> /* for SEEK_* and off_t */
# ifdef VMS
# include <unixio.h> /* for off_t */
# endif
# ifndef z_off_t
# define z_off_t off_t
# endif
#endif
#ifdef _LARGEFILE64_SOURCE
# include <sys/types.h>
#endif
#ifndef SEEK_SET
# define SEEK_SET 0 /* Seek from beginning of file. */
# define SEEK_CUR 1 /* Seek from current position. */
# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
#endif
#ifndef z_off_t
# define z_off_t long
#endif
#if defined(__OS400__)
# define NO_vsnprintf
#endif
#if defined(__MVS__)
# define NO_vsnprintf
#endif
/* MVS linker does not support external names larger than 8 bytes */
#if defined(__MVS__)
#pragma map(deflateInit_,"DEIN")
#pragma map(deflateInit2_,"DEIN2")
#pragma map(deflateEnd,"DEEND")
#pragma map(deflateBound,"DEBND")
#pragma map(inflateInit_,"ININ")
#pragma map(inflateInit2_,"ININ2")
#pragma map(inflateEnd,"INEND")
#pragma map(inflateSync,"INSY")
#pragma map(inflateSetDictionary,"INSEDI")
#pragma map(compressBound,"CMBND")
#pragma map(inflate_table,"INTABL")
#pragma map(inflate_fast,"INFA")
#pragma map(inflate_copyright,"INCOPY")
#endif
#endif /* ZCONF_H */

2962
extlibs/headers/zlib/zlib.h → extlibs/headers/png/zlib.h
View File

File diff suppressed because it is too large Load Diff

BIN
extlibs/libs-mingw/libpng.a
View File

Binary file not shown.

BIN
extlibs/libs-vc2005/png.lib
View File

Binary file not shown.

BIN
samples/bin/openal32.dll
View File

Binary file not shown.

8
src/SFML/Graphics/ImageLoader.cpp
View File

@ -35,6 +35,10 @@ extern "C"
#include <png.h> #include <png.h>
#include <SOIL/SOIL.h> #include <SOIL/SOIL.h>
// For compatibility with versions of libpng < 1.4.0
#ifndef png_jmpbuf
#define png_jmpbuf(png) png->jmpbuf
#endif
namespace namespace
{ {
@ -44,7 +48,7 @@ namespace
void PngErrorHandler(png_structp png, png_const_charp message) void PngErrorHandler(png_structp png, png_const_charp message)
{ {
sf::Err() << "Failed to write PNG image. Reason : " << message << std::endl; sf::Err() << "Failed to write PNG image. Reason : " << message << std::endl;
longjmp(png->jmpbuf, 1); longjmp(png_jmpbuf(png), 1);
} }
} }
@ -288,7 +292,7 @@ bool ImageLoader::WritePng(const std::string& filename, const std::vector<Uint8>
} }
// For proper error handling... // For proper error handling...
if (setjmp(png->jmpbuf)) if (setjmp(png_jmpbuf(png)))
{ {
png_destroy_write_struct(&png, &pngInfos); png_destroy_write_struct(&png, &pngInfos);
return false; return false;