From 6377b643cced54190fcfa09f0fb5ac1c1279b770 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Mon, 25 Jun 2001 21:16:48 +0000 Subject: [PATCH] updates. --- CHANGES | 9 +++++++++ includes/silcincludes.h | 12 ++++++------ lib/Makefile.am.pre | 15 ++++++++++++++- lib/silcmath/silcmp.h | 4 ++-- 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 5fed3955..22ad8671 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,12 @@ +Mon Jun 25 21:42:51 EEST 2001 Pekka Riikonen + + * Do not add regex.h for WIN32. The affected file + includes/silcincludes.h. + + * Added WIN32 DLL generation to lib/Makefile.am.pre. It might + not work yet 100%. It generates the DLL's automatically + when compiling with --with-win32 under cygwin. + Sun Jun 24 19:49:23 EEST 2001 Pekka Riikonen * lib/contrib/regex.c is not compiled on WIN32. diff --git a/includes/silcincludes.h b/includes/silcincludes.h index 3f9c41b4..ad8ac542 100644 --- a/includes/silcincludes.h +++ b/includes/silcincludes.h @@ -118,18 +118,18 @@ #include #endif -#endif /* !SILC_WIN32 */ - -#ifndef HAVE_GETOPT_LONG -#include "../lib/contrib/getopt.h" -#endif - #ifndef HAVE_REGEX_H #include "../lib/contrib/regex.h" #else #include #endif +#endif /* !SILC_WIN32 */ + +#ifndef HAVE_GETOPT_LONG +#include "../lib/contrib/getopt.h" +#endif + #ifndef TRUE #define TRUE 1 #endif diff --git a/lib/Makefile.am.pre b/lib/Makefile.am.pre index 60b16fb1..0b553b69 100644 --- a/lib/Makefile.am.pre +++ b/lib/Makefile.am.pre @@ -60,7 +60,7 @@ if SILC_DIST_TOOLKIT all: remove libsilc.a libsilcclient.a else if SILC_DIST_WIN32DLL -all: remove libsilc.a libsilcclient.a +all: silc.dll silcclient.dll else all: remove libsilc.a endif @@ -71,6 +71,19 @@ remove: -rm -rf libsilc.a -rm -rf libsilcclient.a +if SILC_DIST_WIN32DLL +# WIN32 DLL generation +silc.dll: libsilc.a + dllwrap --export-all --output-def silc.def \ + --implib libsilc.a --driver-name $(CC) --target i386-mingw32 \ + --mno-cygwin -o silc.dll libsilc.a -lwsock32 + +silcclient.dll: libsilcclient.a + dllwrap --export-all --output-def silcclient.def \ + --implib libsilcclient.a --driver-name $(CC) --target i386-mingw32 \ + --mno-cygwin -o silcclient.dll libsilcclient.a +endif + libsilc.a: find $(SILCLIB_DIRS) -type f -name *.o | xargs $(AR) cru libsilc.a ranlib libsilc.a diff --git a/lib/silcmath/silcmp.h b/lib/silcmath/silcmp.h index 42d99057..62d7a0d0 100644 --- a/lib/silcmath/silcmp.h +++ b/lib/silcmath/silcmp.h @@ -6,9 +6,9 @@ * * COPYRIGHT * - * Author: Pekka Riikonen + * Author: Pekka Riikonen * - * Copyright (C) 1997 - 2000 Pekka Riikonen + * Copyright (C) 1997 - 2001 Pekka Riikonen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- 2.24.0