summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2010-07-01 09:05:42 +0000
committermsmit <msmit@remedy.nl>2010-07-01 09:05:42 +0000
commit8393c02ebaa509a755a40886b63b3499b4b082a7 (patch)
tree8e1b0c92613d034a648a5b5cfdb9d35ad6942923
parentbcbe4a76f95ea9611b0340ba86dd7af9309f473c (diff)
downloadATCD-8393c02ebaa509a755a40886b63b3499b4b082a7.tar.gz
Thu Jul 1 09:02:28 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc: Resolved linker errors on windows when full_ccm is on
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc6
2 files changed, 9 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d6a22e7a842..c2dd578b8fd 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 1 09:02:28 UTC 2010 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc:
+ Resolved linker errors on windows when full_ccm is on
+
Thu Jul 1 08:57:21 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl>
*bin/ciao_tests.lst
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
index 03bb8a707d5..29b0f62ec38 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
@@ -64,9 +64,11 @@ project(Shapes_Sender_comp_lem_stub) : ccm_svnt, dds4ccm_base {
}
project(Shapes_Sender_comp_stub) : ccm_stub, dds4ccm_base {
- after += Shapes_Sender_idl_gen Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub
+ after += Shapes_Sender_idl_gen Shapes_ShapeType_msg_stub \
+ Shapes_ShapeType_conn_stub Shapes_Control_obj_stub
- libs += Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub
+ libs += Shapes_ShapeType_msg_stub Shapes_ShapeType_conn_stub \
+ Shapes_Control_obj_stub
libpaths += ../../lib
libout = ../../lib