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

Fixed on mac???

This commit is contained in:
chrises 2021-10-28 13:53:38 +11:00
parent 30ad03b98d
commit aa43bbdc36
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -23,6 +23,10 @@ matrix:
- libusb-1.0-0-dev - libusb-1.0-0-dev
env: env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
- os: osx
osx_image: xcode11.6
compiler: clang
before_install: before_install:
- eval "${MATRIX_EVAL}" - eval "${MATRIX_EVAL}"

4
Desktop_Interface/Labrador.pro
View File

@ -359,6 +359,4 @@ DISTFILES += \
# Vincenzo added these to get multithreading on Unix fftw # Vincenzo added these to get multithreading on Unix fftw
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 qmake "INCLUDEPATH += /usr/local/include" "LIBS+= -L/usr/local/lib"
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

4
Desktop_Interface/mainwindow.cpp
View File

@ -251,7 +251,7 @@ MainWindow::MainWindow(QWidget *parent) :
spectrumMinXSpinbox = new QSpinBox(); spectrumMinXSpinbox = new QSpinBox();
spectrumMaxXSpinbox = new QSpinBox(); spectrumMaxXSpinbox = new QSpinBox();
spectrumLayoutWidget = new QWidget(); spectrumLayoutWidget = new QWidget();
QHBoxLayout* spectrumLayout = new QHBoxLayout(); QHBoxLayout* spectrumLayout = new QHBoxLayout(spectrumLayoutWidget);
QLabel* spectrumMinFreqLabel = new QLabel("Min Frequency (Hz)"); QLabel* spectrumMinFreqLabel = new QLabel("Min Frequency (Hz)");
QLabel* spectrumMaxFreqLabel = new QLabel("Max Frequency (Hz)"); QLabel* spectrumMaxFreqLabel = new QLabel("Max Frequency (Hz)");
QSpacerItem* spacer = new QSpacerItem(20, 40, QSizePolicy::Expanding, QSizePolicy::Minimum); QSpacerItem* spacer = new QSpacerItem(20, 40, QSizePolicy::Expanding, QSizePolicy::Minimum);
@ -283,7 +283,7 @@ MainWindow::MainWindow(QWidget *parent) :
MainWindow::~MainWindow() MainWindow::~MainWindow()
{ {
delete ui; // delete ui;
} }
void MainWindow::initialisePlot() void MainWindow::initialisePlot()