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

fix compilation on Fedora: boost, flex, and OPENSCAD_LIBRARIES

stl_dim
don bright 2011-12-16 17:33:31 -08:00
parent b8be38ce8b
commit b6a01a76b9
3 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
boost.pri
View File

@ -9,18 +9,34 @@ boost {
win32:QMAKE_LIBDIR += -L$$BOOST_DIR/lib
}
ORIGINAL_LIBS_VALUE = $$LIBS
win32 {
LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1
}
exists(/usr/lib64/libboost*thread-mt*) {
LIBS += -lboost_thread-mt -lboost_program_options-mt
BOOST_IS_MT = true
}
exists(/usr/lib/libboost*thread-mt*) {
LIBS *= -lboost_thread-mt -lboost_program_options-mt
BOOST_IS_MT = true
}
isEmpty(BOOST_IS_MT) {
unix|macx {
LIBS += -lboost_thread -lboost_program_options
}
}
CONFIG(mingw-cross-env) {
LIBS = $$ORIGINAL_LIBS_VALUE # erase, start over
DEFINES += BOOST_STATIC
DEFINES += BOOST_THREAD_USE_LIB
DEFINES += Boost_USE_STATIC_LIBS
LIBS += -lboost_thread_win32-mt -lboost_program_options-mt
} else {
win32 {
LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1
} else {
# some platforms have only '-mt' versions. uncomment if needed.
# LIBS += -lboost_thread-mt -lboost_program_options-mt
LIBS += -lboost_thread -lboost_program_options
}
}
}
}

10
flex.pri
View File

@ -10,6 +10,16 @@ win32 {
}
unix:freebsd-g++ {
# on bsd /usr/bin/bison is outdated, dont use it
QMAKE_LEX = /usr/local/bin/flex
QMAKE_YACC = /usr/local/bin/bison
}
unix:linux* {
exists(/usr/bin/flex) {
QMAKE_LEX = /usr/bin/flex
}
exists(/usr/bin/bison) {
QMAKE_YACC = /usr/bin/bison
}
}

8
openscad.pro
View File

@ -40,8 +40,8 @@ INCLUDEPATH += src
# Used when manually installing 3rd party libraries
OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES)
!isEmpty(OPENSCAD_LIBDIR) {
INCLUDEPATH = $$OPENSCAD_LIBDIR/include $$INCLUDEPATH
QMAKE_LIBDIR = $$OPENSCAD_LIBDIR/lib $$QMAKE_LIBDIR
QMAKE_INCDIR_QT = $$OPENSCAD_LIBDIR/include $$QMAKE_INCDIR_QT
QMAKE_LIBDIR_QT = $$OPENSCAD_LIBDIR/lib $$QMAKE_LIBDIR_QT
}
else {
macx {
@ -77,6 +77,10 @@ win32 {
CONFIG += qt
QT += opengl
linux*:exists(/usr/lib64/libGLU*)|linux*:exists(/usr/lib/libGLU*) {
LIBS += -lGLU # Fedora + DSO
}
# Application configuration
macx:CONFIG += mdi
CONFIG += cgal