diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2006-02-02 23:42:37 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2006-02-02 23:42:37 +0000 |
| commit | 7928e037ed67c6440e498f5497959700d75da220 (patch) | |
| tree | 5680870d25c1ecee19e1b63287cbf342c5c46b39 | |
| parent | 7827ff02e4288eb26e4e291ee70f60d43f36e57f (diff) | |
| download | ATCD-7928e037ed67c6440e498f5497959700d75da220.tar.gz | |
Thu Feb 2 23:41:39 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/acedefaults.mpb | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 60f9537fef2..7ed2bc5d13e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Feb 2 23:41:39 UTC 2006 William Otte <wotte@dre.vanderbilt.edu> + + * bin/MakeProjectCreator/config/acedefaults.mpb + + Added zlib to the feature inherits to resolve linking errors + on Windows. + Thu Feb 2 13:35:18 Pacific Standard Time 2006 Ossama Othman <ossama_othman at symantec dot com> * ace/OS_NS_Thread.h: @@ -38,6 +45,7 @@ Thu Feb 2 06:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tests/run_test.lst: Fixed another error in this file +>>>>>>> 4.9803 Wed Feb 1 20:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Event_Handler.h: diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb index 1fd16138cd2..e6f5fc5f01f 100644 --- a/bin/MakeProjectCreator/config/acedefaults.mpb +++ b/bin/MakeProjectCreator/config/acedefaults.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: zzip, ipv6 { +project: zlib, zzip, ipv6 { staticflags += ACE_AS_STATIC_LIBS includes += $(ACE_ROOT) libpaths += $(ACE_ROOT)/lib |