diff --git a/boost.pri b/boost.pri index daa6b1df..61ebd5e2 100644 --- a/boost.pri +++ b/boost.pri @@ -19,7 +19,7 @@ boost { } isEmpty(BOOST_LINK_FLAGS):win* { - BOOST_LINK_FLAGS = -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1 -llibboost_filesystem-vc90-mt-s-1_46_1 -llibboost_system-vc90-mt-s-1_46_1 -llibboost_regex-vc90-mt-s-1_46_1 + BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt } # check for OPENSCAD_LIBDIR + multithread diff --git a/cgal.pri b/cgal.pri index e61b6def..355cf010 100644 --- a/cgal.pri +++ b/cgal.pri @@ -6,7 +6,6 @@ cgal { CGAL_DIR = $$(CGALDIR) !isEmpty(CGAL_DIR) { QMAKE_INCDIR += $$CGAL_DIR/include - win*: QMAKE_INCDIR += $$CGAL_DIR/auxiliary/gmp/include QMAKE_LIBDIR += $$CGAL_DIR/lib message("CGAL location: $$CGAL_DIR") } @@ -19,14 +18,13 @@ cgal { *-g++* { QMAKE_CXXFLAGS += -frounding-math } - LIBS += $$CGAL_DIR/auxiliary/gmp/lib/libmpfr-4.lib -lCGAL-vc110-mt-gd } else { - LIBS += -lgmp -lmpfr -lCGAL QMAKE_CXXFLAGS += -frounding-math } + LIBS += -lCGAL -lmpfr -lgmp } - *clang* { - QMAKE_CXXFLAGS -= -frounding-math - } + *clang* { + QMAKE_CXXFLAGS -= -frounding-math + } } diff --git a/glew.pri b/glew.pri index 9898af59..1bd3236e 100644 --- a/glew.pri +++ b/glew.pri @@ -9,6 +9,9 @@ glew { } unix:LIBS += -lGLEW - win32:LIBS += -lglew32s - CONFIG(mingw-cross-env):DEFINES += GLEW_STATIC + CONFIG(mingw-cross-env): { + DEFINES += GLEW_STATIC + } else { + win32:LIBS += -lglew32 + } } diff --git a/openscad.pro b/openscad.pro index ff90be45..cc2b4a58 100644 --- a/openscad.pro +++ b/openscad.pro @@ -119,6 +119,13 @@ win* { QMAKE_CXXFLAGS += -DNOGDI } +mingw* { + # needed to prevent compilation error on MSYS2: + # as.exe: objects/cgalutils.o: too many sections (76541) + QMAKE_CXXFLAGS += -Wa,-mbig-obj + debug: QMAKE_CXXFLAGS += -O1 +} + CONFIG += qt QT += opengl