summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-12-19 14:11:20 -0500
committerBernard Normier <bernard@zeroc.com>2012-12-19 14:11:20 -0500
commitb0c5e55738e9050fcf8d12c563866c9994dcd312 (patch)
tree9e3220b869f7513ace58e5b29229bb118027e4cc /cpp
parentICE-4938: support for compact IDs (diff)
downloadice-b0c5e55738e9050fcf8d12c563866c9994dcd312.tar.bz2
ice-b0c5e55738e9050fcf8d12c563866c9994dcd312.tar.xz
ice-b0c5e55738e9050fcf8d12c563866c9994dcd312.zip
Fixed ICE-4986. The new convention for DLL names with compiler name is: name<version>[d]_<compiler>.dll
Diffstat (limited to 'cpp')
-rwxr-xr-xcpp/config/Make.rules.mak10
-rw-r--r--cpp/src/Freeze/Makefile.mak2
-rw-r--r--cpp/src/Glacier2Lib/Makefile.mak2
-rw-r--r--cpp/src/Ice/DynamicLibrary.cpp12
-rw-r--r--cpp/src/Ice/Makefile.mak2
-rw-r--r--cpp/src/IceBox/Makefile.mak2
-rw-r--r--cpp/src/IceDB/Makefile.mak2
-rw-r--r--cpp/src/IceGrid/FreezeDB/Makefile.mak2
-rw-r--r--cpp/src/IceGrid/SqlDB/Makefile.mak2
-rw-r--r--cpp/src/IceGridLib/Makefile.mak2
-rwxr-xr-xcpp/src/IcePatch2Lib/Makefile.mak2
-rw-r--r--cpp/src/IceSSL/Makefile.mak2
-rw-r--r--cpp/src/IceStorm/FreezeDB/Makefile.mak2
-rw-r--r--cpp/src/IceStorm/Makefile.mak2
-rw-r--r--cpp/src/IceStorm/SqlDB/Makefile.mak2
-rw-r--r--cpp/src/IceStormLib/Makefile.mak2
-rw-r--r--cpp/src/IceUtil/Makefile.mak2
-rw-r--r--cpp/src/IceXML/Makefile.mak2
-rw-r--r--cpp/src/Slice/Makefile.mak2
19 files changed, 28 insertions, 28 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index 2298eb3b01a..fdcb87ffb1e 100755
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -93,7 +93,7 @@ CPP_COMPILER = VC90
!endif
#
-# With VC90, we want unique dll names
+# With VC90, we want unique dll names by default
#
!if "$(CPP_COMPILER)" == "VC90" && "$(UNIQUE_DLL_NAMES)" == ""
UNIQUE_DLL_NAMES = yes
@@ -159,16 +159,16 @@ LDFLAGS = $(PRELIBPATH)"$(THIRDPARTY_HOME)\lib$(libsuff)" $(LDFLAGS)
!if "$(UNIQUE_DLL_NAMES)" == "yes"
!if "$(CPP_COMPILER)" == "VC90"
-COMPSUFFIX = vc90_
+COMPSUFFIX = _vc90
!elseif "$(CPP_COMPILER)" == "VC100"
-COMPSUFFIX = vc100_
+COMPSUFFIX = _vc100
!elseif "$(CPP_COMPILER)" == "VC110"
-COMPSUFFIX = vc110_
+COMPSUFFIX = _vc110
!endif
!endif
!if "$(OPTIMIZE)" != "yes"
-LIBSUFFIX = $(LIBSUFFIX)d
+LIBSUFFIX = d
RCFLAGS = -D_DEBUG
!endif
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak
index 4866330e32e..1c9557e1d06 100644
--- a/cpp/src/Freeze/Makefile.mak
+++ b/cpp/src/Freeze/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\freeze$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\freeze$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\freeze$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/Glacier2Lib/Makefile.mak b/cpp/src/Glacier2Lib/Makefile.mak
index 958b58ae243..be7cc20c4ca 100644
--- a/cpp/src/Glacier2Lib/Makefile.mak
+++ b/cpp/src/Glacier2Lib/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\glacier2$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\glacier2$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\glacier2$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index 4fa7f1499e2..7763b37545c 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -128,6 +128,12 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
#ifdef _WIN32
lib += libName;
+ lib += version;
+
+# if defined(_DEBUG) && !defined(__MINGW32__)
+ lib += 'd';
+# endif
+
# ifdef COMPSUFFIX
//
// If using unique dll names we need to add compiler suffix
@@ -140,12 +146,6 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
}
# endif
- lib += version;
-
-# if defined(_DEBUG) && !defined(__MINGW32__)
- lib += 'd';
-# endif
-
lib += ".dll";
#elif defined(__APPLE__)
lib += "lib" + libName;
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index 5ac931888bc..1d6915fdbec 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\ice$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\ice$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\ice$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak
index 687b37bd76b..7cb2467eca2 100644
--- a/cpp/src/IceBox/Makefile.mak
+++ b/cpp/src/IceBox/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\icebox$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\icebox$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\icebox$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
SERVER_D = $(top_srcdir)\bin\iceboxd.exe
SERVER_R = $(top_srcdir)\bin\icebox.exe
diff --git a/cpp/src/IceDB/Makefile.mak b/cpp/src/IceDB/Makefile.mak
index c690e67218f..45fefe2a728 100644
--- a/cpp/src/IceDB/Makefile.mak
+++ b/cpp/src/IceDB/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\icedb$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\icedb$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\icedb$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/IceGrid/FreezeDB/Makefile.mak b/cpp/src/IceGrid/FreezeDB/Makefile.mak
index cb510f7ad65..e5af5cf2e2d 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$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\icegridfreezedb$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/IceGrid/SqlDB/Makefile.mak b/cpp/src/IceGrid/SqlDB/Makefile.mak
index 19f31fe12a9..53ca9485534 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$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\icegridsqldb$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/IceGridLib/Makefile.mak b/cpp/src/IceGridLib/Makefile.mak
index 2b77a6049ff..358396beaa1 100644
--- a/cpp/src/IceGridLib/Makefile.mak
+++ b/cpp/src/IceGridLib/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\icegrid$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\icegrid$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\icegrid$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/IcePatch2Lib/Makefile.mak b/cpp/src/IcePatch2Lib/Makefile.mak
index 1f4b7b14411..a5f07977e99 100755
--- a/cpp/src/IcePatch2Lib/Makefile.mak
+++ b/cpp/src/IcePatch2Lib/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\icepatch2$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\icepatch2$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\icepatch2$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak
index ef7fd2d300e..9685e161a5f 100644
--- a/cpp/src/IceSSL/Makefile.mak
+++ b/cpp/src/IceSSL/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\icessl$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\icessl$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\icessl$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/IceStorm/FreezeDB/Makefile.mak b/cpp/src/IceStorm/FreezeDB/Makefile.mak
index 757f4ac0cbe..4f0dda3205c 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$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\icestormfreezedb$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
MIGRATE = $(top_srcdir)\bin\icestormmigrate.exe
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index a4a9e88189e..1787015532c 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\icestormservice$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\icestormservice$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\icestormservice$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
ADMIN = $(top_srcdir)\bin\icestormadmin.exe
diff --git a/cpp/src/IceStorm/SqlDB/Makefile.mak b/cpp/src/IceStorm/SqlDB/Makefile.mak
index ae21bd10465..4cf11ab947d 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$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\icestormsqldb$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/IceStormLib/Makefile.mak b/cpp/src/IceStormLib/Makefile.mak
index 90e79d7357e..0e01d778bb1 100644
--- a/cpp/src/IceStormLib/Makefile.mak
+++ b/cpp/src/IceStormLib/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\icestorm$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\icestorm$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\icestorm$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak
index 4e62b1607d5..c073785b9d4 100644
--- a/cpp/src/IceUtil/Makefile.mak
+++ b/cpp/src/IceUtil/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\iceutil$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\iceutil$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\iceutil$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak
index 08a8674bdcb..feeef0f158e 100644
--- a/cpp/src/IceXML/Makefile.mak
+++ b/cpp/src/IceXML/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\icexml$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\icexml$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\icexml$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak
index 38d7ef7cd29..8f994fc1521 100644
--- a/cpp/src/Slice/Makefile.mak
+++ b/cpp/src/Slice/Makefile.mak
@@ -10,7 +10,7 @@
top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\slice$(LIBSUFFIX).lib
-DLLNAME = $(top_srcdir)\bin\slice$(COMPSUFFIX)$(SOVERSION)$(LIBSUFFIX).dll
+DLLNAME = $(top_srcdir)\bin\slice$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
TARGETS = $(LIBNAME) $(DLLNAME)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 22:52:01 +0000