mirror of https://github.com/vitalif/openscad
Use DEPLOYDIR independant of deploy config
git-svn-id: http://svn.clifford.at/openscad/trunk@542 b57f626f-c46c-0410-a088-ec61d464b74cstl_dim
parent
069dff8140
commit
d9b08b1659
2
cgal.pri
2
cgal.pri
|
@ -1,7 +1,7 @@
|
|||
cgal {
|
||||
DEFINES += ENABLE_CGAL
|
||||
|
||||
!deploy {
|
||||
isEmpty(DEPLOYDIR) {
|
||||
# Optionally specify location of CGAL using the
|
||||
# CGALDIR env. variable
|
||||
CGAL_DIR = $$(CGALDIR)
|
||||
|
|
2
glew.pri
2
glew.pri
|
@ -1,5 +1,5 @@
|
|||
glew {
|
||||
!deploy {
|
||||
isEmpty(DEPLOYDIR) {
|
||||
# Optionally specify location of GLEW using the
|
||||
# GLEWDIR env. variable
|
||||
GLEW_DIR = $$(GLEWDIR)
|
||||
|
|
|
@ -6,7 +6,7 @@ opencsg {
|
|||
HEADERS += src/render-opencsg.h
|
||||
SOURCES += src/render-opencsg.cc
|
||||
|
||||
!deploy {
|
||||
isEmpty(DEPLOYDIR) {
|
||||
# Optionally specify location of OpenCSG using the
|
||||
# OPENCSGDIR env. variable
|
||||
OPENCSG_DIR = $$(OPENCSGDIR)
|
||||
|
|
10
openscad.pro
10
openscad.pro
|
@ -10,15 +10,15 @@ RCC_DIR = objects
|
|||
INCLUDEPATH += src
|
||||
|
||||
macx {
|
||||
DEPLOYDIR = $$(MACOSX_DEPLOY_DIR)
|
||||
!isEmpty(DEPLOYDIR) {
|
||||
INCLUDEPATH += $$DEPLOYDIR/include
|
||||
LIBS += -L$$DEPLOYDIR/lib
|
||||
}
|
||||
# add CONFIG+=deploy to the qmake command-line to make a deployment build
|
||||
deploy {
|
||||
message("Building deployment version")
|
||||
CONFIG += x86 x86_64
|
||||
DEPLOYDIR = $$(MACOSX_DEPLOY_DIR)
|
||||
!isEmpty(DEPLOYDIR) {
|
||||
INCLUDEPATH += $$DEPLOYDIR/include
|
||||
LIBS += -L$$DEPLOYDIR/lib
|
||||
}
|
||||
}
|
||||
|
||||
TARGET = OpenSCAD
|
||||
|
|
Loading…
Reference in New Issue