summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorfcolin2008-06-23 12:57:35 +0000
committerfcolin2008-06-23 12:57:35 +0000
commitf4c5e0df26399eb354fb909aef19045645007715 (patch)
tree8a179e8780051e84f82169765502fdd50b0bb95c /tools
parentc8fa99ae894adf2643c9cf44b570a39931d5d1ee (diff)
downloadivy-c-f4c5e0df26399eb354fb909aef19045645007715.zip
ivy-c-f4c5e0df26399eb354fb909aef19045645007715.tar.gz
ivy-c-f4c5e0df26399eb354fb909aef19045645007715.tar.bz2
ivy-c-f4c5e0df26399eb354fb909aef19045645007715.tar.xz
Mise a jour pour compilation MinGW
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.mingw4
-rw-r--r--tools/ivyprobe.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/Makefile.mingw b/tools/Makefile.mingw
index 8fd66a7..d2d71e4 100644
--- a/tools/Makefile.mingw
+++ b/tools/Makefile.mingw
@@ -26,7 +26,7 @@ GLUTINC = -I/usr/include -I.
GLUTLIB = -L.
TCLINCL = -I/usr/include/tcl8.4
TCLLIB = -ltcl84
-EXTRALIB= -L../src
+EXTRALIB= -L../src -lwsock32 -lregex
EXTRAINC=-I../src
@@ -43,7 +43,7 @@ TARGETS = ivyprobe
all: $(TARGETS)
ivyprobe: ivyprobe.o ../src/libivy.a
- (CC) $(CFLAGS) $(EXTRAINC) -o $@ ivyprobe.o -L. -livy $(PCRELIB) $(EXTRALIB)
+ $(CC) $(CFLAGS) $(EXTRAINC) -o $@ ivyprobe.o -L. -livy $(PCRELIB) $(EXTRALIB)
clean:
-$(RM) $(TARGETS) *.o *.a *.so *.so.* *~
diff --git a/tools/ivyprobe.c b/tools/ivyprobe.c
index a70d1bb..a7913ec 100644
--- a/tools/ivyprobe.c
+++ b/tools/ivyprobe.c
@@ -34,10 +34,11 @@
#include <string.h>
#ifdef WIN32
#include <windows.h>
-#include "getopt.h"
#ifdef __MINGW32__
#include <regex.h>
#include <getopt.h>
+#else
+#include "getopt.h"
#endif
#else
#include <sys/time.h>