summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2010-12-06 11:12:51 +0000
committermsmit <msmit@remedy.nl>2010-12-06 11:12:51 +0000
commit0993f91ce9740a5aa43c44c6d7da19d930bf9123 (patch)
treec216bd06e4226118acd748a141fbc09de2c0cf0f
parentc45be30b60dfa802efe95cb37115ca0d2fc4290c (diff)
downloadATCD-0993f91ce9740a5aa43c44c6d7da19d930bf9123.tar.gz
Mon Dec 6 11:14:04 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc: Resolved link errors/warnings on windows.
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc4
2 files changed, 8 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 7c17de8a527..f094ab64a66 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 6 11:14:04 UTC 2010 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc:
+ Resolved link errors/warnings on windows.
+
Mon Dec 6 10:17:50 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc:
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
index 66a5f7449f6..b1b0fa35ae2 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
@@ -32,6 +32,8 @@ project(OFM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-Wb,skel_export_include=OFM_Connector_skel_export.h \
-Wb,conn_export_macro=OFM_CONNECTOR_CONN_Export \
-Wb,conn_export_include=OFM_Connector_conn_export.h \
+ -Wb,svnt_export_macro=OFM_CONNECTOR_SVNT_Export \
+ -Wb,svnt_export_include=OFM_Connector_svnt_export.h
IDL_Files {
OFM_Connector.idl
@@ -125,7 +127,7 @@ project(OFM_Connector_svnt) : ciao_servant, dds4ccm_impl {
libs += OFM_Connector_stub OFM_Connector_lem_stub OFM_Base_stub
sharedname = OFM_Connector_svnt
- dynamicflags += OFM_CONNECTOR_SVNT_BUILD_DLL
+ dynamicflags += OFM_CONNECTOR_SVNT_BUILD_DLL OFM_CONNECTOR_SKEL_BUILD_DLL
IDL_Files {
}