cleanup DEBUG code

1 files changed, 14 insertions, 17 deletions

diff --git a/src/Makefile.win32 b/src/Makefile.win32
index f7aec5a..0d05a89 100755
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -19,7 +19,7 @@
 MAJOR=3
 MINOR=8
 
-PCREINC = -I "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4" 
+PCREINC = -I "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4\\" 
 PCRELIB = "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4\lib\libpcre.lib" #`pcre-config --libs`
 
 #PCREINC = -I "C:\Program Files\GnuWin32\include" #`pcre-config --cflags`
@@ -37,13 +37,13 @@ PCREOBJ =
 
 #CC=gcc
 #CFLAGS = -g -Wall
-CFLAGS = -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -nologo
+CFLAGS = /W3 /DWIN32 /D_CRT_SECURE_NO_DEPRECATE /nologo
 #LIBTOOL=ar q # linux and solaris
 #LIBTOOL=libtool -static -o
-LIBTOOL=lib -nologo /out:
+LIBTOOL=lib /nologo /out:
 
 #REGEXP = -DGNU_REGEXP  -DREGCOMP_OPT=$(REGCOMP_OPT) # deprecated !
-REGEXP= -DUSE_PCRE_REGEX -DPCRE_OPT=$(PCRE_OPT)
+REGEXP= /DUSE_PCRE_REGEX /DPCRE_OPT=$(PCRE_OPT)
 # on activeTCL , set #define CHANNEL to null, and add ivyloop.obj in the ivytcl target,
 # see below
 CHANNEL = -DTCL_CHANNEL_INTEGRATION 
@@ -51,11 +51,11 @@ CHANNEL = -DTCL_CHANNEL_INTEGRATION
 OBJ = ivyloop.obj timer.obj ivysocket.obj ivy.obj 
 
 # WINDOWS add ivyloop.obj if TCL_CHANNEL_INTEGRATION is not set
-TARGETS = ivyprobe ivyperf 
+TARGETS = ivyprobe.exe ivyperf.exe 
 TARGETLIBS=libivy.dll
 
 .c.obj:
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) $(CFLAGS) /c $*.c
 
 all: static-libs commands shared-libs
 
@@ -66,34 +66,31 @@ shared-libs: $(TARGETLIBS)
 commands: $(TARGETS)
 
 ivy.obj: ivy.c
-	$(CC) -c $(CFLAGS) $(REGEXP) $(PCREINC) ivy.c
+	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivy.c
 
 
-ivyprobe: ivyprobe.obj libivy.lib
+ivyprobe.exe: ivyprobe.obj libivy.lib
 	$(CC)  $(CFLAGS) -o $@ ivyprobe.obj libivy.lib wsock32.lib $(PCRELIB)
 
 ivyprobe.obj : ivyprobe.c 
-	$(CC)  $(CFLAGS) $(REGEXP) $(PCREINC) -c ivyprobe.c -o $@ 
+	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivyprobe.c
 	
-ivyperf: ivyperf.obj libivy.lib
-	$(CC)  $(CFLAGS) -o $@ ivyperf.obj libivy.lib wsock32.lib $(PCRELIB)
+ivyperf.exe: ivyperf.obj libivy.lib
+	$(CC) $(CFLAGS) -o $@ ivyperf.obj libivy.lib wsock32.lib $(PCRELIB)
 
 ivyperf.obj : ivyperf.c
-	$(CC)  $(CFLAGS) $(REGEXP) $(PCREINC) -c ivyperf.c -o $@
+	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivyperf.c
 
 
 libivy.lib: $(OBJ)
 	del /f $@
 	$(LIBTOOL)$@ $(OBJ)
 
-
-# TODO this PCREOBJ is a dirty hack
-
 libivy.dll: $(OBJ)
-	$(CC) /dll -o $@ $(OBJ) $(PCRELIB)
+	$(CC) /dll /out: $@ $(OBJ) $(PCRELIB)
 
 clean:
-	-del /f $(TARGETS) $(TARGETLIBS) *.obj *.a *.dll *~
+	-del /f $(TARGETS) $(TARGETLIBS) *.obj *.lib *.dll *~