aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2010-02-20 16:51:39 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2010-02-20 16:51:39 +0000
commit7c8cc4caf30a1437208aea2e0cdf780eecb45e37 (patch)
treeaf013950691dd5447da69f1cf8fc524aa4a1ae46
parent9fde407f30007cc47c3cdd48bc221d8a5fe14746 (diff)
windows build fixes
svn path=/trunk/externals/markex/; revision=13181
-rw-r--r--Makefile2
-rw-r--r--markex.c2
-rw-r--r--randomF.c2
-rw-r--r--tripleRand.c2
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 <math.h>
#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 <math.h>
#endif
-#ifdef NT
+#ifdef _WIN32
int random(void)
{
static int foo = 1489853723;