summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2005-12-12 23:33:57 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2005-12-12 23:33:57 +0000
commit9253c5263d4ba6c9a2d6df96ee5c439df6e4ed10 (patch)
treeafb5faf9f53998af80fbd16d45a759272fc46e68
parent77600a60674f316a832354801c27acfbcdf20a0b (diff)
downloadATCD-9253c5263d4ba6c9a2d6df96ee5c439df6e4ed10.tar.gz
ChangeLogTag:Mon Dec 12 15:31:50 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
-rw-r--r--ChangeLog8
-rw-r--r--ace/ace_for_tao.mpc2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 25a3fd8ccee..de8f98fdb2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Dec 12 15:31:50 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
+
+ * ace/ace_for_tao.mpc:
+
+ Added "nmake" to the list of Windows-based build types that
+ should be considered when adding Windows-specific sources to the
+ ace_for_tao subset.
+
Mon Dec 12 15:23:29 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
* tests/tests.mpc (UPIPE_SAP_Test):
diff --git a/ace/ace_for_tao.mpc b/ace/ace_for_tao.mpc
index de606b1a423..6e2b85a355b 100644
--- a/ace/ace_for_tao.mpc
+++ b/ace/ace_for_tao.mpc
@@ -172,7 +172,7 @@ project(ACE_FOR_TAO) : acedefaults, core, svcconf, versioned_namespace, pkgconfi
}
// ACE_Token implementation uses semaphores on Windows and VxWorks.
- conditional(vc6,vc71,vc8,bmake) {
+ conditional(vc6,vc71,vc8,nmake,bmake) {
ACE_crc32.cpp // Required by SV_Semaphore_Simple
Semaphore.cpp
Process_Mutex.cpp