Windows XP support patch by Diane

diff --git a/makelib/FindBoost.cmake b/makelib/FindBoost.cmake
index c69b394e364629feb23b4fe9f982432052ed909c..0cd5804f91e86f9208bc0b4ff366011ec3c7f113 100644 (file)
--- a/makelib/FindBoost.cmake
+++ b/makelib/FindBoost.cmake
@@ -12,30 +12,30 @@ FIND_PATH(BOOST_INCLUDE_DIR boost/weak_ptr.hpp
 
 IF(MINGW)
   SET (BOOST_ROOT C:\\Boost)
-  FIND_PATH( BOOST_UNIT_TEST_LIBRARY 
-             libboost_unit_test_framework-mgw-s.lib 
-             ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_UNIT_TEST_LIBRARY_DEBUG 
-             libboost_unit_test_framework-mgw-sd.lib 
-             PATHS ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_PROGRAM_OPTIONS_LIBRARY 
-             libboost_program_options-mgw-s.lib
-             PATHS ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_PROGRAM_OPTIONS_LIBRARY_DEBUG 
-             libboost_program_options-sd.lib
-             PATHS ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_FILESYSTEM_LIBRARY 
-             libboost_filesystem-mgw-s.lib
-             PATHS ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_FILESYSTEM_LIBRARY_DEBUG 
-             libboost_filesystem-mgw-sd.lib
-             PATHS ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_PYTHON_LIBRARY 
-             libboost_python-mgw.lib
-             PATHS ${BOOST_ROOT}\\lib )
-  FIND_PATH( BOOST_PYTHON_LIBRARY_DEBUG 
-             libboost_python-mgw-d.lib
-             PATHS ${BOOST_ROOT}\\lib )
+  FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY 
+                libboost_unit_test_framework-mgw-s
+                ${BOOST_ROOT}\\lib )
+  FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY_DEBUG 
+                libboost_unit_test_framework-mgw-s
+                PATHS ${BOOST_ROOT}\\lib )
+  FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY 
+                libboost_program_options-mgw-s
+                PATHS ${BOOST_ROOT}\\lib )
+  FIND_LIBRARY( BOOST_PROGRAM_OPTIONS_LIBRARY_DEBUG 
+                libboost_program_options-mgw-sd
+                PATHS ${BOOST_ROOT}\\lib )
+  FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY 
+                libboost_filesystem-mgw-s
+                PATHS ${BOOST_ROOT}\\lib )
+  FIND_LIBRARY( BOOST_FILESYSTEM_LIBRARY_DEBUG 
+                libboost_filesystem-mgw-sd
+                PATHS ${BOOST_ROOT}\\lib )
+  FIND_LIBRARY( BOOST_PYTHON_LIBRARY 
+                libboost_python-mgw
+                PATHS ${BOOST_ROOT}\\lib )
+  FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG 
+                libboost_python-mgw-d
+                PATHS ${BOOST_ROOT}\\lib )
 ELSE(MINGW)
 
 

diff --git a/qui/CMakeLists.txt b/qui/CMakeLists.txt
index 64a725571d53bb90dd192b7a21d22880a9239b2f..a7634972920cd7c7097546eca611535bdd9d3d0c 100644 (file)
--- a/qui/CMakeLists.txt
+++ b/qui/CMakeLists.txt
@@ -71,7 +71,8 @@ SET(SOURCES  ${MOC_SOURCES} ${GUI_SOURCES} ${RCC_SOURCES} ${MAIN_SOURCES})
 
 # these are really only needed for gcc on AMD64
 INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} 
-                    ${QT_INCLUDES})
+                    ${QT_INCLUDES}
+                    ${BOOST_INCLUDE_DIR} )
 
 ADD_LIBRARY(mussa_qui STATIC ${SOURCES})
 TARGET_LINK_LIBRARIES(mussa_qui