summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceGrid/icegrid.dsp105
-rwxr-xr-xcpp/src/IceGrid/icegridnode.dsp6
-rwxr-xr-xcpp/src/IceGrid/icegridregistry.dsp6
3 files changed, 86 insertions, 31 deletions
diff --git a/cpp/src/IceGrid/icegrid.dsp b/cpp/src/IceGrid/icegrid.dsp
index 699231c9439..fcdbd76bde6 100644
--- a/cpp/src/IceGrid/icegrid.dsp
+++ b/cpp/src/IceGrid/icegrid.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c
# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /D "_USRDLL" /D "ICE_GRID_API_EXPORTS" /D "_CONSOLE" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /FD /c
-# SUBTRACT CPP /Z<none> /Fr /YX
+# SUBTRACT CPP /Fr /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -122,11 +122,15 @@ SOURCE=.\Observer.cpp
# End Source File
# Begin Source File
-SOURCE=.\Session.cpp
+SOURCE=.\Query.cpp
# End Source File
# Begin Source File
-SOURCE=.\Query.cpp
+SOURCE=.\Registry.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Session.cpp
# End Source File
# End Group
# Begin Group "Header Files"
@@ -322,41 +326,41 @@ BuildCmds= \
# End Source File
# Begin Source File
-SOURCE=..\..\slice\icegrid\Session.ice
+SOURCE=..\..\slice\icegrid\Query.ice
!IF "$(CFG)" == "icegrid - Win32 Release"
-USERDEP__OBSER="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
+USERDEP__QUERY="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
# Begin Custom Build
-InputPath=..\..\slice\icegrid\Session.ice
+InputPath=..\..\slice\icegrid\Query.ice
BuildCmds= \
- ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Session.ice \
- move Session.h ..\..\include\icegrid \
+ ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Query.ice \
+ move Query.h ..\..\include\icegrid \
-"..\..\include\icegrid\Session.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\icegrid\Query.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"Session.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"Query.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "icegrid - Win32 Debug"
-USERDEP__OBSER="..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
+USERDEP__QUERY="..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
# Begin Custom Build
-InputPath=..\..\slice\icegrid\Session.ice
+InputPath=..\..\slice\icegrid\Query.ice
BuildCmds= \
- ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Session.ice \
- move Session.h ..\..\include\icegrid \
+ ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Query.ice \
+ move Query.h ..\..\include\icegrid \
-"..\..\include\icegrid\Session.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\icegrid\Query.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"Session.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"Query.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -365,41 +369,84 @@ BuildCmds= \
# End Source File
# Begin Source File
-SOURCE=..\..\slice\icegrid\Query.ice
+SOURCE=..\..\slice\icegrid\Registry.ice
!IF "$(CFG)" == "icegrid - Win32 Release"
-USERDEP__QUERY="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
+USERDEP__REGIS="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
# Begin Custom Build
-InputPath=..\..\slice\icegrid\Query.ice
+InputPath=..\..\slice\icegrid\Registry.ice
BuildCmds= \
- ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Query.ice \
- move Query.h ..\..\include\icegrid \
+ ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Registry.ice \
+ move Registry.h ..\..\include\icegrid \
-"..\..\include\icegrid\Query.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\icegrid\Registry.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"Query.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"Registry.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "icegrid - Win32 Debug"
-USERDEP__QUERY="..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
+USERDEP__REGIS="..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
# Begin Custom Build
-InputPath=..\..\slice\icegrid\Query.ice
+InputPath=..\..\slice\icegrid\Registry.ice
BuildCmds= \
- ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Query.ice \
- move Query.h ..\..\include\icegrid \
+ ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Registry.ice \
+ move Registry.h ..\..\include\icegrid \
-"..\..\include\icegrid\Query.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\icegrid\Registry.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"Query.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"Registry.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\icegrid\Session.ice
+
+!IF "$(CFG)" == "icegrid - Win32 Release"
+
+USERDEP__SESSI="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
+# Begin Custom Build
+InputPath=..\..\slice\icegrid\Session.ice
+
+BuildCmds= \
+ ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Session.ice \
+ move Session.h ..\..\include\icegrid \
+
+
+"..\..\include\icegrid\Session.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Session.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "icegrid - Win32 Debug"
+
+USERDEP__SESSI="..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
+# Begin Custom Build
+InputPath=..\..\slice\icegrid\Session.ice
+
+BuildCmds= \
+ ..\..\bin\slice2cpp.exe --ice --checksum --dll-export ICE_GRID_API --include-dir icegrid -I../../slice ../../slice/IceGrid/Session.ice \
+ move Session.h ..\..\include\icegrid \
+
+
+"..\..\include\icegrid\Session.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Session.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
diff --git a/cpp/src/IceGrid/icegridnode.dsp b/cpp/src/IceGrid/icegridnode.dsp
index bc5aa66f11e..813a39a0ab0 100755
--- a/cpp/src/IceGrid/icegridnode.dsp
+++ b/cpp/src/IceGrid/icegridnode.dsp
@@ -82,7 +82,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 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 advapi32.lib pdh.lib setargv.obj /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 advapi32.lib pdh.lib setargv.obj libeay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../lib" /FIXED:no
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
OutDir=.\Debug
@@ -150,6 +150,10 @@ SOURCE=.\Internal.cpp
# End Source File
# Begin Source File
+SOURCE=.\InternalRegistryI.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\LocatorI.cpp
# End Source File
# Begin Source File
diff --git a/cpp/src/IceGrid/icegridregistry.dsp b/cpp/src/IceGrid/icegridregistry.dsp
index 656a7669b1b..9239dd9e3b7 100755
--- a/cpp/src/IceGrid/icegridregistry.dsp
+++ b/cpp/src/IceGrid/icegridregistry.dsp
@@ -83,7 +83,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 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 setargv.obj /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 setargv.obj libeay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../lib" /FIXED:no
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
OutDir=.\Debug
@@ -147,6 +147,10 @@ SOURCE=.\Internal.cpp
# End Source File
# Begin Source File
+SOURCE=.\InternalRegistryI.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\LocatorI.cpp
# End Source File
# Begin Source File
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 08:59:04 +0000