diff options
| -rw-r--r-- | ACE/ACE.mwc | 2 | ||||
| -rw-r--r-- | ACE/ChangeLog | 14 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/crosscompile.mpb | 3 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/global.features | 1 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/wb26.features | 4 |
5 files changed, 23 insertions, 1 deletions
diff --git a/ACE/ACE.mwc b/ACE/ACE.mwc index 82b50da4046..1783b891807 100644 --- a/ACE/ACE.mwc +++ b/ACE/ACE.mwc @@ -21,7 +21,7 @@ workspace { } // The '--' is a special key that indicates that the associated - // projects should be of the form @NAME@ in the generate Makefile.am. + // projects should be of the form @NAME@ in the generated Makefile.am. associate(--) { ACEXML ASNMP diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 52f0ae3c13a..e88988d9754 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,17 @@ +Thu Aug 13 03:23:33 UTC 2009 Chad Elliott <elliott_c@ociweb.com> + + * ACE.mwc: + + Fixed a comment. + + * bin/MakeProjectCreator/config/crosscompile.mpb: + * bin/MakeProjectCreator/config/global.features: + * bin/MakeProjectCreator/config/wb26.features: + + Added the cross_compile feature that is disabled by default. It + is enabled within the wb26.features. The 'crosscompile' base + project "avoids" the cross_compile feature. This fixes bug 3318. + Wed Aug 12 19:57:02 UTC 2009 Olli Savia <ops@iki.fi> * ace/config-linux-common.h: diff --git a/ACE/bin/MakeProjectCreator/config/crosscompile.mpb b/ACE/bin/MakeProjectCreator/config/crosscompile.mpb index 2fda2aa83ff..8ee8d6b7799 100644 --- a/ACE/bin/MakeProjectCreator/config/crosscompile.mpb +++ b/ACE/bin/MakeProjectCreator/config/crosscompile.mpb @@ -1,7 +1,10 @@ + // -*- MPC -*- // $Id$ project { + avoids += cross_compile + specific(prop:microsoft) { nocross = 1 } diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features index b99f2a0ac18..80b580595bc 100644 --- a/ACE/bin/MakeProjectCreator/config/global.features +++ b/ACE/bin/MakeProjectCreator/config/global.features @@ -24,6 +24,7 @@ ace_token = 1 // By default we disable these. ace_for_tao = 0 +cross_compile = 0 ssl = 0 qos = 0 rapi = 0 diff --git a/ACE/bin/MakeProjectCreator/config/wb26.features b/ACE/bin/MakeProjectCreator/config/wb26.features new file mode 100644 index 00000000000..46dfdb183d3 --- /dev/null +++ b/ACE/bin/MakeProjectCreator/config/wb26.features @@ -0,0 +1,4 @@ +// $Id$ + +// We're always cross-compiling with wb26 +cross_compile = 1 |