janwas
4be0fe18a0
. major compat fixes for interoperation with wxw. . add crashlog_sender (modified version of debgrpt wxw sample). compiles but untested, will be changed heavily further improvements: . wposix no longer declares CRT functions. instead, use CRT headers.. but don't allow their (incorrect/non-POSIX) declarations to propagate to users. . split up win.cpp into wstartup, wutil, winit . extern "C" -> EXTERN_C . move sdl.* to lib/external_libraries and add png.h+zlib.h (fixes for and include of the library) This was SVN commit r5028.
21 lines
559 B
C
21 lines
559 B
C
// 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
|
|
|
|
#define ZLIB_DLL
|
|
#include <zlib.h>
|
|
|
|
// automatically link against the required library
|
|
#if MSC_VERSION
|
|
# ifdef NDEBUG
|
|
# pragma comment(lib, "zlib1.lib")
|
|
# else
|
|
# pragma comment(lib, "zlib1d.lib")
|
|
# endif
|
|
#endif
|