X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fyazxx%2Fyazxx.dsp;h=89e1ae6fe9484ba05b950a78d11e67d44e43193f;hb=ff656a4cd980e8ba6472f99e110c3b52d6a1ed86;hp=8d2ec75d55a933d0f8b305221eaf4137fb2824b3;hpb=fc9f9bcff2929ec67910e8b98ecbb578ba2aab6e;p=yazpp-moved-to-github.git

diff --git a/win/yazxx/yazxx.dsp b/win/yazxx/yazxx.dsp
index 8d2ec75..89e1ae6 100644
--- a/win/yazxx/yazxx.dsp
+++ b/win/yazxx/yazxx.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=yazxx - Win32 Debug
+CFG=yazxx - Win32 Debug URSULA
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,14 @@ CFG=yazxx - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "yazxx.mak" CFG="yazxx - Win32 Debug"
+!MESSAGE NMAKE /f "yazxx.mak" CFG="yazxx - Win32 Debug URSULA"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "yazxx - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "yazxx - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "yazxx - Win32 Debug URSULA" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "yazxx - Win32 Release URSULA" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -40,9 +42,10 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
 # 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_H=0 /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 +78,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" /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_H=0 /FR /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"
@@ -94,19 +97,91 @@ SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).dll $(ProjDir)\..\..\..\bin
 # End Special Build Tool
 
+!ELSEIF  "$(CFG)" == "yazxx - Win32 Debug URSULA"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "yazxx___Win32_Debug_URSULA"
+# PROP BASE Intermediate_Dir "yazxx___Win32_Debug_URSULA"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "yazxx___Win32_Debug_URSULA"
+# PROP Intermediate_Dir "yazxx___Win32_Debug_URSULA"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE 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_H=1 /FR /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_H=1 /FR /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"
+# ADD RSC /l 0x406 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 yaz.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /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 yaz.lib ursula.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../yaz/lib" /libpath:"../../../yaz-ursula/win"
+# Begin Special Build Tool
+OutDir=.\yazxx___Win32_Debug_URSULA
+ProjDir=.
+TargetName=yazxx
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy $(OutDir)\$(TargetName).dll $(ProjDir)\..\..\..\bin
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "yazxx - Win32 Release URSULA"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "yazxx___Win32_Release_URSULA"
+# PROP BASE Intermediate_Dir "yazxx___Win32_Release_URSULA"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "yazxx___Win32_Release_URSULA"
+# PROP Intermediate_Dir "yazxx___Win32_Release_URSULA"
+# PROP Target_Dir ""
+# ADD BASE 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 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_H=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"
+# ADD RSC /l 0x406 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 yaz.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 /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 yaz.lib ursula.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"../../../yaz/lib" /libpath:"../../../yaz-ursula/win"
+# Begin Special Build Tool
+OutDir=.\yazxx___Win32_Release_URSULA
+ProjDir=.
+TargetName=yazxx
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy $(OutDir)\$(TargetName).dll $(ProjDir)\..\..\..\bin
+# End Special Build Tool
+
 !ENDIF 
 
 # Begin Target
 
 # Name "yazxx - Win32 Release"
 # Name "yazxx - Win32 Debug"
+# Name "yazxx - Win32 Debug URSULA"
+# Name "yazxx - Win32 Release URSULA"
 # Begin Source File
 
 SOURCE="..\..\src\yaz-ir-assoc.cpp"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\include\yaz-ir-assoc.h"
+SOURCE="..\..\include\yaz++\yaz-ir-assoc.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\yaz-pdu-assoc-thread.cpp"
 # End Source File
 # Begin Source File
 
@@ -114,11 +189,11 @@ SOURCE="..\..\src\yaz-pdu-assoc.cpp"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\include\yaz-pdu-assoc.h"
+SOURCE="..\..\include\yaz++\yaz-pdu-assoc.h"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\include\yaz-pdu-observer.h"
+SOURCE="..\..\include\yaz++\yaz-pdu-observer.h"
 # End Source File
 # Begin Source File
 
@@ -126,7 +201,7 @@ SOURCE="..\..\src\yaz-proxy.cpp"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\include\yaz-proxy.h"
+SOURCE="..\..\include\yaz++\yaz-proxy.h"
 # End Source File
 # Begin Source File
 
@@ -134,11 +209,11 @@ SOURCE="..\..\src\yaz-socket-manager.cpp"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\include\yaz-socket-manager.h"
+SOURCE="..\..\include\yaz++\yaz-socket-manager.h"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\include\yaz-socket-observer.h"
+SOURCE="..\..\include\yaz++\yaz-socket-observer.h"
 # End Source File
 # Begin Source File
 
@@ -146,11 +221,47 @@ SOURCE="..\..\src\yaz-z-assoc.cpp"
 # End Source File
 # Begin Source File
 
+SOURCE="..\..\include\yaz++\yaz-z-assoc.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\yaz-z-databases.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\include\yaz++\yaz-z-databases.h"
+# End Source File
+# Begin Source File
+
 SOURCE="..\..\src\yaz-z-query.cpp"
 # End Source File
 # Begin Source File
 
+SOURCE="..\..\include\yaz++\yaz-z-query.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\yaz-z-server-ill.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\yaz-z-server-sr.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\yaz-z-server-update.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\yaz-z-server-ursula.cpp"
+# End Source File
+# Begin Source File
+
 SOURCE="..\..\src\yaz-z-server.cpp"
 # End Source File
+# Begin Source File
+
+SOURCE="..\..\include\yaz++\yaz-z-server.h"
+# End Source File
 # End Target
 # End Project