From eef724f3d0e751fb61be907c09d553a4beab4501 Mon Sep 17 00:00:00 2001
From: fcolin
Date: Mon, 21 Apr 2008 15:33:21 +0000
Subject: compilation sous WINDOWS

---
 tools/Makefile.win32 | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'tools/Makefile.win32')

diff --git a/tools/Makefile.win32 b/tools/Makefile.win32
index 9149241..653a6a8 100644
--- a/tools/Makefile.win32
+++ b/tools/Makefile.win32
@@ -1,7 +1,7 @@
-PCREINC = -I "C:\Users\fcolin\Documents\Projects Visual Studio\pcre-6.4\\" 
-PCRELIB = ..\Release\pcre.lib
-IVYLIB = ..\Release\ivy.lib
-EXTRALIB= -L..\Release
+PCREINC = -I "..\..\pcre-7.5\\" 
+PCRELIB = ..\..\..\pcre\x64\Release\pcre.lib
+IVYLIB = ..\ivy.lib
+EXTRALIB=
 EXTRAINC=-I..
 
 #PCREINC = -I "C:\Program Files\GnuWin32\include" #`pcre-config --cflags`
@@ -40,14 +40,17 @@ all: commands
 
 commands: $(TARGETS)
 
-ivyprobe.exe: ivyprobe.obj $(IVYLIB)
-	$(CC)  $(CFLAGS) $(EXTRAINC) /Fe$@ ivyprobe.obj $(IVYLIB) wsock32.lib $(PCRELIB) $(EXTRALIB)
+ivyprobe.exe: ivyprobe.obj getopt.obj $(IVYLIB)
+	$(CC)  $(LFLAGS) /Fe$@ ivyprobe.obj getopt.obj $(IVYLIB) wsock32.lib $(PCRELIB) $(EXTRALIB)
 
 ivyprobe.obj : ivyprobe.c 
-	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) $(EXTRAINC) /c ivyprobe.c
+	$(CC) $(CFLAGS) $(EXTRAINC) $(REGEXP) $(PCREINC) $(EXTRAINC) /c ivyprobe.c
 
-ivyperf.exe: ivyperf.obj $(IVYLIB)
-	$(CC) $(CFLAGS) /Fe$@ ivyperf.obj $(IVYLIB) wsock32.lib $(PCRELIB) $(EXTRALIB)
+ivyperf.obj : ivyperf.c 
+	$(CC) $(CFLAGS) $(EXTRAINC) $(REGEXP) $(PCREINC) $(EXTRAINC) /c ivyperf.c
+
+ivyperf.exe: ivyperf.obj getopt.obj $(IVYLIB)
+	$(CC) $(LFLAGS) /Fe$@ ivyperf.obj getopt.obj $(IVYLIB) wsock32.lib $(PCRELIB) $(EXTRALIB)
 
 
 clean:
-- 
cgit v1.1