Objective C sources for only macos should only be added to build under OSX
- moved to macos build config - made jenkinsfile build much faster.portability/clang
parent
662d12b79b
commit
bc10f29204
|
@ -17,8 +17,8 @@ qmake'''
|
||||||
stage('Make') {
|
stage('Make') {
|
||||||
steps {
|
steps {
|
||||||
sh '''cd xybrid
|
sh '''cd xybrid
|
||||||
make'''
|
make -j 17'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,11 +31,9 @@ CONFIG += c++17
|
||||||
QMAKE_CXXFLAGS_DEBUG += -Og
|
QMAKE_CXXFLAGS_DEBUG += -Og
|
||||||
|
|
||||||
# automatically build file lists
|
# automatically build file lists
|
||||||
SOURCES += $$files(*.cpp, true) \
|
SOURCES += $$files(*.cpp, true)
|
||||||
util/macos_urlhelper.mm
|
|
||||||
HEADERS += $$files(*.h, true) \
|
HEADERS += $$files(*.h, true) \
|
||||||
$$files(*.hpp, true) \
|
$$files(*.hpp, true)
|
||||||
util/macos_urlhelper.h
|
|
||||||
FORMS += $$files(*.ui, true)
|
FORMS += $$files(*.ui, true)
|
||||||
RESOURCES += res/resources.qrc
|
RESOURCES += res/resources.qrc
|
||||||
|
|
||||||
|
@ -52,7 +50,8 @@ macx: {
|
||||||
LIBS += -L/usr/local/Cellar/boost/1.70.0/lib/ -lboost_math_tr1
|
LIBS += -L/usr/local/Cellar/boost/1.70.0/lib/ -lboost_math_tr1
|
||||||
LIBS += -framework OpenGL
|
LIBS += -framework OpenGL
|
||||||
LIBS += -framework Foundation
|
LIBS += -framework Foundation
|
||||||
OBJECTIVE_SOURCES += util/macos_urlhelper.h
|
SOURCES += util/macos_urlhelper.mm
|
||||||
|
HEADERS += util/macos_urlhelper.h
|
||||||
QMAKE_CXXFLAGS += -I/usr/local/Cellar/boost/1.70.0/include/
|
QMAKE_CXXFLAGS += -I/usr/local/Cellar/boost/1.70.0/include/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue