diff options
| -rw-r--r-- | ACEXML/common/ACEXML_Export.h | 20 | ||||
| -rw-r--r-- | ACEXML/common/common.mpc | 1 | ||||
| -rw-r--r-- | ACEXML/parser/parser/parser.mpc | 3 | ||||
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/config/acexml.mpb | 5 |
5 files changed, 30 insertions, 17 deletions
diff --git a/ACEXML/common/ACEXML_Export.h b/ACEXML/common/ACEXML_Export.h index 85ade891148..39546eeafcc 100644 --- a/ACEXML/common/ACEXML_Export.h +++ b/ACEXML/common/ACEXML_Export.h @@ -18,19 +18,15 @@ #include "ace/config-all.h" -#if defined (ACE_AS_STATIC_LIBS) && !defined (ACEXML_HAS_DLL) -# define ACEXML_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && ACEXML_HAS_DLL */ - -#if defined (ACE_HAS_DLL) -# if !defined (ACEXML_HAS_DLL) -# define ACEXML_HAS_DLL 1 -# endif /* ! ACEXML_HAS_DLL */ +#if defined (ACE_AS_STATIC_LIBS) +# if !defined (ACEXML_HAS_DLL) +# define ACEXML_HAS_DLL 0 +# endif /* ! ACEXML_HAS_DLL */ #else -# if !defined (ACEXML_HAS_DLL) -# define ACEXML_HAS_DLL 0 -# endif /* ! ACEXML_HAS_DLL */ -#endif +# if !defined (ACEXML_HAS_DLL) +# define ACEXML_HAS_DLL 1 +# endif /* ! ACEXML_HAS_DLL */ +#endif /* ACE_AS_STATIC_LIB */ #if defined (ACEXML_HAS_DLL) && (ACEXML_HAS_DLL == 1) # if defined (ACEXML_BUILD_DLL) diff --git a/ACEXML/common/common.mpc b/ACEXML/common/common.mpc index a34deefd62b..814e10d88cc 100644 --- a/ACEXML/common/common.mpc +++ b/ACEXML/common/common.mpc @@ -1,3 +1,4 @@ project(ACEXML): acelib { sharedname = ACEXML + dllflags += ACEXML_BUILD_DLL } diff --git a/ACEXML/parser/parser/parser.mpc b/ACEXML/parser/parser/parser.mpc index 76454a1c9c2..6816ce41cf2 100644 --- a/ACEXML/parser/parser/parser.mpc +++ b/ACEXML/parser/parser/parser.mpc @@ -1,4 +1,7 @@ project(ACEXML_Parser): acelib { sharedname = ACEXML_Parser depends += ACEXML + libs += ACEXML + libpaths += $(ACE_ROOT)/ACEXML/common + dllflags += ACEXML_PARSER_BUILD_DLL } diff --git a/ChangeLog b/ChangeLog index 72712cb6b54..73675f16b93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,20 @@ +Wed Mar 12 09:54:51 2003 Chad Elliott <elliott_c@ociweb.com> + + Committing Paul Calabrese's <calabrese_p@ociweb.com> MPC related + changes. + + * ACEXML/common/ACEXML_Export.h: + * ACEXML/common/common.mpc: + * ACEXML/parser/parser/parser.mpc: + * bin/MakeProjectCreator/config/acexml.mpb: + + Fix problems with ACEXML mpc files on windows. + Wed Mar 12 08:36:12 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> - * ace/FILE.cpp: Make the ACE_FILE::close() method check for a - valid handle. Thanks to Paul Marquis <pmarquis@pobox.com> for - reporting this. + * ace/FILE.cpp: Make the ACE_FILE::close() method check for a + valid handle. Thanks to Paul Marquis <pmarquis@pobox.com> for + reporting this. Wed Mar 12 08:25:17 2003 Chad Elliott <elliott_c@ociweb.com> diff --git a/bin/MakeProjectCreator/config/acexml.mpb b/bin/MakeProjectCreator/config/acexml.mpb index 970315972ba..ebbaae36b01 100644 --- a/bin/MakeProjectCreator/config/acexml.mpb +++ b/bin/MakeProjectCreator/config/acexml.mpb @@ -1,4 +1,5 @@ project { - depends += ACEXML_Parser ACEXML - libs += ACEXML_Parser ACEXML + depends += ACEXML_Parser ACEXML + libs += ACEXML_Parser ACEXML + libpaths += $(ACE_ROOT)/ACEXML/common $(ACE_ROOT)/ACEXML/parser/parser } |