summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2010-12-06 11:22:51 +0000
committermsmit <msmit@remedy.nl>2010-12-06 11:22:51 +0000
commite5794cc95295908a5dff4dc325c938999fb447d4 (patch)
tree900eb1cf682c942e2250560afbf183432904fe1d
parent0993f91ce9740a5aa43c44c6d7da19d930bf9123 (diff)
downloadATCD-e5794cc95295908a5dff4dc325c938999fb447d4.tar.gz
Mon Dec 6 11:24:12 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc: Resolved link errors/warnings on windows.
-rw-r--r--CIAO/ChangeLog5
-rwxr-xr-xCIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc4
2 files changed, 8 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index f094ab64a66..1b64a331304 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 6 11:24:12 UTC 2010 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc:
+ Resolved link errors/warnings on windows.
+
Mon Dec 6 11:14:04 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc:
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
index b5b88b6e41c..28423532c92 100755
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
@@ -31,6 +31,8 @@ project(OneFile_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-Wb,skel_export_include=OneFile_Connector_skel_export.h \
-Wb,conn_export_macro=ONEFILE_CONNECTOR_CONN_Export \
-Wb,conn_export_include=OneFile_Connector_conn_export.h \
+ -Wb,skel_export_macro=ONEFILE_CONNECTOR_SVNT_Export \
+ -Wb,skel_export_include=OneFile_Connector_svnt_export.h
IDL_Files {
OneFile_Connector.idl
@@ -124,7 +126,7 @@ project(OneFile_Connector_svnt) : ciao_servant, dds4ccm_impl {
sharedname = OneFile_Connector_svnt
libs += OneFile_Connector_stub OneFile_Connector_lem_stub OneFile_Base_stub
- dynamicflags += ONEFILE_CONNECTOR_SVNT_BUILD_DLL
+ dynamicflags += ONEFILE_CONNECTOR_SVNT_BUILD_DLL ONEFILE_CONNECTOR_SKEL_BUILD_DLL
IDL_Files {
}