Another MSV5.0 port. Changed projects to include proper

library/include paths.
Server starts server in test-mode when no options are given.

diff --git a/client/client.dsp b/client/client.dsp
index d54ea9b..48f7c5e 100644 (file)
--- a/client/client.dsp
+++ b/client/client.dsp
@@ -38,9 +38,10 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir ".\Release"\r
 # PROP Intermediate_Dir ".\Release"\r
+# PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir "."\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D WINDOWS=1 /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D WINDOWS=1 /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r
 # ADD RSC /l 0x406 /d "NDEBUG"\r
@@ -49,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yaz.lib /nologo /subsystem:console /machine:I386\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yaz.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release"\r
 \r
 !ELSEIF  "$(CFG)" == "client - Win32 Debug"\r
 \r
@@ -62,9 +63,10 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir ".\Debug"\r
 # PROP Intermediate_Dir ".\Debug"\r
+# PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir "."\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D WINDOWS=1 /FR /FD /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D WINDOWS=1 /FR /FD /c\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 # ADD BASE RSC /l 0x406 /d "_DEBUG"\r
 # ADD RSC /l 0x406 /d "_DEBUG"\r
@@ -73,7 +75,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yaz.lib /nologo /subsystem:console /incremental:no /debug /machine:I386\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yaz.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /libpath:"..\debug"\r
 \r
 !ENDIF \r
 \r

diff --git a/server/server.dsp b/server/server.dsp
index 66295ac..90eb32d 100644 (file)
--- a/server/server.dsp
+++ b/server/server.dsp
@@ -39,7 +39,7 @@ CPP=cl.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WINDOWS" /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WINDOWS" /FD /c\r
 # SUBTRACT CPP /YX\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
@@ -69,7 +69,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).lib $(ProjDir)\..\lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WINDOWS" /FR /FD /c\r
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WINDOWS" /FR /FD /c\r
 # SUBTRACT CPP /YX\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r

diff --git a/server/statserv.c b/server/statserv.c
index 3756a7f..03822ef 100644 (file)
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -7,7 +7,12 @@
  *   Chas Woodfield, Fretwell Downing Datasystem.
  *
  * $Log: statserv.c,v $
- * Revision 1.38  1997-09-04 14:19:14  adam
+ * Revision 1.39  1997-09-09 10:10:19  adam
+ * Another MSV5.0 port. Changed projects to include proper
+ * library/include paths.
+ * Server starts server in test-mode when no options are given.
+ *
+ * Revision 1.38  1997/09/04 14:19:14  adam
  * Added credits.
  *
  * Revision 1.37  1997/09/01 08:53:01  adam
@@ -127,11 +132,6 @@
  *
  */
 
-/*
- * Simple, static server. I wouldn't advise a static server unless you
- * really have to, but it's great for debugging memory management.  :)
- */
-
 #include <yconfig.h>
 #include <stdio.h>
 #ifdef WINDOWS
@@ -276,7 +276,8 @@ void statserv_closedown()
         int iHandles = 0;
         HANDLE *pThreadHandles = NULL;
 
-        /* We need to stop threads adding and removing while we start the closedown process */
+        /* We need to stop threads adding and removing while we */
+       /* start the closedown process */
         EnterCriticalSection(&Thread_CritSect);
 
         {
@@ -344,11 +345,11 @@ static void listener(IOCHAN h, int event)
     {
         if ((res = cs_listen(line, 0, 0)) < 0)
         {
-               logf(LOG_FATAL, "cs_listen failed.");
+           logf(LOG_FATAL, "cs_listen failed.");
            return;
         }
         else if (res == 1)
-               return;
+            return;
         logf(LOG_DEBUG, "listen ok");
         iochan_setevent(h, EVENT_OUTPUT);
         iochan_setflags(h, EVENT_OUTPUT | EVENT_EXCEPT); /* set up for acpt */
@@ -357,46 +358,50 @@ static void listener(IOCHAN h, int event)
     {
        COMSTACK new_line;
        IOCHAN new_chan;
-           char *a;
+       char *a = NULL;
         DWORD ThreadId;
 
-           if (!(new_line = cs_accept(line)))
-           {
-               logf(LOG_FATAL, "Accept failed.");
-               iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */
-               return;
-           }
-           logf(LOG_DEBUG, "accept ok");
+       if (!(new_line = cs_accept(line)))
+       {
+           logf(LOG_FATAL, "Accept failed.");
+           iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */
+           return;
+       }
+       logf(LOG_DEBUG, "accept ok");
 
-           if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, EVENT_INPUT)))
-           {
-               logf(LOG_FATAL, "Failed to create iochan");
+       if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, EVENT_INPUT)))
+       {
+           logf(LOG_FATAL, "Failed to create iochan");
             iochan_destroy(h);
             return;
-           }
-           if (!(newas = create_association(new_chan, new_line)))
-           {
-               logf(LOG_FATAL, "Failed to create new assoc.");
+       }
+
+       logf(LOG_DEBUG, "accept ok 2");
+       if (!(newas = create_association(new_chan, new_line)))
+       {
+           logf(LOG_FATAL, "Failed to create new assoc.");
             iochan_destroy(h);
             return;
-           }
-           iochan_setdata(new_chan, newas);
-           iochan_settimeout(new_chan, control_block.idle_timeout * 60);
-           a = cs_addrstr(new_line);
-           logf(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]");
-
-        /* Now what we need todo is create a new thread with this iochan as the parameter */
-/*        if (CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)event_loop, new_chan, 0, &ThreadId) == NULL)
-*/
-        /* Somehow, somewhere we need to store this thread id, otherwise we won't be able to close cleanly */
+       }
+       logf(LOG_DEBUG, "accept ok 3");
+       iochan_setdata(new_chan, newas);
+       iochan_settimeout(new_chan, control_block.idle_timeout * 60);
+       a = cs_addrstr(new_line);
+       logf(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]");
+    /* Now what we need todo is create a new thread with this iochan as
+       the parameter */
+    /* if (CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)event_loop, new_chan,
+           0, &ThreadId) == NULL) */
+    /* Somehow, somewhere we need to store this thread id, otherwise we won't be
+       able to close cleanly */
         NewHandle = (HANDLE)_beginthreadex(NULL, 0, event_loop, new_chan, 0, &ThreadId);
         if (NewHandle == (HANDLE)-1)
-           {
-               logf(LOG_FATAL, "Failed to create new thread.");
+       {
+
+           logf(LOG_FATAL|LOG_ERRNO, "Failed to create new thread.");
             iochan_destroy(h);
             return;
-           }
-
+       }
         /* We successfully created the thread, so add it to the list */
         statserv_add(NewHandle, new_chan);
 
@@ -756,7 +761,7 @@ int statserv_main(int argc, char **argv)
             }
     }
 
-#ifdef WINDOWS
+#if 0
     log_init(control_block.loglevel, NULL, control_block.logfile);
 #endif /* WINDOWS */
 

diff --git a/util/oid.c b/util/oid.c
index e521961..55ba752 100644 (file)
--- a/util/oid.c
+++ b/util/oid.c
@@ -4,7 +4,12 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: oid.c,v $
- * Revision 1.22  1997-08-29 13:34:58  quinn
+ * Revision 1.23  1997-09-09 10:10:19  adam
+ * Another MSV5.0 port. Changed projects to include proper
+ * library/include paths.
+ * Server starts server in test-mode when no options are given.
+ *
+ * Revision 1.22  1997/08/29 13:34:58  quinn
  * Added thesaurus oids
  *
  * Revision 1.21  1997/08/19 08:46:05  quinn
@@ -94,6 +99,7 @@
  * entries to the list at initialization.
  */
 
+#include <stdlib.h>
 #include <oid.h>
 #include <yaz-util.h>
 

diff --git a/yaz.dsp b/yaz.dsp
index 9ff8bec..da411b3 100644 (file)
--- a/yaz.dsp
+++ b/yaz.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINDOWS=1 /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINDOWS=1 /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE MTL /nologo /D "NDEBUG" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
@@ -62,7 +62,7 @@ TargetName=yaz
 SOURCE=$(InputPath)\r
 PostBuild_Desc=Copy Lib and Dll\r
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).lib $(ProjDir)\lib copy\\r
-  $(OutDir)\$(TargetName).dll $(ProjDir)\lib\r
+   $(OutDir)\$(TargetName).dll $(ProjDir)\lib\r
 # End Special Build Tool\r
 \r
 !ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
@@ -99,7 +99,7 @@ TargetName=yaz
 SOURCE=$(InputPath)\r
 PostBuild_Desc=Copy Lib and Dll\r
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).lib $(ProjDir)\lib copy\\r
-  $(OutDir)\$(TargetName).dll $(ProjDir)\lib\r
+   $(OutDir)\$(TargetName).dll $(ProjDir)\lib\r
 # End Special Build Tool\r
 \r
 !ENDIF \r
@@ -113,315 +113,1030 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).lib $(ProjDir)\lib copy\
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"\r
 # Begin Source File\r
 \r
+SOURCE=.\Util\atoin.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\odr\ber_any.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\ber_bit.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\ber_bool.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\ber_int.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\ber_len.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\ber_null.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\ber_oct.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\ber_oid.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\ber_tag.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\ccl\cclerrms.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\ccl\cclfind.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\ccl\cclptree.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\ccl\cclqfile.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\ccl\cclqual.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\ccl\cclstr.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\ccl\ccltoken.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\comstack\comstack.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_absyn.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_attset.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_doespec.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_espec.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_expout.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_grs.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_map.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_marc.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_read.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_soif.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_sumout.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_sutrs.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_tagset.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_varset.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\retrieval\d1_write.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\asn\diagbib1.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\util\dmalloc.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\dumpber.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\util\log.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\util\marcdisp.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\util\nmem.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_any.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_bit.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_bool.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_choice.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_cons.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_int.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_mem.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_null.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_oct.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_oid.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_priv.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_seq.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_tag.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_use.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\odr\odr_util.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\util\oid.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\util\options.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\util\pquery.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\asn\proto.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=".\asn\prt-acc.c"\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=".\asn\prt-add.c"\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=".\asn\prt-arc.c"\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=".\asn\prt-dia.c"\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=".\asn\prt-esp.c"\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=".\asn\prt-exd.c"\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=".\asn\prt-exp.c"\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=".\asn\prt-ext.c"\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=".\asn\prt-grs.c"\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=".\asn\prt-rsc.c"\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\util\query.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\util\readconf.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\comstack\tcpip.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\util\tpath.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\comstack\waislen.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\util\wrbuf.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\util\xmalloc.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=".\util\yaz-ccl.c"\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=".\util\yaz-util.c"\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\asn\zget.c\r
+\r
+!IF  "$(CFG)" == "yaz - Win32 Release"\r
+\r
+!ELSEIF  "$(CFG)" == "yaz - Win32 Debug"\r
+\r
+# ADD CPP /I "include"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/ztest/ztest.c b/ztest/ztest.c
index 5be99a9..52ea666 100644 (file)
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -7,7 +7,12 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.2  1997-09-04 13:50:31  adam
+ * Revision 1.3  1997-09-09 10:10:20  adam
+ * Another MSV5.0 port. Changed projects to include proper
+ * library/include paths.
+ * Server starts server in test-mode when no options are given.
+ *
+ * Revision 1.2  1997/09/04 13:50:31  adam
  * Bug fix in ztest.
  *
  */
@@ -48,6 +53,7 @@ bend_searchresult *bend_search(void *handle, bend_searchrequest *q, int *fd)
     r.errcode = 0;
     r.errstring = 0;
     r.hits = rand() % 22;
+
     return &r;
 }
 
@@ -144,10 +150,10 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
     r.basename = "DUMMY";
     if (bbb)
     {
-    xfree(bbb);
+        xfree(bbb);
        bbb = 0;
     }
-    
+    r.format = q->format;  
     if (q->format == VAL_SUTRS)
     {
        char buf[100];
@@ -170,11 +176,11 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num)
     else if (!(r.record = bbb = dummy_database_record(q->number)))
     {
        r.errcode = 13;
+       r.format = VAL_USMARC;
        return &r;
     }
     else
        r.len = strlen(r.record);
-    r.format = q->format;
     r.errcode = 0;
     return &r;
 }

diff --git a/ztest/ztest.dsp b/ztest/ztest.dsp
index c7a0405..0e5a6de 100644 (file)
--- a/ztest/ztest.dsp
+++ b/ztest/ztest.dsp
@@ -38,9 +38,10 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "Release"\r
 # PROP Intermediate_Dir "Release"\r
+# PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WINDOWS" /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WINDOWS" /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x406 /d "NDEBUG"\r
 # ADD RSC /l 0x406 /d "NDEBUG"\r
@@ -49,7 +50,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib yaz.lib server.lib /nologo /subsystem:console /machine:I386\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib yaz.lib server.lib /nologo /subsystem:console /machine:I386 /libpath:"..\release" /libpath:"..\server\release"\r
+# Begin Special Build Tool\r
+ProjDir=.\r
+SOURCE=$(InputPath)\r
+PostBuild_Cmds=copy ..\..\yaz\release\yaz.dll $(ProjDir)\r
+# End Special Build Tool\r
 \r
 !ELSEIF  "$(CFG)" == "ztest - Win32 Debug"\r
 \r
@@ -65,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WINDOWS" /FR /FD /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WINDOWS" /FR /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE RSC /l 0x406 /d "_DEBUG"\r
 # ADD RSC /l 0x406 /d "_DEBUG"\r
@@ -74,7 +80,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib yaz.lib server.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib yaz.lib server.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\debug" /libpath:"..\server\debug"\r
+# Begin Special Build Tool\r
+ProjDir=.\r
+SOURCE=$(InputPath)\r
+PostBuild_Cmds=copy ..\..\yaz\debug\yaz.dll $(ProjDir)\r
+# End Special Build Tool\r
 \r
 !ENDIF \r
 \r