mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reverted changes to Labrador.pro

This commit is contained in:
chrises 2021-10-28 16:23:19 +11:00
parent 153944e615
commit fb04347852
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Desktop_Interface/Labrador.pro
View File

@ -11,7 +11,7 @@
QT += core gui QT += core gui
CONFIG += c++17 CONFIG += c++14
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
@ -246,7 +246,10 @@ macx:DEPENDPATH += $$PWD/build_mac/libdfuprog/include
macx:QMAKE_LFLAGS += "-undefined dynamic_lookup" macx:QMAKE_LFLAGS += "-undefined dynamic_lookup"
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
############################################################# #############################################################
######## SHARED UNIX-LIKE BUILDS (MAC + LINUX) ######### ######## SHARED UNIX-LIKE BUILDS (MAC + LINUX) #########
@ -360,3 +363,5 @@ DISTFILES += \
unix: LIBS += -lomp unix: LIBS += -lomp
unix: LIBS += -lfftw3f_omp unix: LIBS += -lfftw3f_omp
unix: LIBS += -lfftw3_threads unix: LIBS += -lfftw3_threads
macx: INCLUDEPATH += /usr/local/include
macx: LIBS+= -L/usr/local/lib

2
Desktop_Interface/macrun
View File

@ -1,4 +1,4 @@
qmake "INCLUDEPATH += /usr/local/include" "LIBS+= -L/usr/local/lib" qmake
make -j$(sysctl -n hw.physicalcpu) make -j$(sysctl -n hw.physicalcpu)
cp -R ./bin/waveforms ./bin/Labrador.app/Contents/MacOS cp -R ./bin/waveforms ./bin/Labrador.app/Contents/MacOS
cp -R ./bin/firmware ./bin/Labrador.app/Contents/MacOS cp -R ./bin/firmware ./bin/Labrador.app/Contents/MacOS