diff options
author | Marius Kintel <marius@kintel.net> | 2011-04-06 13:04:08 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-04-06 13:04:08 (GMT) |
commit | 3c77e2a8b6fe76d57375ab4fadc5fb1c88c4b269 (patch) | |
tree | 5a348bb876a9be91897ab6f804883d7fa94e248e | |
parent | 32abad175da311264993a49c9f312a6eed191d35 (diff) |
Small steps towards making this buildable on VS2008
-rw-r--r-- | boost.pri | 5 | ||||
-rw-r--r-- | cgal.pri | 10 |
2 files changed, 5 insertions, 10 deletions
@@ -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
}
@@ -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 } |