Changeset 1231

Timestamp:

05/25/03 00:46:14 (5 years ago)

Author:

augur

Message:

Updates for Microsoft Visual Studio 6.0.
Created a new static library called libswishsearch.lib. This includes only search functionality and it links with libcmt.lib (Microsoft C Multithreaded Runtime). We need multithreaded libraries to link our newly donated ActiveX control.

Files:

• trunk/swish-e/src/win32/acconfig.h (modified) (3 diffs)
• trunk/swish-e/src/win32/libswishe.dsp (modified) (9 diffs)
• trunk/swish-e/src/win32/libswishsearch.dsp (added)
• trunk/swish-e/src/win32/swishe.dsw (modified) (4 diffs)

trunk/swish-e/src/win32/acconfig.h

@@ -1 +1 @@
-#ifdef _WIN32
-
-/* We define this in OS-specific code which include's config.h  */
-#ifndef _SWISH_PORT
-#  include "win32/dirent.h"
-#  include "pcreposix.h"
-#  include "mkstemp.h"
-#endif
-
-/* Special Inclusions  */
+#include <windows.h>    /* Win32 API */
-#include <stdlib.h>             /* _sleep() */
-#include <process.h>    /* _getpid() */
@@ -15 +9 @@
-#include <sys/types.h>  /* Most io.h functions want this */
-#include <sys/stat.h>   /* Most io.h functions want this */
+
+/* We define this in OS-specific code which include's config.h  */
+#ifndef _SWISH_PORT
+#  include "dirent.h"
+#  include "pcreposix.h"
+#  include "mkstemp.h"
+#endif
-
-/* ifdef logic  */
@@ -29 +30 @@
-/* Macros which rewrite values  */
-#define SWISH_VERSION "2.3.4"   /* Should we find a better way to handle this */
+#define VERSION SWISH_VERSION   /* Some things want this  */
+#define libexecdir "/usr/local/lib"  /* Microsoft CPP is brain damaged */
-
-/* Internal SWISH-E File Access Modes */

trunk/swish-e/src/win32/libswishe.dsp

@@ -42 +42 @@
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /I "..\..\..\expat\xmlparse" /I "..\..\..\expat\xmltok" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-
+\include" /I "..\replace
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
@@ -65 +65 @@
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\expat\xmlparse" /I "..\..\..\expat/xmltok" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-
+/include" /I "..\replace
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
@@ -202 +202 @@
-# Begin Source File
-
-
+replace\
-# End Source File
-# Begin Source File
@@ -254 +254 @@
-# Begin Source File
-
-SOURCE=..\string.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\swish2.c
-# End Source File
@@ -271 +267 @@
-
-SOURCE=..\swregex.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\swstring.c
-# End Source File
-# Begin Source File
@@ -286 +286 @@
-# Begin Source File
-
+SOURCE=..\_datatypes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\_module_example.h
+# End Source File
+# Begin Source File
+
-SOURCE=.\acconfig.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\_datatypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\_module_example.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\check.h
-# End Source File
@@ -414 +414 @@
-# Begin Source File
-
-
-
-
-
-
+
-# End Source File
-# Begin Source File
@@ -474 +470 @@
-# Begin Source File
-
-SOURCE=..\string.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\swish.h
-# End Source File
@@ -491 +483 @@
-
-SOURCE=..\swregex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\swstring.h
-# End Source File
-# Begin Source File

trunk/swish-e/src/win32/swishe.dsw

@@ -16 +16 @@
-###############################################################################
-
-..\..\
+
-
-Package=<5>
@@ -29 +29 @@
-
-Project: "libswishe"=".\libswishe.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libswishsearch"=".\libswishsearch.dsp" - Package Owner=<4>
-
-Package=<5>
@@ -76 +88 @@
-###############################################################################
-
-..\..\
+
-
-Package=<5>
@@ -91 +103 @@
-###############################################################################
-
-..\..\
+
-
-Package=<5>