summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2014-06-04 10:13:34 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2014-06-04 10:13:34 +0000
commitee27d8af9dcd6755e098c4ade35791d4a7305a95 (patch)
tree42329184c0b9d1bb55806e6e20af43d6185773d1
parentafb6840aed58378315855be37683657a4f904bb3 (diff)
downloadATCD-ee27d8af9dcd6755e098c4ade35791d4a7305a95.tar.gz
Wed Jun 4 10:15:04 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/MakeProjectCreator/config/vc14nmake.mpb: vc14 has removed support for /Wp64
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/bin/MakeProjectCreator/config/vc14nmake.mpb3
2 files changed, 8 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 1512a2adfba..57feda7d8b7 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 4 10:15:04 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/MakeProjectCreator/config/vc14nmake.mpb:
+ vc14 has removed support for /Wp64
+
Wed Jun 4 10:09:44 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-win32-msvc-11.h:
diff --git a/ACE/bin/MakeProjectCreator/config/vc14nmake.mpb b/ACE/bin/MakeProjectCreator/config/vc14nmake.mpb
index 98e2d9ca3da..3e1cd845bde 100644
--- a/ACE/bin/MakeProjectCreator/config/vc14nmake.mpb
+++ b/ACE/bin/MakeProjectCreator/config/vc14nmake.mpb
@@ -2,5 +2,8 @@
// $Id$
project {
+ specific(nmake) {
+ addcompile -= /Wp64
+ }
}