diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/DynamicLibrary.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/Ice/Makefile.mak | 3 | ||||
| -rw-r--r-- | cpp/src/IceGrid/FreezeDB/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/SqlDB/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/FreezeDB/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/SqlDB/Makefile.mak | 2 |
6 files changed, 12 insertions, 7 deletions
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index 07293a65e15..e89ef1fb789 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -92,13 +92,15 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc #ifdef _WIN32 lib = libName; -# if defined(_MSC_VER) && (_MSC_VER < 1300) +# ifdef COMPSUFFIX // - // Special case to deal with the naming of IceSSL VC6 DLL. + // If using unique dll names we need to add compiler suffix + // to IceSSL so that we do not have to use compiler suffix + // in the configuration. // if(IceUtilInternal::toLower(libName) == "icessl") { - lib += "vc60_"; + lib += COMPSUFFIX; } # endif diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index 2eeef01f381..7715f85baae 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -116,6 +116,9 @@ SDIR = $(slicedir)\Ice !include $(top_srcdir)\config\Make.rules.mak
CPPFLAGS = -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DFD_SETSIZE=1024 -DWIN32_LEAN_AND_MEAN
+!if "$(UNIQUE_DLL_NAMES)" == "yes"
+CPPFLAGS = $(CPPFLAGS) -DCOMPSUFFIX=\"$(COMPSUFFIX)\"
+!endif
SLICE2CPPFLAGS = --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS)
LINKWITH = $(BASELIBS) $(BZIP2_LIBS) $(ICE_OS_LIBS) ws2_32.lib
#!if "$(BCPLUSPLUS)" != "yes"
diff --git a/cpp/src/IceGrid/FreezeDB/Makefile.mak b/cpp/src/IceGrid/FreezeDB/Makefile.mak index c164e8c68ce..2591d7e432c 100644 --- a/cpp/src/IceGrid/FreezeDB/Makefile.mak +++ b/cpp/src/IceGrid/FreezeDB/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. LIBNAME = $(top_srcdir)\lib\icegridfreezedb$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\icegridfreezedb$(SOVERSION)$(LIBSUFFIX).dll +DLLNAME = $(top_srcdir)\bin\icegridfreezedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll TARGETS = $(LIBNAME) $(DLLNAME) diff --git a/cpp/src/IceGrid/SqlDB/Makefile.mak b/cpp/src/IceGrid/SqlDB/Makefile.mak index d4afc07aa7d..e391d230424 100644 --- a/cpp/src/IceGrid/SqlDB/Makefile.mak +++ b/cpp/src/IceGrid/SqlDB/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. LIBNAME = $(top_srcdir)\lib\icegridsqldb$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\icegridsqldb$(SOVERSION)$(LIBSUFFIX).dll +DLLNAME = $(top_srcdir)\bin\icegridsqldb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll TARGETS = $(LIBNAME) $(DLLNAME) diff --git a/cpp/src/IceStorm/FreezeDB/Makefile.mak b/cpp/src/IceStorm/FreezeDB/Makefile.mak index b2d85e4a747..ec6f2e2677f 100644 --- a/cpp/src/IceStorm/FreezeDB/Makefile.mak +++ b/cpp/src/IceStorm/FreezeDB/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. LIBNAME = $(top_srcdir)\lib\icestormfreezedb$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\icestormfreezedb$(SOVERSION)$(LIBSUFFIX).dll +DLLNAME = $(top_srcdir)\bin\icestormfreezedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll MIGRATE = $(top_srcdir)\bin\icestormmigrate.exe diff --git a/cpp/src/IceStorm/SqlDB/Makefile.mak b/cpp/src/IceStorm/SqlDB/Makefile.mak index 01c6c2d390f..7ec7718aa12 100644 --- a/cpp/src/IceStorm/SqlDB/Makefile.mak +++ b/cpp/src/IceStorm/SqlDB/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. LIBNAME = $(top_srcdir)\lib\icestormsqldb$(LIBSUFFIX).lib -DLLNAME = $(top_srcdir)\bin\icestormsqldb$(SOVERSION)$(LIBSUFFIX).dll +DLLNAME = $(top_srcdir)\bin\icestormsqldb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll TARGETS = $(LIBNAME) $(DLLNAME) |