Compilation sous WINDOWS

4 files changed, 12 insertions, 110 deletions

diff --git a/src/Makefile.win32 b/src/Makefile.win32
index 73f9fca..865c461 100644
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -19,8 +19,8 @@
 MAJOR=3
 MINOR=11
 
-PCREINC = -I "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4\\" 
-PCRELIB = Debug\pcre.lib
+PCREINC = -I "..\..\pcre-7.5\\" 
+PCRELIB = ..\..\pcre\x64\Release\pcre.lib
 
 #PCREINC = -I "C:\Program Files\GnuWin32\include" #`pcre-config --cflags`
 #PCRELIB = "C:\Program Files\GnuWin32\lib\libpcre.lib" #`pcre-config --libs`
@@ -40,8 +40,8 @@ PCREOBJ =
 CFLAGS = /W3 /DWIN32 /D_CRT_SECURE_NO_DEPRECATE /nologo
 #LIBTOOL=ar q # linux and solaris
 #LIBTOOL=libtool -static -o
-LIBTOOL=lib /nologo /out:
-TOOLS_DIR = ../tools
+LIBTOOL=lib /nologo
+TOOLS_DIR = tools
 
 #REGEXP = -DGNU_REGEXP  -DREGCOMP_OPT=$(REGCOMP_OPT) # deprecated !
 REGEXP= /DUSE_PCRE_REGEX /DPCRE_OPT=$(PCRE_OPT)
@@ -50,10 +50,10 @@ REGEXP= /DUSE_PCRE_REGEX /DPCRE_OPT=$(PCRE_OPT)
 CHANNEL = -DTCL_CHANNEL_INTEGRATION 
 
 OBJ = intervalRegexp.obj ivyloop.obj timer.obj ivysocket.obj ivy.obj \
-      ivybuffer.obj ivyfifo.obj ivybind.obj getopt.obj 
+      ivybuffer.obj ivyfifo.obj ivybind.obj
 
 # WINDOWS add ivyloop.obj if TCL_CHANNEL_INTEGRATION is not set
-TARGETLIBS=libivy.dll
+TARGETLIBS=ivy.dll
 
 .c.obj:
 	$(CC) $(CFLAGS) /c $*.c
@@ -68,22 +68,13 @@ ivybind.obj: ivybind.c
 	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivybind.c
 
 
-ivyprobe.exe: ivyprobe.obj libivy.lib
-	$(CC)  $(CFLAGS) /Fe$@ ivyprobe.obj libivy.lib wsock32.lib $(PCRELIB)
-
-ivyprobe.obj : ivyprobe.c 
-	$(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivyprobe.c
-
-ivyperf.exe: ivyperf.obj libivy.lib
-	$(CC) $(CFLAGS) /Fe$@ ivyperf.obj libivy.lib wsock32.lib $(PCRELIB)
-
 
 libivy.lib: $(OBJ)
 	del /f $@
-	$(LIBTOOL)$@ $(OBJ)
+	$(LIBTOOL) /out:$@ $(OBJ) 
 
-libivy.dll: $(OBJ)
-	$(CC) /dll /out: $@ $(OBJ) $(PCRELIB)
+ivy.dll: $(OBJ)
+	LINK /dll /out:$@ /DEF:libivy.def $(OBJ) $(PCRELIB) wsock32.lib
 
 tools: static-libs 
 	@(cd $(TOOLS_DIR) && $(MAKE) -f Makefile.win32)
diff --git a/src/getopt.c b/src/getopt.c
deleted file mode 100644
index 36a9bc1..0000000
--- a/src/getopt.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-int             optind = 1;
-char            *optarg = (char *)NULL;
-
-int	getopt (int argc, char **argv, char *optstring)
-{
-    int		cur_option;		/* Current option		*/
-    char	*cp;			/* Character pointer		*/
-    static int	GetOptionPosition = 1;
-
-    if (GetOptionPosition == 1)
-    {
-
-/* Check for out of range, correct start character and not single */
-
-	if ((optind >= argc) || (*argv[optind] != '-') || !argv[optind][1])
-	    return EOF;
-
-	if (!strcmp (argv[optind], "--"))
-	    return EOF;
-    }
-
-/* Get the current character from the current argument vector */
-
-    cur_option = argv[optind][GetOptionPosition];
-
-/* Validate it */
-
-    if ((cur_option == ':') ||
-	((cp = strchr (optstring, cur_option)) == (char *)NULL))
-    {
-
-/* Move to the next offset */
-
-	if (!argv[optind][++GetOptionPosition])
-	{
-	    optind++;
-	    GetOptionPosition = 1;
-	}
-
-	return '?';
-    }
-
-/* Parameters following ? */
-
-    optarg = (char *)NULL;
-
-    if (*(++cp) == ':')
-    {
-	if (argv[optind][GetOptionPosition + 1])
-	    optarg = &argv[optind++][GetOptionPosition + 1];
-
-	else if (++optind >= argc)
-	{
-	    optarg = (char *)NULL;
-	    GetOptionPosition = 1;
-	    return '?';
-	}
-
-	else
-	    optarg = argv[optind++];
-
-	GetOptionPosition = 1;
-    }
-
-    else if (!argv[optind][++GetOptionPosition])
-    {
-	GetOptionPosition = 1;
-	optind++;
-    }
-
-    return cur_option;
-}
diff --git a/src/getopt.h b/src/getopt.h
deleted file mode 100644
index d52543f..0000000
--- a/src/getopt.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __GETOPT_H_
-#define __GETOPT_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int             optind ;
-extern char            *optarg ;
-extern int	getopt (int argc, char **argv, char *optstring) ;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/libIvy.def b/src/libIvy.def
index df671c7..d8998f3 100644
--- a/src/libIvy.def
+++ b/src/libIvy.def
@@ -16,6 +16,7 @@ IvyGetApplicationHost
 IvyGetApplication
 IvyGetApplicationList
 IvyGetApplicationMessages
+IvySetBindCallback
 IvyBindMsg
 IvyUnbindMsg
 IvySendError
@@ -38,3 +39,5 @@ IvyBindingFree
 
 IvyBindingExec
 IvyBindingMatch
+
+TimerRepeatAfter
\ No newline at end of file