vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Updates to build on MSYS2.

master
Torsten Paul 2014-12-20 23:09:03 +01:00
parent 4a75c57209
commit 7d863d2bf2
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boost.pri
View File

@ -19,7 +19,7 @@ boost {
} }
isEmpty(BOOST_LINK_FLAGS):win* { 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 # check for OPENSCAD_LIBDIR + multithread

10
cgal.pri
View File

@ -6,7 +6,6 @@ cgal {
CGAL_DIR = $$(CGALDIR) CGAL_DIR = $$(CGALDIR)
!isEmpty(CGAL_DIR) { !isEmpty(CGAL_DIR) {
QMAKE_INCDIR += $$CGAL_DIR/include QMAKE_INCDIR += $$CGAL_DIR/include
win*: QMAKE_INCDIR += $$CGAL_DIR/auxiliary/gmp/include
QMAKE_LIBDIR += $$CGAL_DIR/lib QMAKE_LIBDIR += $$CGAL_DIR/lib
message("CGAL location: $$CGAL_DIR") message("CGAL location: $$CGAL_DIR")
} }
@ -19,14 +18,13 @@ cgal {
*-g++* { *-g++* {
QMAKE_CXXFLAGS += -frounding-math QMAKE_CXXFLAGS += -frounding-math
} }
LIBS += $$CGAL_DIR/auxiliary/gmp/lib/libmpfr-4.lib -lCGAL-vc110-mt-gd
} else { } else {
LIBS += -lgmp -lmpfr -lCGAL
QMAKE_CXXFLAGS += -frounding-math QMAKE_CXXFLAGS += -frounding-math
} }
LIBS += -lCGAL -lmpfr -lgmp
} }
*clang* { *clang* {
QMAKE_CXXFLAGS -= -frounding-math QMAKE_CXXFLAGS -= -frounding-math
} }
} }

7
glew.pri
View File

@ -9,6 +9,9 @@ glew {
} }
unix:LIBS += -lGLEW unix:LIBS += -lGLEW
win32:LIBS += -lglew32s CONFIG(mingw-cross-env): {
CONFIG(mingw-cross-env):DEFINES += GLEW_STATIC DEFINES += GLEW_STATIC
} else {
win32:LIBS += -lglew32
}
} }

7
openscad.pro
View File

@ -119,6 +119,13 @@ win* {
QMAKE_CXXFLAGS += -DNOGDI 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 CONFIG += qt
QT += opengl QT += opengl