|
From: <bo...@us...> - 2003-12-16 22:47:25
|
Update of /cvsroot/sharedaemon/core/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25219
Modified Files:
Makefile.cvs osdep.h
Log Message:
Fixed new compilation problems on MingW32
Index: Makefile.cvs
===================================================================
RCS file: /cvsroot/sharedaemon/core/src/Makefile.cvs,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.cvs 8 Dec 2003 20:07:41 -0000 1.14
+++ Makefile.cvs 16 Dec 2003 22:47:21 -0000 1.15
@@ -49,7 +49,7 @@
ifdef WIN32
CXX = g++ -b i686-mingw32msvc
CC = gcc -b i686-mingw32msvc
-LDFLAGS += -lwsock32
+LDFLAGS += -lwsock32 -lmingwex
BINARY = test.exe
CPPFLAGS += -DWIN32
endif
@@ -57,17 +57,19 @@
ifdef LINUX
BINARY = test
CPPFLAGS += -DLINUX
+CFLAGS += -std=c99
endif
ifdef MACOSX
BINARY = test
CPPFLAGS += -DMACOSX
+CFLAGS += -std=c99
endif
all: $(BINARY)
-CFLAGS += -g -Wall -O3 -std=c99
+CFLAGS += -g -Wall -O3
CXXFLAGS += -g -Wall -O3
CPPFLAGS += -DXMULE2
LDFLAGS += -g -lm
Index: osdep.h
===================================================================
RCS file: /cvsroot/sharedaemon/core/src/osdep.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- osdep.h 12 Dec 2003 18:20:21 -0000 1.14
+++ osdep.h 16 Dec 2003 22:47:21 -0000 1.15
@@ -88,6 +88,9 @@
#define sleep(x) Sleep(1000*x)
//_sleep
+#define S_ISLNK(x) (false)
+#define lstat stat
+
static inline int ioctl(int d, int request, int * x) {
unsigned long y=*x;
return ioctlsocket(d,request,&y);
|