diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-06-12 17:05:10 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-06-12 17:05:10 +0000 |
| commit | aee3f3919cb425714d2628cd3e65367eaf8e1420 (patch) | |
| tree | 4dbd7c08fede24f1be60b5ba9fe8abb17c2195a1 | |
| parent | 6bcf7829725235551e9ec2cf87d615dda3fad35c (diff) | |
| download | ATCD-aee3f3919cb425714d2628cd3e65367eaf8e1420.tar.gz | |
ChangeLogTag: Mon Jun 12 17:00:02 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 8a4cd65eb09..c279d740420 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Jun 12 17:00:02 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * include/makeinclude/wrapper_macros.GNU: + + Set winnt to 0 if not explicitly set by a platform_*.GNU + makefile. + Mon Jun 12 16:48:19 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * tests/SV_Shared_Memory_Test.cpp (run_main): Moved a couple of diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index 631514f5796..e5dae53ab44 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -82,6 +82,7 @@ # else it defaults to .ACE_MAJOR.ACE_MINOR.ACE_BETA. # wfmo Build with wfmo support (Win32 only) # winregistry Build with windows registry support (Win32 only) +# winnt Build WinNT-specific projects (Win32 only) # # Usually, users do not need to be concerned with make targets. # Just enter "make" on the command line to build. A few notable @@ -791,6 +792,9 @@ wfmo ?= 0 # If not explicitly is set that we have winregistry, assume we don't have it. winregistry ?= 0 +# If not explicitly is set that we have winnt, assume we don't have it. +winnt ?= 0 + # In MPC, these are now features that are enabled by default. ace_other ?= 1 ace_codecs ?= 1 |