diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-08-08 14:04:28 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-08-08 14:04:28 +0000 |
| commit | 6f0941f3ee0b5182361d100f35375582608055c6 (patch) | |
| tree | 1058d7e44485b961949e5743a6b7dad76285c474 | |
| parent | c428091b52ae09e16d9c03b7157271ff65f18cf3 (diff) | |
| download | ATCD-6f0941f3ee0b5182361d100f35375582608055c6.tar.gz | |
Tue Aug 8 14:05:00 UTC 2006 Simon Massey <sma@prismtech.com>
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/ace_mfc.mpb | 2 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/acedefaults.mpb | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 31101e6c8be..704d849f022 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Tue Aug 8 14:05:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * bin/MakeProjectCreator/config/ace_mfc.mpb + * bin/MakeProjectCreator/config/acedefaults.mpb + + Reverted Chad's fix for MPC building MFC projects. + It seems that this causes non MFC builds to build as MFC + breaking the scoreboard. + Tue Aug 8 09:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ACE.mwc: diff --git a/ACE/bin/MakeProjectCreator/config/ace_mfc.mpb b/ACE/bin/MakeProjectCreator/config/ace_mfc.mpb index affea6635f7..3339a9220eb 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_mfc.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_mfc.mpb @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -feature(mfc): mfc { +project: mfc { macros += ACE_HAS_MFC=1 } diff --git a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb index b7eb01699ec..59f8ca9657f 100644 --- a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb +++ b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: zlib, zzip, ipv6, ace_mfc { +project: zlib, zzip, ipv6 { staticflags += ACE_AS_STATIC_LIBS includes += $(ACE_ROOT) libpaths += $(ACE_ROOT)/lib |