summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2006-05-02 22:05:21 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2006-05-02 22:05:21 +0000
commite748c31f236afbb3b15039c87ff48fa335f2995d (patch)
treee244fcff42989bb5530d3522865c02db377fc6c9
parentf27569a94e664facaf2f798cd7931ac291b64fd5 (diff)
downloadATCD-e748c31f236afbb3b15039c87ff48fa335f2995d.tar.gz
ChangeLog tag: Tue May 2 22:01:51 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc4
2 files changed, 11 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ffd87015ba3..4a305327028 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue May 2 22:01:51 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc:
+ Added the portableserver base project to both the client lib and
+ server lib projects, since both require client and server
+ behavior. This is required for windows builds where apparently
+ DLLs must have all symbols fully resolved at link time, unlike
+ .so's where they only need to be satisfied at runtime.
+
Tue May 2 19:08:18 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>
* tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h:
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
index 4b646289952..5ed5025aee2 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Two_DLL_ORB.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project(ORB DLL Server) : taolib_with_idl {
+project(ORB DLL Server) : taolib_with_idl, portableserver {
sharedname = ORB_DLL_Server
dynamicflags = SERVICE_CONFIG_ORB_DLL_BUILD_DLL
@@ -25,7 +25,7 @@ project(ORB DLL Server) : taolib_with_idl {
}
}
-project(ORB DLL Client) : taolib_with_idl {
+project(ORB DLL Client) : taolib_with_idl, portableserver {
sharedname = ORB_DLL_Client
dynamicflags = SERVICE_CONFIG_ORB_DLL_BUILD_DLL