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

detect netbsd / freebsd after linux not before, for bison/flex.

felipesanches-svg
don bright 2012-12-23 17:14:58 -06:00
parent 9deb7de38e
commit ad45e8a8c5
5 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bison.pri
View File

@ -17,7 +17,13 @@ win32 {
QMAKE_EXTRA_COMPILERS += bison_header QMAKE_EXTRA_COMPILERS += bison_header
} }
unix:freebsd-g++ { unix:linux* {
exists(/usr/bin/bison) {
QMAKE_YACC = /usr/bin/bison
}
}
freebsd* {
# on bsd /usr/bin/bison is outdated, dont use it # on bsd /usr/bin/bison is outdated, dont use it
exists(/usr/local/bin/bison) { exists(/usr/local/bin/bison) {
QMAKE_YACC = /usr/local/bin/bison QMAKE_YACC = /usr/local/bin/bison
@ -26,16 +32,10 @@ unix:freebsd-g++ {
} }
} }
unix:netbsd* { netbsd* {
exists(/usr/pkg/bin/bison) { exists(/usr/pkg/bin/bison) {
QMAKE_YACC = /usr/pkg/bin/bison QMAKE_YACC = /usr/pkg/bin/bison
} else { # look in $PATH } else { # look in $PATH
QMAKE_YACC = bison QMAKE_YACC = bison
} }
} }
unix:linux* {
exists(/usr/bin/bison) {
QMAKE_YACC = /usr/bin/bison
}
}

6
eigen.pri
View File

@ -49,13 +49,13 @@ CONFIG(mingw-cross-env) {
isEmpty(EIGEN_INCLUDEPATH) { isEmpty(EIGEN_INCLUDEPATH) {
freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen3 freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen3
macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen3 macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen3
linux*|hurd*: EIGEN_INCLUDEPATH = /usr/include/eigen3
netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen3 netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen3
!exists($$EIGEN_INCLUDEPATH) { linux*|hurd*|unix: EIGEN_INCLUDEPATH = /usr/include/eigen3
isEmpty(EIGEN_INCLUDEPATH) {
freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen2 freebsd-g++: EIGEN_INCLUDEPATH = /usr/local/include/eigen2
macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen2 macx: EIGEN_INCLUDEPATH = /opt/local/include/eigen2
linux*|hurd*: EIGEN_INCLUDEPATH = /usr/include/eigen2
netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen2 netbsd*: EIGEN_INCLUDEPATH = /usr/pkg/include/eigen2
linux*|hurd*|unix*: EIGEN_INCLUDEPATH = /usr/include/eigen2
} }
} }

17
flex.pri
View File

@ -9,16 +9,17 @@ win32 {
QMAKE_EXTRA_COMPILERS += flex QMAKE_EXTRA_COMPILERS += flex
} }
unix:freebsd-g++ {
QMAKE_LEX = /usr/local/bin/flex
}
unix:netbsd* {
QMAKE_LEX = /usr/pkg/bin/flex
}
unix:linux* { unix:linux* {
exists(/usr/bin/flex) { exists(/usr/bin/flex) {
QMAKE_LEX = /usr/bin/flex QMAKE_LEX = /usr/bin/flex
} }
} }
freebsd* {
QMAKE_LEX = /usr/local/bin/flex
}
netbsd* {
QMAKE_LEX = /usr/pkg/bin/flex
}

1
glew.pri
View File

@ -6,7 +6,6 @@ glew {
QMAKE_INCDIR += $$GLEW_DIR/include QMAKE_INCDIR += $$GLEW_DIR/include
QMAKE_LIBDIR += $$GLEW_DIR/lib QMAKE_LIBDIR += $$GLEW_DIR/lib
QMAKE_LIBDIR += $$GLEW_DIR/lib64 QMAKE_LIBDIR += $$GLEW_DIR/lib64
message("GLEW location: $$GLEW_DIR")
} }
unix:LIBS += -lGLEW unix:LIBS += -lGLEW

11
openscad.pro
View File

@ -116,11 +116,6 @@ netbsd* {
QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
} }
CONFIG(skip-version-check) {
# force the use of outdated libraries
DEFINES += OPENSCAD_SKIP_VERSION_CHECK
}
# Application configuration # Application configuration
macx:CONFIG += mdi macx:CONFIG += mdi
CONFIG += cgal CONFIG += cgal
@ -144,6 +139,12 @@ CONFIG(mingw-cross-env) {
include(mingw-cross-env.pri) include(mingw-cross-env.pri)
} }
# force the use of outdated libraries
CONFIG(skip-version-check) {
DEFINES += OPENSCAD_SKIP_VERSION_CHECK
}
win32 { win32 {
FLEXSOURCES = src/lexer.l FLEXSOURCES = src/lexer.l
BISONSOURCES = src/parser.y BISONSOURCES = src/parser.y