diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-06-10 04:35:20 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-06-10 04:35:20 +0000 |
| commit | af95b2f404dd9e83081d79c12423aee2252592cd (patch) | |
| tree | 270cde3b32ace63dcd6cbed5019397395b55781d | |
| parent | 092b0e59881ec5c5eaeddcbcecbc5a13c6e42223 (diff) | |
| download | ATCD-af95b2f404dd9e83081d79c12423aee2252592cd.tar.gz | |
ChangeLogTag: Sat Jun 10 04:31:54 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/automake.features | 2 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/wxwindows.mpb | 19 |
3 files changed, 27 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 9d5238d86da..4896d04b4a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Sat Jun 10 04:31:54 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * bin/MakeProjectCreator/config/automake.features: + + Define MPC feature variable "wxWindows" to 1. + + * bin/MakeProjectCreator/config/wxwindows.mpb: + + Add automake specific definitions for compile_flags, + linkflags, and pure_libs. + Fri Jun 9 19:25:19 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * ace/Thread_Manager.h: Added a new parameter to wait() that @@ -27,7 +38,7 @@ Fri Jun 9 13:00:22 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * ace/Hash_Map_Manager_T.cpp (open): Zapped the use of ACE_ASSERT and replaced it with and if statement. We shouldn't be using ACE_ASSERT in ACE library code.. - + Fri Jun 9 12:53:48 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * ace/Hash_Map_Manager_T.{h,inl,cpp}: Added support for a separate diff --git a/bin/MakeProjectCreator/config/automake.features b/bin/MakeProjectCreator/config/automake.features index 4798bf6a418..d78fdef842f 100644 --- a/bin/MakeProjectCreator/config/automake.features +++ b/bin/MakeProjectCreator/config/automake.features @@ -28,3 +28,5 @@ tao_tkresource=1 xt=1 ace_xtreactor=1 tao_xtresource=1 + +wxWindows=1 diff --git a/bin/MakeProjectCreator/config/wxwindows.mpb b/bin/MakeProjectCreator/config/wxwindows.mpb index 54ee238e5c1..8931ea36712 100644 --- a/bin/MakeProjectCreator/config/wxwindows.mpb +++ b/bin/MakeProjectCreator/config/wxwindows.mpb @@ -4,11 +4,18 @@ project { requires += wxWindows verbatim(gnuace,local) { - # work based on the configuration of the wxWindows installation - # PLATFORM_WX_* defined in includes/makeincludes/*_macros.GNU - CPPFLAGS += $(PLATFORM_WX_CPPFLAGS) - LDFLAGS += $(PLATFORM_WX_LDFLAGS) - LDLIBS += $(PLATFORM_WX_LIBS) - } + # work based on the configuration of the wxWindows installation + # PLATFORM_WX_* defined in includes/makeincludes/*_macros.GNU + CPPFLAGS += $(PLATFORM_WX_CPPFLAGS) + LDFLAGS += $(PLATFORM_WX_LDFLAGS) + LDLIBS += $(PLATFORM_WX_LIBS) + } + + specific(automake) { + compile_flags += $(ACE_WX_CPPFLAGS) + linkflags += $(ACE_WX_LDFLAGS) + pure_libs += $(ACE_WX_LIBS) + } + // TBD - support other platforms } |