mirror of https://github.com/EspoTek/Labrador.git
Fixed on mac???
This commit is contained in:
parent
30ad03b98d
commit
aa43bbdc36
|
@ -23,6 +23,10 @@ matrix:
|
|||
- libusb-1.0-0-dev
|
||||
env:
|
||||
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
|
||||
- os: osx
|
||||
osx_image: xcode11.6
|
||||
compiler: clang
|
||||
|
||||
|
||||
before_install:
|
||||
- eval "${MATRIX_EVAL}"
|
||||
|
|
|
@ -359,6 +359,4 @@ DISTFILES += \
|
|||
# Vincenzo added these to get multithreading on Unix fftw
|
||||
unix: LIBS += -lomp
|
||||
unix: LIBS += -lfftw3f_omp
|
||||
unix: LIBS += -lfftw3_threads
|
||||
macx: INCLUDEPATH += /usr/local/include
|
||||
macx: LIBS+= -L/usr/local/lib
|
||||
unix: LIBS += -lfftw3_threads
|
|
@ -1,4 +1,4 @@
|
|||
qmake
|
||||
qmake "INCLUDEPATH += /usr/local/include" "LIBS+= -L/usr/local/lib"
|
||||
make -j$(sysctl -n hw.physicalcpu)
|
||||
cp -R ./bin/waveforms ./bin/Labrador.app/Contents/MacOS
|
||||
cp -R ./bin/firmware ./bin/Labrador.app/Contents/MacOS
|
||||
|
|
|
@ -251,7 +251,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||
spectrumMinXSpinbox = new QSpinBox();
|
||||
spectrumMaxXSpinbox = new QSpinBox();
|
||||
spectrumLayoutWidget = new QWidget();
|
||||
QHBoxLayout* spectrumLayout = new QHBoxLayout();
|
||||
QHBoxLayout* spectrumLayout = new QHBoxLayout(spectrumLayoutWidget);
|
||||
QLabel* spectrumMinFreqLabel = new QLabel("Min Frequency (Hz)");
|
||||
QLabel* spectrumMaxFreqLabel = new QLabel("Max Frequency (Hz)");
|
||||
QSpacerItem* spacer = new QSpacerItem(20, 40, QSizePolicy::Expanding, QSizePolicy::Minimum);
|
||||
|
@ -283,7 +283,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||
|
||||
MainWindow::~MainWindow()
|
||||
{
|
||||
delete ui;
|
||||
// delete ui;
|
||||
}
|
||||
|
||||
void MainWindow::initialisePlot()
|
||||
|
|
Loading…
Reference in New Issue