From 7c8cc4caf30a1437208aea2e0cdf780eecb45e37 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 20 Feb 2010 16:51:39 +0000 Subject: windows build fixes svn path=/trunk/externals/markex/; revision=13181 --- Makefile | 2 +- markex.c | 2 +- randomF.c | 2 +- tripleRand.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 24e717d..3cc2ffc 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,7 @@ ifeq (MINGW,$(findstring MINGW,$(UNAME))) EXTENSION = dll OS = windows OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -march=i686 -mtune=pentium4 - WINDOWS_HACKS = -D'O_NONBLOCK=1' + WINDOWS_HACKS = CFLAGS += -mms-bitfields $(WINDOWS_HACKS) LDFLAGS += -s -shared -Wl,--enable-auto-import LIBS += -L$(PD_PATH)/src -L$(PD_PATH)/bin -L$(PD_PATH)/obj -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 diff --git a/markex.c b/markex.c index f16aee8..7fe33dc 100644 --- a/markex.c +++ b/markex.c @@ -3,7 +3,7 @@ MarkEx, Copyright (c) 1997-1999 Mark Danks */ -#ifdef NT +#ifdef _MSC_VER #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 ) #endif diff --git a/randomF.c b/randomF.c index bce7780..5880bbf 100644 --- a/randomF.c +++ b/randomF.c @@ -11,7 +11,7 @@ #include #endif -#ifdef NT +#ifdef _WIN32 int random(void) { static int foo = 1489853723; diff --git a/tripleRand.c b/tripleRand.c index 98923a3..c10f332 100644 --- a/tripleRand.c +++ b/tripleRand.c @@ -11,7 +11,7 @@ #include #endif -#ifdef NT +#ifdef _WIN32 int random(void) { static int foo = 1489853723; -- cgit v1.2.1