summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceStorm/Service.cpp24
-rw-r--r--cpp/src/IceStorm/icestormS.dsp32
-rw-r--r--cpp/src/Yellow/Service.cpp10
-rw-r--r--cpp/src/Yellow/yellowS.dsp26
4 files changed, 60 insertions, 32 deletions
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index 6edbcb58bf3..21f10259fa5 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -12,6 +12,12 @@
#include <IceStorm/TraceLevels.h>
#include <IceBox/IceBox.h>
+#if defined(_WIN32)
+# define ICESTORM_SERVICE_API __declspec(dllexport)
+#else
+# define ICESTORM_SERVICE_API /**/
+#endif
+
using namespace std;
using namespace Ice;
using namespace IceStorm;
@@ -20,12 +26,12 @@ using namespace Freeze;
namespace IceStorm
{
-class Service : public ::IceBox::FreezeService
+class ICESTORM_SERVICE_API ServiceI : public ::IceBox::FreezeService
{
public:
- Service();
- virtual ~Service();
+ ServiceI();
+ virtual ~ServiceI();
virtual void start(const string&,
const CommunicatorPtr&,
@@ -49,24 +55,24 @@ extern "C"
//
// Factory function
//
-::IceBox::FreezeService*
+ICESTORM_SERVICE_API ::IceBox::FreezeService*
create(CommunicatorPtr communicator)
{
- return new Service;
+ return new ServiceI;
}
}
-IceStorm::Service::Service()
+IceStorm::ServiceI::ServiceI()
{
}
-IceStorm::Service::~Service()
+IceStorm::ServiceI::~ServiceI()
{
}
void
-IceStorm::Service::start(const string& name,
+IceStorm::ServiceI::start(const string& name,
const CommunicatorPtr& communicator,
const PropertiesPtr& properties,
const StringSeq& args,
@@ -84,7 +90,7 @@ IceStorm::Service::start(const string& name,
}
void
-IceStorm::Service::stop()
+IceStorm::ServiceI::stop()
{
_adapter->deactivate();
diff --git a/cpp/src/IceStorm/icestormS.dsp b/cpp/src/IceStorm/icestormS.dsp
index 63bb61f1021..2136d9d5215 100644
--- a/cpp/src/IceStorm/icestormS.dsp
+++ b/cpp/src/IceStorm/icestormS.dsp
@@ -40,9 +40,11 @@ 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICESTORMS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICESTORM_EXPORTS" /YX /FD /c
+# 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 "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /c
+# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -52,7 +54,12 @@ 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 /dll /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 /nologo /dll /machine:I386
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icestormservice011.dll" /libpath:"../../../lib"
+# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy Release\icestormservice001.* ..\..\lib
+# End Special Build Tool
!ELSEIF "$(CFG)" == "IceStormS - Win32 Debug"
@@ -67,8 +74,9 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICESTORMS_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "_USRDLL" /D "_UNICODE" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_USRDLL" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +87,7 @@ BSC32=bscmake.exe
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 /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestormservice001d.dll" /pdbtype:sept /libpath:"../../../lib"
-# SUBTRACT LINK32 /pdb:none
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Cmds=copy Debug\icestormservice001d.* ..\..\lib
@@ -224,7 +232,7 @@ SOURCE=.\dummy.ice
!IF "$(CFG)" == "IceStormS - Win32 Release"
-USERDEP__DUMMY="..\..\bin\slice2freeze.exe"
+USERDEP__DUMMY="..\..\bin\slice2freeze.exe"
# Begin Custom Build
InputPath=.\dummy.ice
@@ -242,7 +250,7 @@ BuildCmds= \
!ELSEIF "$(CFG)" == "IceStormS - Win32 Debug"
-USERDEP__DUMMY="..\..\bin\slice2freeze.exe"
+USERDEP__DUMMY="..\..\bin\slice2freeze.exe"
# Begin Custom Build
InputPath=.\dummy.ice
@@ -267,7 +275,7 @@ SOURCE=.\IceStormInternal.ice
!IF "$(CFG)" == "IceStormS - Win32 Release"
-USERDEP__ICEST="..\..\bin\slice2cpp.exe"
+USERDEP__ICEST="..\..\bin\slice2cpp.exe"
# Begin Custom Build
InputPath=.\IceStormInternal.ice
@@ -285,7 +293,7 @@ BuildCmds= \
!ELSEIF "$(CFG)" == "IceStormS - Win32 Debug"
-USERDEP__ICEST="..\..\bin\slice2cpp.exe"
+USERDEP__ICEST="..\..\bin\slice2cpp.exe"
# Begin Custom Build
InputPath=.\IceStormInternal.ice
@@ -310,7 +318,7 @@ SOURCE=.\LinkDB.ice
!IF "$(CFG)" == "IceStormS - Win32 Release"
-USERDEP__LINKD="..\..\bin\slice2freeze.exe" "..\..\bin\slice2cpp.exe"
+USERDEP__LINKD="..\..\bin\slice2freeze.exe" "..\..\bin\slice2cpp.exe"
# Begin Custom Build
InputPath=.\LinkDB.ice
@@ -335,7 +343,7 @@ BuildCmds= \
!ELSEIF "$(CFG)" == "IceStormS - Win32 Debug"
-USERDEP__LINKD="..\..\bin\slice2freeze.exe" "..\..\bin\slice2cpp.exe"
+USERDEP__LINKD="..\..\bin\slice2freeze.exe" "..\..\bin\slice2cpp.exe"
# Begin Custom Build
InputPath=.\LinkDB.ice
diff --git a/cpp/src/Yellow/Service.cpp b/cpp/src/Yellow/Service.cpp
index 223c2a2381c..93e5391c39c 100644
--- a/cpp/src/Yellow/Service.cpp
+++ b/cpp/src/Yellow/Service.cpp
@@ -13,6 +13,12 @@
#include <IceBox/IceBox.h>
+#if defined(_WIN32)
+# define YELLOW_SERVICE_API __declspec(dllexport)
+#else
+# define YELLOW_SERVICE_API /**/
+#endif
+
using namespace std;
using namespace Ice;
using namespace Yellow;
@@ -21,7 +27,7 @@ using namespace Freeze;
namespace Yellow
{
-class ServiceI : public ::IceBox::FreezeService
+class YELLOW_SERVICE_API ServiceI : public ::IceBox::FreezeService
{
public:
@@ -50,7 +56,7 @@ extern "C"
//
// Factory function
//
-::IceBox::FreezeService*
+YELLOW_SERVICE_API ::IceBox::FreezeService*
create(Ice::CommunicatorPtr communicator)
{
return new Yellow::ServiceI;
diff --git a/cpp/src/Yellow/yellowS.dsp b/cpp/src/Yellow/yellowS.dsp
index 0b7d2d70553..0487cfd20e5 100644
--- a/cpp/src/Yellow/yellowS.dsp
+++ b/cpp/src/Yellow/yellowS.dsp
@@ -13,7 +13,7 @@ CFG=YellowS - 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 "YellowS.mak" CFG="YellowS - Win32 Debug"
+!MESSAGE NMAKE /f "YellowS.mak" CFG="IceStormS - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -29,7 +29,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "YellowS - Win32 Release"
+!IF "$(CFG)" == "IceStormS - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -40,9 +40,11 @@ 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" /D "_MBCS" /D "_USRDLL" /D "YELLOWS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "YELLOWS_EXPORTS" /YX /FD /c
+# 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 "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /c
+# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -52,9 +54,14 @@ 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 /dll /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 /nologo /dll /machine:I386
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/yellowservice011.dll" /libpath:"../../../lib"
+# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy Release\yellowservice001.* ..\..\lib
+# End Special Build Tool
-!ELSEIF "$(CFG)" == "YellowS - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceStormS - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -67,8 +74,9 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "YELLOWS_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "_USRDLL" /D "_UNICODE" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_USRDLL" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +87,7 @@ BSC32=bscmake.exe
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 /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/yellowservice001d.dll" /pdbtype:sept /libpath:"../../../lib"
-# SUBTRACT LINK32 /pdb:none
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Cmds=copy Debug\yellowservice001d.* ..\..\lib
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 06:09:19 +0000