summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-08-09 12:18:08 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-08-09 12:18:08 +0000
commit6b6a9ef996377f756e12ef1d06927ff9b4120675 (patch)
treef5e233cf7dfc5ab5a5e89e7337734234f7d35a16
parentf39c18fb381d5ad466cb397e61f71db1567f8387 (diff)
downloadATCD-6b6a9ef996377f756e12ef1d06927ff9b4120675.tar.gz
Wed Aug 9 12:17:00 UTC 2006 Simon Massey <sma@prismtech.com>
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/bin/MakeProjectCreator/config/ace_opt_mfc.mpb5
-rw-r--r--ACE/bin/MakeProjectCreator/config/acedefaults.mpb2
3 files changed, 13 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 15c0c146294..044b2cdeadf 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Wed Aug 9 12:17:00 UTC 2006 Simon Massey <sma@prismtech.com>
+
+ * bin/MakeProjectCreator/config/ace_opt_mfc.mpb
+ * bin/MakeProjectCreator/config/acedefaults.mpb
+
+ Chad's new fix for MPC building MFC projects.
+
Tue Aug 8 14:00:06 UTC 2006 Carlos O'Ryan <coryan@atdesk.com>
* Merged in all the changes from the fix_bug_2540 branch, that is,
diff --git a/ACE/bin/MakeProjectCreator/config/ace_opt_mfc.mpb b/ACE/bin/MakeProjectCreator/config/ace_opt_mfc.mpb
new file mode 100644
index 00000000000..b9ec71f9270
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ace_opt_mfc.mpb
@@ -0,0 +1,5 @@
+// -*- MPC -*-
+// $Id: ace_opt_mfc.mpb 73920 2006-08-08 14:04:28Z sma $
+
+feature(mfc): ace_mfc {
+}
diff --git a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
index 59f8ca9657f..a0855588311 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 {
++project: zlib, zzip, ipv6, ace_opt_mfc {
staticflags += ACE_AS_STATIC_LIBS
includes += $(ACE_ROOT)
libpaths += $(ACE_ROOT)/lib