mirror of https://github.com/vitalif/openscad
Add defines for MSYS2 build.
parent
d2af825640
commit
4cb7b42fb8
|
@ -16,6 +16,7 @@ parser_yacc.h
|
||||||
/locale/*/*/*.mo
|
/locale/*/*/*.mo
|
||||||
/locale/POTFILES
|
/locale/POTFILES
|
||||||
/nbproject
|
/nbproject
|
||||||
|
/openscad.pro.user
|
||||||
/openscad
|
/openscad
|
||||||
/tests/openscad_nogui
|
/tests/openscad_nogui
|
||||||
testdata/scad/features/import_dxf-tests.scad
|
testdata/scad/features/import_dxf-tests.scad
|
||||||
|
|
10
boost.pri
10
boost.pri
|
@ -11,14 +11,20 @@ boost {
|
||||||
|
|
||||||
# See https://svn.boost.org/trac/boost/ticket/6219
|
# See https://svn.boost.org/trac/boost/ticket/6219
|
||||||
macx: DEFINES += __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0
|
macx: DEFINES += __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0
|
||||||
|
|
||||||
|
# MXE cross build
|
||||||
CONFIG(mingw-cross-env) {
|
CONFIG(mingw-cross-env) {
|
||||||
DEFINES += BOOST_STATIC
|
DEFINES += BOOST_STATIC
|
||||||
DEFINES += BOOST_THREAD_USE_LIB
|
DEFINES += BOOST_THREAD_USE_LIB
|
||||||
DEFINES += Boost_USE_STATIC_LIBS
|
DEFINES += Boost_USE_STATIC_LIBS
|
||||||
BOOST_LINK_FLAGS = -lboost_thread_win32-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt -lboost_chrono-mt
|
BOOST_LINK_FLAGS = -lboost_thread_win32-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt -lboost_chrono-mt
|
||||||
}
|
}
|
||||||
|
|
||||||
isEmpty(BOOST_LINK_FLAGS):win* {
|
# MSYS2
|
||||||
|
isEmpty(BOOST_LINK_FLAGS):win32-g++ {
|
||||||
|
DEFINES += BOOST_STATIC
|
||||||
|
DEFINES += BOOST_THREAD_USE_LIB
|
||||||
|
DEFINES += Boost_USE_STATIC_LIBS
|
||||||
BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt
|
BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue