2 files changed, 5 insertions, 10 deletions

diff --git a/boost.pri b/boost.pri
index 165f071..b9f47d0 100644
--- a/boost.pri
+++ b/boost.pri
@@ -6,13 +6,12 @@ boost {
     !isEmpty(BOOST_DIR) {

       INCLUDEPATH += $$BOOST_DIR

       message("boost location: $$BOOST_DIR")

-      win32:LIBS += -L$$BOOST_DIR/libs/program_options/build/msvc-10.0/release/link-static/threading-multi

-      win32:LIBS += -L$$BOOST_DIR/libs/thread/build/msvc-10.0/release/link-static/threading-multi

+      win32:LIBS += -L$$BOOST_DIR/lib

     }

   }

 

   win32 {

-     LIBS += -llibboost_thread-vc100-mt-1_45 -llibboost_program_options-vc100-mt-1_45

+     LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1

   } else {

      LIBS += -lboost_thread -lboost_program_options

   }

diff --git a/cgal.pri b/cgal.pri
index bdd236a..040ace2 100644
--- a/cgal.pri
+++ b/cgal.pri
@@ -7,18 +7,14 @@ cgal {
     CGAL_DIR = $$(CGALDIR)
     !isEmpty(CGAL_DIR) {
       INCLUDEPATH += $$CGAL_DIR/include
-      win32 {
-         LIBS += -L$$CGAL_DIR/build/lib -L$$(MPFRDIR)/build.vc10/lib/Win32/Release -L$$(MPIRDIR)
-      } else {
-         LIBS += -L$$CGAL_DIR/lib
-      }
+      win32: INCLUDEPATH += $$CGAL_DIR/auxiliary/gmp/include
+      LIBS += -L$$CGAL_DIR/lib
       message("CGAL location: $$CGAL_DIR")
     }
   }
 
-  LIBS += -lmpfr
   win32 {
-    LIBS += -lmpir -lCGAL-vc100-mt
+    LIBS += $$CGAL_DIR/auxiliary/gmp/lib/libmpfr-4.lib -lCGAL-vc90-mt-gd
   } else {
     LIBS += -lgmp -lCGAL
   }