diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-12-19 13:33:02 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-12-19 13:33:02 +0000 |
| commit | ca90fb8f6bc7581065cd6a5009759d68039eee40 (patch) | |
| tree | 9845c6cb3fb9ab30de46a22d3b05c029cba0831b /TAO/MPC | |
| parent | 1ff293c01b29dae57ad8b9f97fc91abc411fb771 (diff) | |
| download | ATCD-ca90fb8f6bc7581065cd6a5009759d68039eee40.tar.gz | |
Thu Dec 19 13:33:18 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/corba_e_compact.mpb:
* MPC/config/corba_e_micro.mpb:
* MPC/config/minimum_corba.mpb:
* MPC/config/taobaseidldefaults.mpb:
Changed CORBA/e feature support, move the feature
idl flags to taobaseidldefaults to not pull in
the IDL Files custom rules
Diffstat (limited to 'TAO/MPC')
| -rw-r--r-- | TAO/MPC/config/corba_e_compact.mpb | 3 | ||||
| -rw-r--r-- | TAO/MPC/config/corba_e_micro.mpb | 3 | ||||
| -rw-r--r-- | TAO/MPC/config/minimum_corba.mpb | 3 | ||||
| -rw-r--r-- | TAO/MPC/config/taobaseidldefaults.mpb | 12 |
4 files changed, 15 insertions, 6 deletions
diff --git a/TAO/MPC/config/corba_e_compact.mpb b/TAO/MPC/config/corba_e_compact.mpb index 3b796c4d09e..c268861d3fc 100644 --- a/TAO/MPC/config/corba_e_compact.mpb +++ b/TAO/MPC/config/corba_e_compact.mpb @@ -1,7 +1,6 @@ // -*- MPC -*- // $Id$ -feature (corba_e_compact) : taobaseidldefaults { +feature (corba_e_compact) { macros += CORBA_E_COMPACT - idlflags += -DCORBA_E_COMPACT -Gce } diff --git a/TAO/MPC/config/corba_e_micro.mpb b/TAO/MPC/config/corba_e_micro.mpb index ad25c2b3ab4..4a280b8de60 100644 --- a/TAO/MPC/config/corba_e_micro.mpb +++ b/TAO/MPC/config/corba_e_micro.mpb @@ -1,7 +1,6 @@ // -*- MPC -*- // $Id$ -feature (corba_e_micro) : taobaseidldefaults { +feature (corba_e_micro) { macros += CORBA_E_MICRO - idlflags += -DCORBA_E_MICRO -Gce } diff --git a/TAO/MPC/config/minimum_corba.mpb b/TAO/MPC/config/minimum_corba.mpb index c216e0705c6..0ad13d8595b 100644 --- a/TAO/MPC/config/minimum_corba.mpb +++ b/TAO/MPC/config/minimum_corba.mpb @@ -1,7 +1,6 @@ // -*- MPC -*- // $Id$ -feature(minimum_corba) : taobaseidldefaults { - idlflags += -DTAO_HAS_MINIMUM_POA -Gmc +feature(minimum_corba) { macros += TAO_HAS_MINIMUM_CORBA=1 } diff --git a/TAO/MPC/config/taobaseidldefaults.mpb b/TAO/MPC/config/taobaseidldefaults.mpb index 1a088382944..2d9ed6ae9c8 100644 --- a/TAO/MPC/config/taobaseidldefaults.mpb +++ b/TAO/MPC/config/taobaseidldefaults.mpb @@ -103,3 +103,15 @@ project: build_files { idlflags += $(TAO_IDLFLAGS) idlflags += -Sa -St } + +feature (corba_e_compact) { + idlflags += -DCORBA_E_COMPACT -Gce +} + +feature (corba_e_micro) { + idlflags += -DCORBA_E_MICRO -Gce +} + +feature(minimum_corba) { + idlflags += -DTAO_HAS_MINIMUM_POA -Gmc +} |