dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-02-17 01:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use system zlib

Browse source
This commit is contained in:
dhewg 2012-07-04 17:46:41 +02:00
parent 764799c14f
commit 6179e855a9
3 changed files with 6 additions and 3261 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
neo/CMakeLists.txt
View file

@ -76,6 +76,9 @@ if (DHEWM3LIBS)
endif()
# libs
find_package(ZLIB REQUIRED)
include_directories(${ZLIB_INCLUDE_DIRS})
find_package(JPEG REQUIRED)
include_directories(${JPEG_INCLUDE_DIR})
@ -734,6 +737,7 @@ if (CORE)
${VORBIS_LIBRARIES}
${CURL_LIBRARY}
${JPEG_LIBRARY}
${ZLIB_LIBRARY}
${SDL_LIBRARY}
${sys_libs}
)
@ -765,6 +769,7 @@ if (DEDICATED)
${VORBIS_LIBRARIES}
${CURL_LIBRARY}
${JPEG_LIBRARY}
${ZLIB_LIBRARY}
${SDL_LIBRARY}
${sys_libs}
)

3232
neo/framework/Unzip.cpp
View file

File diff suppressed because it is too large Load diff

30
neo/framework/Unzip.h
View file

@ -29,6 +29,7 @@ If you have questions concerning this license or the applicable additional terms
#ifndef __UNZIP_H__
#define __UNZIP_H__
#include <zlib.h>
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
/* like the STRICT of WIN32, we define a pointer that cannot be converted
@ -87,35 +88,6 @@ typedef struct unz_file_info_internal_s
unsigned long offset_curfile;/* relative offset of static header 4 unsigned chars */
} unz_file_info_internal;
typedef void* (*alloc_func) (void* opaque, unsigned int items, unsigned int size);
typedef void (*free_func) (void* opaque, void* address);
struct internal_state;
typedef struct z_stream_s {
unsigned char *next_in; /* next input unsigned char */
unsigned int avail_in; /* number of unsigned chars available at next_in */
unsigned long total_in; /* total nb of input unsigned chars read so */
unsigned char *next_out; /* next output unsigned char should be put there */
unsigned int avail_out; /* remaining free space at next_out */
unsigned long total_out; /* total nb of unsigned chars output so */
char *msg; /* last error message, NULL if no error */
struct internal_state *state; /* not visible by applications */
alloc_func zalloc; /* used to allocate the internal state */
free_func zfree; /* used to free the internal state */
unsigned char* opaque; /* private data object passed to zalloc and zfree */
int data_type; /* best guess about the data type: ascii or binary */
unsigned long adler; /* adler32 value of the uncompressed data */
unsigned long reserved; /* reserved for future use */
} z_stream;
typedef z_stream *z_streamp;
/* file_in_zip_read_info_s contain internal information about a file in zipfile,
when reading and decompress it */
typedef struct