Compile fixes (nw)

This commit is contained in:
Miodrag Milanovic 2015-01-10 12:24:05 +01:00
parent c4fa7719b1
commit 60d8d08c52
4 changed files with 7 additions and 5 deletions

View File

@ -69,7 +69,7 @@ typedef signed char int16_t;
#if SIZEOF_INT == 4
typedef unsigned int u_int32_t;
typedef signed int int32_t;
#elif SIZEOF_LONG == 4
#elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 4)
typedef unsigned long u_int32_t;
typedef signed long int32_t;
#elif SIZEOF_SHORT == 4
@ -92,7 +92,7 @@ typedef unsigned _int64 u_int64_t;
typedef _int64 int64_t;
#elif SIZEOF_INT == 8
typedef unsigned int u_int64_t;
#elif SIZEOF_LONG == 8
#elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
typedef unsigned long u_int64_t;
#elif SIZEOF_SHORT == 8
typedef unsigned short u_int64_t;

View File

@ -60,13 +60,15 @@
#define caddr_t char*
#if _MSC_VER < 1500
#if defined(_MSC_VER) && (_MSC_VER < 1500)
#define snprintf _snprintf
#define vsnprintf _vsnprintf
#define strdup _strdup
#endif
#if defined(_MSC_VER) && (_MSC_VER < 1700)
#define inline __inline
#endif
#ifdef __MINGW32__
#include <stdint.h>

View File

@ -334,7 +334,7 @@ SDLMAIN = $(SDLOBJ)/main.o
# needed for unidasm
LDFLAGS += -Wl,--allow-multiple-definition
SDL_NETWORK = pcap
INCPATH += -I$(3RDPARTY)/winpcap
INCPATH += -I$(3RDPARTY)/winpcap/Include
# enable UNICODE
DEFS += -Dmain=utf8_main -DUNICODE -D_UNICODE

View File

@ -442,7 +442,7 @@ endif
#-------------------------------------------------
# WinPCap
#-------------------------------------------------
INCPATH += -I$(3RDPARTY)/winpcap
INCPATH += -I$(3RDPARTY)/winpcap/Include
#-------------------------------------------------
# rules for building the libaries