summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2005-03-29 12:24:21 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2005-03-29 12:24:21 +0000
commitf684cbbf27658ede2e0dde8c02fb2abec7a62f3c (patch)
tree80923c195a38a5cfb3f74a8954c3cc24300230a8
parent8dfbf23ea0db9fe6f0a2ce65fade86d3630afd2c (diff)
downloadMPC-f684cbbf27658ede2e0dde8c02fb2abec7a62f3c.tar.gz
ChangeLogTag: Tue Mar 29 06:23:03 2005 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog14
-rw-r--r--config/xerces.mpb14
2 files changed, 23 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 955be81e..343d30fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+Tue Mar 29 06:23:03 2005 Chad Elliott <elliott_c@ociweb.com>
+
+ * config/xerces.mpb:
+
+ Account for the many different names that the xerces library can
+ have by using a template variable that can be overridden by the
+ user if necessary.
+
Fri Mar 25 18:37:52 2005 J.T. Conklin <jtc@acorntoolworks.com>
- * modules/AutomakeWorkspaceCreator.pm:
+ * modules/AutomakeWorkspaceCreator.pm:
- *_HEADERS processing was broken when I added regular expression
- to match all automake primaries.
+ *_HEADERS processing was broken when I added regular expression
+ to match all automake primaries.
Fri Mar 25 10:59:10 2005 Chad Elliott <elliott_c@ociweb.com>
diff --git a/config/xerces.mpb b/config/xerces.mpb
index 5a50cf7b..3e2766ce 100644
--- a/config/xerces.mpb
+++ b/config/xerces.mpb
@@ -3,7 +3,17 @@
project {
includes += $(XERCESCROOT)/include
- lit_libs += xerces-c
- macros += XML_USE_PTHREADS
libpaths += $(XERCESCROOT)/lib
+
+ specific (em3, vc6, vc7, vc71, vc8, nmake) {
+ xerceslib = xerces-c_2
+ }
+ specific(borland, bmake, cbx) {
+ xerceslib = XercesLib
+ }
+ specific (gnuace, make, sle, automake, ghs) {
+ macros += XML_USE_PTHREADS
+ xerceslib = xerces-c
+ }
+ libs += $(XERCESLIB)
}