ChangeLogTag: Wed Oct 19 10:06:50 2005 Chad Elliott <elliott_c@ociweb.com>

9 files changed, 47 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f1c06d1..152a97b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,26 @@
+Wed Oct 19 10:06:50 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * config/boost_date_time.mpb:
+        * config/boost_filesystem.mpb:
+        * config/boost_prg_exec_monitor.mpb:
+        * config/boost_regex.mpb:
+        * config/boost_signals.mpb:
+        * config/boost_test_exec_monitor.mpb:
+        * config/boost_thread.mpb:
+        * config/boost_unit_test_framework.mpb:
+
+          Added a $(BOOST_STATIC_LIB_PREFIX) to the library name for all
+          boost libraries.  For some reason, they insist on prepend 'lib' to
+          the name of all static libraries on Windows.  For
+          unit_test_framework, prg_exec_monitor and test_exec_monitor, 'lib'
+          is always prepended on Windows since these are currently always
+          static.  Thanks to Kevin Heifner for pointing this out.
+
 Thu Oct 13 17:24:21 2005  Steve Huston  <shuston@riverace.com>
 
-	* modules/VC8WorkspaceCreator.pm: Add the 3 magic bytes to the start
-	  of the .sln file that allow double-clicking on the .sln file's icon
-	  to auto-start Visual Studio.
+        * modules/VC8WorkspaceCreator.pm: Add the 3 magic bytes to the start
+          of the .sln file that allow double-clicking on the .sln file's icon
+          to auto-start Visual Studio.
 
 Mon Oct 10 07:02:30 2005  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/config/boost_date_time.mpb b/config/boost_date_time.mpb
index cb34e5f1..1d54da94 100644
--- a/config/boost_date_time.mpb
+++ b/config/boost_date_time.mpb
@@ -2,5 +2,5 @@
 // $Id$
 
 project: boost_base {
-  lit_libs += boost_date_time$(BOOST_CFG)
+  lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_date_time$(BOOST_CFG)
 }
diff --git a/config/boost_filesystem.mpb b/config/boost_filesystem.mpb
index ab19a119..3a6c77d3 100644
--- a/config/boost_filesystem.mpb
+++ b/config/boost_filesystem.mpb
@@ -2,5 +2,5 @@
 // $Id$
 
 project: boost_base {
-  lit_libs += boost_filesystem$(BOOST_CFG)
+  lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_filesystem$(BOOST_CFG)
 }
diff --git a/config/boost_prg_exec_monitor.mpb b/config/boost_prg_exec_monitor.mpb
index 43a03820..5f6809e0 100644
--- a/config/boost_prg_exec_monitor.mpb
+++ b/config/boost_prg_exec_monitor.mpb
@@ -2,5 +2,11 @@
 // $Id$
 
 project: boost_base {
-  lit_libs += boost_prg_exec_monitor$(BOOST_CFG)
+  // The people at boost have to be difficult.  All static
+  // libraries are prefixed with lib on Windows.
+  specific(bmake, cbx, em3, nmake, vc6, vc7, vc71, vc8) {
+    lit_libs += libboost_prg_exec_monitor$(BOOST_CFG)
+  } else {
+    lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_prg_exec_monitor$(BOOST_CFG)
+  }
 }
diff --git a/config/boost_regex.mpb b/config/boost_regex.mpb
index c0f089b2..aacf180b 100644
--- a/config/boost_regex.mpb
+++ b/config/boost_regex.mpb
@@ -3,5 +3,5 @@
 
 project: boost_base {
   macros   += BOOST_REGEX_NO_LIB
-  lit_libs += boost_regex$(BOOST_CFG)
+  lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_regex$(BOOST_CFG)
 }
diff --git a/config/boost_signals.mpb b/config/boost_signals.mpb
index 4bf73925..263f98ba 100644
--- a/config/boost_signals.mpb
+++ b/config/boost_signals.mpb
@@ -2,5 +2,5 @@
 // $Id$
 
 project: boost_base {
-  lit_libs += boost_signals$(BOOST_CFG)
+  lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_signals$(BOOST_CFG)
 }
diff --git a/config/boost_test_exec_monitor.mpb b/config/boost_test_exec_monitor.mpb
index 597056c7..4c9905d6 100644
--- a/config/boost_test_exec_monitor.mpb
+++ b/config/boost_test_exec_monitor.mpb
@@ -2,5 +2,11 @@
 // $Id$
 
 project: boost_base {
-  lit_libs += boost_test_exec_monitor$(BOOST_CFG)
+  // The people at boost have to be difficult.  All static
+  // libraries are prefixed with lib on Windows.
+  specific(bmake, cbx, em3, nmake, vc6, vc7, vc71, vc8) {
+    lit_libs += libboost_test_exec_monitor$(BOOST_CFG)
+  } else {
+    lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_test_exec_monitor$(BOOST_CFG)
+  }
 }
diff --git a/config/boost_thread.mpb b/config/boost_thread.mpb
index a26c3a84..9141b7cd 100644
--- a/config/boost_thread.mpb
+++ b/config/boost_thread.mpb
@@ -2,5 +2,5 @@
 // $Id$
 
 project: boost_base {
-  lit_libs += boost_thread$(BOOST_CFG)
+  lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_thread$(BOOST_CFG)
 }
diff --git a/config/boost_unit_test_framework.mpb b/config/boost_unit_test_framework.mpb
index 327e4cc6..ae066ac2 100644
--- a/config/boost_unit_test_framework.mpb
+++ b/config/boost_unit_test_framework.mpb
@@ -2,5 +2,11 @@
 // $Id$
 
 project: boost_base {
-  lit_libs += boost_unit_test_framework$(BOOST_CFG)
+  // The people at boost have to be difficult.  All static
+  // libraries are prefixed with lib on Windows.
+  specific(bmake, cbx, em3, nmake, vc6, vc7, vc71, vc8) {
+    lit_libs += libboost_unit_test_framework$(BOOST_CFG)
+  } else {
+    lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG)
+  }
 }