mirror of https://github.com/vitalif/openscad
Some minor cleanup
Marius Kintel
parent
27a2be8411
commit
a5a3d8f4cf
80
openscad.pro
80
openscad.pro
|
|
@ -18,7 +18,7 @@
|
|||
}
|
||||
|
||||
isEmpty(QT_VERSION) {
|
||||
error("Please use qmake for Qt 4 (probably qmake-qt4)")
|
||||
error("Please use qmake for Qt 4 or Qt 5 (probably qmake-qt4)")
|
||||
}
|
||||
|
||||
# Auto-include config_<variant>.pri if the VARIANT variable is give on the
|
||||
|
|
@ -34,10 +34,6 @@ isEmpty(QT_VERSION) {
|
|||
# Populate VERSION, VERSION_YEAR, VERSION_MONTH, VERSION_DATE from system date
|
||||
include(version.pri)
|
||||
|
||||
# for debugging link problems (use nmake -f Makefile.Release > log.txt)
|
||||
win* {
|
||||
# QMAKE_LFLAGS += -VERBOSE
|
||||
}
|
||||
debug: DEFINES += DEBUG
|
||||
|
||||
TEMPLATE = app
|
||||
|
|
@ -48,42 +44,40 @@ DEPENDPATH += src
|
|||
# Handle custom library location.
|
||||
# Used when manually installing 3rd party libraries
|
||||
isEmpty(OPENSCAD_LIBDIR) OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES)
|
||||
!isEmpty(OPENSCAD_LIBDIR) {
|
||||
INCLUDEPATH += $$OPENSCAD_LIBDIR/include
|
||||
QMAKE_INCDIR_QT = $$OPENSCAD_LIBDIR/include $$QMAKE_INCDIR_QT
|
||||
QMAKE_LIBDIR = $$OPENSCAD_LIBDIR/lib $$QMAKE_LIBDIR
|
||||
}
|
||||
else {
|
||||
macx {
|
||||
exists(/opt/local):exists(/usr/local/Cellar) {
|
||||
error("It seems you might have libraries in both /opt/local and /usr/local. Please specify which one to use with qmake OPENSCAD_LIBDIR=<prefix>")
|
||||
} else {
|
||||
exists(/opt/local) {
|
||||
#Default to MacPorts on Mac OS X
|
||||
message("Automatically searching for libraries in /opt/local. To override, use qmake OPENSCAD_LIBDIR=<prefix>")
|
||||
QMAKE_INCDIR = /opt/local/include
|
||||
QMAKE_LIBDIR = /opt/local/lib
|
||||
} else:exists(/usr/local/Cellar) {
|
||||
message("Automatically searching for libraries in /usr/local. To override, use qmake OPENSCAD_LIBDIR=<prefix>")
|
||||
QMAKE_INCDIR = /usr/local/include
|
||||
QMAKE_LIBDIR = /usr/local/lib
|
||||
}
|
||||
macx:isEmpty(OPENSCAD_LIBDIR) {
|
||||
exists(/opt/local):exists(/usr/local/Cellar) {
|
||||
error("It seems you might have libraries in both /opt/local and /usr/local. Please specify which one to use with qmake OPENSCAD_LIBDIR=<prefix>")
|
||||
} else {
|
||||
exists(/opt/local) {
|
||||
#Default to MacPorts on Mac OS X
|
||||
message("Automatically searching for libraries in /opt/local. To override, use qmake OPENSCAD_LIBDIR=<prefix>")
|
||||
OPENSCAD_LIBDIR = /opt/local
|
||||
} else:exists(/usr/local/Cellar) {
|
||||
message("Automatically searching for libraries in /usr/local. To override, use qmake OPENSCAD_LIBDIR=<prefix>")
|
||||
OPENSCAD_LIBDIR = /usr/local
|
||||
}
|
||||
}
|
||||
}
|
||||
!isEmpty(OPENSCAD_LIBDIR) {
|
||||
QMAKE_INCDIR = $$OPENSCAD_LIBDIR/include
|
||||
QMAKE_LIBDIR = $$OPENSCAD_LIBDIR/lib
|
||||
}
|
||||
|
||||
# add CONFIG+=deploy to the qmake command-line to make a deployment build
|
||||
deploy {
|
||||
message("Building deployment version")
|
||||
DEFINES += OPENSCAD_DEPLOY
|
||||
macx {
|
||||
CONFIG += x86_64
|
||||
CONFIG += sparkle
|
||||
}
|
||||
macx: CONFIG += sparkle
|
||||
}
|
||||
|
||||
macx {
|
||||
TARGET = OpenSCAD
|
||||
}
|
||||
else {
|
||||
TARGET = openscad
|
||||
}
|
||||
|
||||
macx {
|
||||
ICON = icons/OpenSCAD.icns
|
||||
QMAKE_INFO_PLIST = Info.plist
|
||||
APP_RESOURCES.path = Contents/Resources
|
||||
|
|
@ -91,6 +85,8 @@ macx {
|
|||
QMAKE_BUNDLE_DATA += APP_RESOURCES
|
||||
LIBS += -framework Cocoa -framework ApplicationServices
|
||||
|
||||
# Mac needs special care to link against the correct C++ library
|
||||
# We attempt to auto-detect it by inspecting Boost
|
||||
dirs = $${BOOSTDIR} $${QMAKE_LIBDIR}
|
||||
for(dir, dirs) {
|
||||
system(grep -q __112basic_string $${dir}/libboost_thread* >& /dev/null) {
|
||||
|
|
@ -103,13 +99,10 @@ macx {
|
|||
QMAKE_CXXFLAGS += -stdlib=libc++
|
||||
QMAKE_LFLAGS += -stdlib=libc++
|
||||
QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++
|
||||
# C++11 on Mac requires 10.7+
|
||||
# libc++ on requires Mac OS X 10.7+
|
||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
|
||||
}
|
||||
}
|
||||
else {
|
||||
TARGET = openscad
|
||||
}
|
||||
|
||||
win* {
|
||||
RC_FILE = openscad_win32.rc
|
||||
|
|
@ -132,6 +125,7 @@ netbsd* {
|
|||
QMAKE_LFLAGS += -Wl,-R/usr/X11R7/lib
|
||||
QMAKE_LFLAGS += -Wl,-R/usr/pkg/lib
|
||||
!clang: { QMAKE_CXXFLAGS += -std=c++0x }
|
||||
# FIXME: Can the lines below be removed in favour of the OPENSCAD_LIBDIR handling above?
|
||||
!isEmpty(OPENSCAD_LIBDIR) {
|
||||
QMAKE_CFLAGS = -I$$OPENSCAD_LIBDIR/include $$QMAKE_CFLAGS
|
||||
QMAKE_CXXFLAGS = -I$$OPENSCAD_LIBDIR/include $$QMAKE_CXXFLAGS
|
||||
|
|
@ -158,15 +152,15 @@ netbsd* {
|
|||
}
|
||||
|
||||
*clang* {
|
||||
# http://llvm.org/bugs/show_bug.cgi?id=9182
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-overloaded-virtual
|
||||
# disable enormous amount of warnings about CGAL / boost / etc
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
|
||||
# might want to actually turn this on once in a while
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
|
||||
# http://llvm.org/bugs/show_bug.cgi?id=9182
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-overloaded-virtual
|
||||
# disable enormous amount of warnings about CGAL / boost / etc
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
|
||||
# might want to actually turn this on once in a while
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
|
||||
}
|
||||
|
||||
CONFIG(skip-version-check) {
|
||||
|
|
@ -197,8 +191,6 @@ mdi {
|
|||
DEFINES += ENABLE_MDI
|
||||
}
|
||||
|
||||
DEFINES += USE_PROGRESSWIDGET
|
||||
|
||||
include(common.pri)
|
||||
|
||||
# mingw has to come after other items so OBJECT_DIRS will work properly
|
||||
|
|
|
|||
Loading…
Reference in New Issue