try to get mussagl to build on win32

diff --git a/alg/CMakeLists.txt b/alg/CMakeLists.txt
index 7043cdcdf0d6a8c1ca6b706c2a43f5a1c7c464b7..c79b59bc8b76cc9d2a4c4db85061c06dfeca75cf 100644 (file)
--- a/alg/CMakeLists.txt
+++ b/alg/CMakeLists.txt
@@ -14,10 +14,12 @@ SET(SOURCES annotation_colors.cpp
             parse_options.cpp 
             sequence.cpp)
 
-FIND_PACKAGE(OpenGL)
+FIND_PACKAGE(OpenGL )
+FIND_PACKAGE(Boost REQUIRED)
 
 ADD_LIBRARY( mussa_core STATIC ${SOURCES} )
 INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${BOOST_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(mussa_core ${OPEN_gl_LIBRARY})
 
 # these are really only needed for gcc on AMD64

diff --git a/makelib/FindBoost.cmake b/makelib/FindBoost.cmake
index 92e370be23ae1600cc46d56a4cbb36835aad5f7c..c69b394e364629feb23b4fe9f982432052ed909c 100644 (file)
--- a/makelib/FindBoost.cmake
+++ b/makelib/FindBoost.cmake
@@ -3,7 +3,41 @@
 # Defines:
 #  BOOST_INCLUDE
 
-FIND_PATH(BOOST_INCLUDE_DIR weak_ptr.hpp /usr/include /usr/local/include )
+FIND_PATH(BOOST_INCLUDE_DIR boost/weak_ptr.hpp 
+                            /usr/include 
+                            /usr/local/include
+                            C:\\Boost\\Include
+                            C:\\Boost\\include\\boost-1_33_1 )
+
+
+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 )
+ELSE(MINGW)
+
 
 FIND_LIBRARY( BOOST_UNIT_TEST_LIBRARY NAMES boost_unit_test_framework 
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
@@ -16,7 +50,7 @@ FIND_LIBRARY( BOOST_PYTHON_LIBRARY NAMES boost_python
 FIND_LIBRARY( BOOST_PYTHON_LIBRARY_DEBUG NAMES boost_python-d
               PATHS /usr/lib /usr/local/lib C:\\Boost\\lib )
 
-
+ENDIF(MINGW)
 
 IF (BOOST_INCLUDE_DIR)
   SET(BOOST_FOUND TRUE)

diff --git a/mussagl.pro b/mussagl.pro
index 96617a4659a601dadb5f77e88f139ce1abce55a5..51022d392bab417150b725a1420d4bc8bbb03a09 100644 (file)
--- a/mussagl.pro
+++ b/mussagl.pro
@@ -85,6 +85,8 @@ win32 {
   INCLUDEPATH += $$BOOST_HOME/include/boost-1_33_1
   LIBS -= -lboost_program_options
   LIBS += $$BOOST_HOME/lib/libboost_program_options-mgw-s.lib
+  LIBS -= -lboost_filesystem
+  LIBS += $$BOOST_HOME/lib/libboost_filesystem-mgw-s.lib
 } macx {
   INCLUDEPATH += /usr/local/include 
   INCLUDEPATH += /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/OpenGL.framework/Headers
@@ -93,5 +95,3 @@ win32 {
 } else {
   INCLUDEPATH += /usr/include/GL
 }
-
-