From 71130e9f57a28722e39b6c8cf9700b9e42fe9d7c Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 5 Apr 2001 15:12:24 +0000 Subject: [PATCH] WIN32 updates. --- src/yaz-my-client.cpp | 7 +++-- src/yaz-z-server-ursula.cpp | 7 ++++- win/yazclient/yazclient.dsp | 8 ++--- win/yazproxy/yazproxy.dsp | 4 +-- win/yazserver/yazserver.dsp | 4 +-- win/yazxx/yazxx.dsp | 69 ++----------------------------------------- 6 files changed, 21 insertions(+), 78 deletions(-) diff --git a/src/yaz-my-client.cpp b/src/yaz-my-client.cpp index a25af48..48e0aad 100644 --- a/src/yaz-my-client.cpp +++ b/src/yaz-my-client.cpp @@ -3,7 +3,10 @@ * See the file LICENSE for details. * * $Log: yaz-my-client.cpp,v $ - * Revision 1.3 2001-04-05 13:09:44 adam + * Revision 1.4 2001-04-05 15:12:24 adam + * WIN32 updates. + * + * Revision 1.3 2001/04/05 13:09:44 adam * Removed ursula dependancy. * * Revision 1.2 2001/04/04 14:02:49 adam @@ -421,7 +424,7 @@ void MyClient::recv_record(Z_DatabaseRecord *record, int offset, case VAL_SIGLEMARC: case VAL_ISDSMARC: case VAL_RUSMARC: - marc_display((char*) record->u.octet_aligned->buf,stdout); + marc_display((char*) record->u.octet_aligned->buf,0); break; default: recv_textRecord((int) ent->value, diff --git a/src/yaz-z-server-ursula.cpp b/src/yaz-z-server-ursula.cpp index 07abb13..c8d0f97 100644 --- a/src/yaz-z-server-ursula.cpp +++ b/src/yaz-z-server-ursula.cpp @@ -3,7 +3,10 @@ * See the file LICENSE for details. * * $Log: yaz-z-server-ursula.cpp,v $ - * Revision 1.1 2001-04-04 14:02:49 adam + * Revision 1.2 2001-04-05 15:12:24 adam + * WIN32 updates. + * + * Revision 1.1 2001/04/04 14:02:49 adam * URSULA / Z-ruth service. * */ @@ -11,6 +14,7 @@ #include #include +#if HAVE_YAZ_URSULA_H int Yaz_Facility_Ursula::init(Yaz_Z_Server *s, Z_InitRequest *initRequest, Z_InitResponse *initResponse) { @@ -54,3 +58,4 @@ int Yaz_Facility_Ursula::recv(Yaz_Z_Server *s, Z_APDU *apdu_request) s->send_Z_PDU(apdu_response); return 1; } +#endif \ No newline at end of file diff --git a/win/yazclient/yazclient.dsp b/win/yazclient/yazclient.dsp index 9265ec3..0e4a223 100644 --- a/win/yazclient/yazclient.dsp +++ b/win/yazclient/yazclient.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../yaz/include" /I "../../../yaz-ursula/include" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D HAVE_YAZ_URSULA_H=1 /YX /FD /c # ADD BASE RSC /l 0x406 /d "NDEBUG" # ADD RSC /l 0x406 /d "NDEBUG" BSC32=bscmake.exe @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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 yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /machine:I386 /out:"Release/yazmyclient.exe" /libpath:"../yazxx/release" /libpath:"../../../yaz/lib" +# 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 yazxx.lib yaz.lib wsock32.lib ursula.lib /nologo /subsystem:console /machine:I386 /out:"Release/yazmyclient.exe" /libpath:"../yazxx/release" /libpath:"../../../yaz/lib" /libpath:"../../../yaz-ursula/win/release" # Begin Special Build Tool OutDir=.\Release ProjDir=. @@ -73,7 +73,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../yaz/include" /I "../../../yaz-ursula/include" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D HAVE_YAZ_URSULA_H=1 /YX /FD /c # ADD BASE RSC /l 0x406 /d "_DEBUG" # ADD RSC /l 0x406 /d "_DEBUG" BSC32=bscmake.exe @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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 yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/yazmyclient.exe" /pdbtype:sept /libpath:"../yazxx/debug" /libpath:"../../../yaz/lib" +# 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 yazxx.lib yaz.lib wsock32.lib ursula.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/yazmyclient.exe" /pdbtype:sept /libpath:"../yazxx/debug" /libpath:"../../../yaz/lib" /libpath:"../../../yaz-ursula/win/debug" # Begin Special Build Tool OutDir=.\Debug ProjDir=. diff --git a/win/yazproxy/yazproxy.dsp b/win/yazproxy/yazproxy.dsp index 1df1cc0..390e254 100644 --- a/win/yazproxy/yazproxy.dsp +++ b/win/yazproxy/yazproxy.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../yaz/include" /I "../../../yaz-ursula/include" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D HAVE_YAZ_URSULA=1 /YX /FD /c # ADD BASE RSC /l 0x406 /d "NDEBUG" # ADD RSC /l 0x406 /d "NDEBUG" BSC32=bscmake.exe @@ -72,7 +72,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../yaz/include" /I "../../../yaz-ursula/include" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D HAVE_YAZ_URSULA=1 /YX /FD /c # ADD BASE RSC /l 0x406 /d "_DEBUG" # ADD RSC /l 0x406 /d "_DEBUG" BSC32=bscmake.exe diff --git a/win/yazserver/yazserver.dsp b/win/yazserver/yazserver.dsp index a22c350..466cabb 100644 --- a/win/yazserver/yazserver.dsp +++ b/win/yazserver/yazserver.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../../../yaz/include" /I "../../../yaz-ursula/include" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D HAVE_YAZ_URSULA=1 /YX /FD /c # ADD BASE RSC /l 0x406 /d "NDEBUG" # ADD RSC /l 0x406 /d "NDEBUG" BSC32=bscmake.exe @@ -73,7 +73,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../yaz/include" /I "../../../yaz-ursula/include" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D HAVE_YAZ_URSULA=1 /YX /FD /c # ADD BASE RSC /l 0x406 /d "_DEBUG" # ADD RSC /l 0x406 /d "_DEBUG" BSC32=bscmake.exe diff --git a/win/yazxx/yazxx.dsp b/win/yazxx/yazxx.dsp index b14a9ca..a80327f 100644 --- a/win/yazxx/yazxx.dsp +++ b/win/yazxx/yazxx.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../include" /I "../../../yaz/include" /I "../../../yaz-ursula/include" /D "_WINDOWS" /D "WIN32" /D "NDEBUG" /D HAVE_YAZ_URSULA=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x406 /d "NDEBUG" @@ -75,7 +75,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).dll $(ProjDir)\..\..\..\bin # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../yaz/include" /I "../../yaz++/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../yaz++/include" /I "../../include" /I "../../../yaz/include" /I "../../../yaz-ursula/include" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D HAVE_YAZ_URSULA=1 /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x406 /d "_DEBUG" @@ -102,49 +102,6 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).dll $(ProjDir)\..\..\..\bin # Name "yazxx - Win32 Debug" # Begin Source File -SOURCE=..\..\src\ursula.asn - -!IF "$(CFG)" == "yazxx - Win32 Release" - -# Begin Custom Build -WkspDir=. -InputPath=..\..\src\ursula.asn - -BuildCmds= \ - cd $(WkspDir)\..\src \ - "C:\Program Files\Tcl\bin\tclsh82.exe" ..\..\yaz\util\yaz-comp -I ..\include -i yaz -d ..\..\yaz\z39.50\z.tcl -d ursula.tcl ursula.asn \ - - -"$(WkspDir)\..\src\zes-ursula.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(WkspDir)\..\include\yaz\zes-ursula.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "yazxx - Win32 Debug" - -# Begin Custom Build - ASN.1 compiling... -WkspDir=. -InputPath=..\..\src\ursula.asn - -BuildCmds= \ - cd $(WkspDir)\..\src \ - "C:\Program Files\Tcl\bin\tclsh82.exe" ..\..\yaz\util\yaz-comp -I ..\include -i yaz -d ..\..\yaz\z39.50\z.tcl -d ursula.tcl ursula.asn \ - - -"$(WkspDir)\..\src\zes-ursula.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(WkspDir)\..\include\yaz\zes-ursula.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - SOURCE="..\..\src\yaz-ir-assoc.cpp" # End Source File # Begin Source File @@ -223,27 +180,5 @@ SOURCE="..\..\src\yaz-z-server.cpp" SOURCE="..\..\include\yaz++\yaz-z-server.h" # End Source File -# Begin Source File - -SOURCE="..\..\src\zes-ursula.c" - -!IF "$(CFG)" == "yazxx - Win32 Release" - -!ELSEIF "$(CFG)" == "yazxx - Win32 Debug" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE="..\..\include\yaz\zes-ursula.h" - -!IF "$(CFG)" == "yazxx - Win32 Release" - -!ELSEIF "$(CFG)" == "yazxx - Win32 Debug" - -!ENDIF - -# End Source File # End Target # End Project -- 1.7.10.4