janwas
a859562ea7
- properly differentiate between buffer/offset alignment and length alignment (relevant since block size has been increased to 256k) - use VfsPath for most game paths instead of CStr - clean up timer interface and implementation - self-tests no longer crash - file_cache.cpp: fix for the case where allocation fails (prevent deleter from seeing a null pointer) - allocators: move all shared_ptr-related stuff to its own component; add DummySharedPtr - codec: disable checksums (important for performance at work) - File: made into an interface class to avoid export problems. not entirely sure about this.. - vfs_path.h, path.h, os_path.h: proper fix for using fs::change_extension and similar utility functions with derivatives of basic_path - lib_api: automatically link against import lib if building lib/ as a DLL - path_util: remove unused functions (this component is deprecated) - compiler.h: add INLINE - Xeromyces.cpp: pass PIVFS so that GetXMBPath works in self-test (should do this mostly everywhere rather than have one singleton g_VFS) This was SVN commit r5537.
47 lines
1.1 KiB
C
47 lines
1.1 KiB
C
/**
|
|
* =========================================================================
|
|
* File : zlib.h
|
|
* Project : 0 A.D.
|
|
* Description : bring in ZLib header+library, with compatibility fixes
|
|
* =========================================================================
|
|
*/
|
|
|
|
// license: GPL; see lib/license.txt
|
|
|
|
#ifndef INCLUDED_ZLIB
|
|
#define INCLUDED_ZLIB
|
|
|
|
// zlib.h -> zconf.h includes <windows.h>, which causes conflicts.
|
|
// define the include guard to prevent it from actually being included and
|
|
// then manually define the few things that are actually needed.
|
|
#define _WINDOWS_ // windows.h include guard
|
|
#ifndef WINAPI
|
|
# define WINAPI __stdcall
|
|
# define WINAPIV __cdecl
|
|
#endif
|
|
|
|
#ifndef FOM_ZLIB
|
|
#define ZLIB_DLL
|
|
#endif
|
|
|
|
#include <zlib.h>
|
|
|
|
// automatically link against the required library
|
|
#if MSC_VERSION
|
|
# ifdef FOM_ZLIB
|
|
# ifdef NDEBUG
|
|
# pragma comment(lib, "fom_zlib.lib")
|
|
# else
|
|
# pragma comment(lib, "fom_zlib_d.lib")
|
|
# endif
|
|
# else
|
|
# ifdef NDEBUG
|
|
# pragma comment(lib, "zlib1.lib")
|
|
# else
|
|
# pragma comment(lib, "zlib1d.lib")
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#endif // #ifndef INCLUDED_ZLIB
|