build - fix mac build wrt new kiss_fft dependency

Add source and header to pro file and symlink tree to root
xavriley · Feb 4, 2020 · df16b7c · df16b7c
1 parent 4ff853e
commit df16b7c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/gui/qt/.gitignore b/app/gui/qt/.gitignore
@@ -0,0 +1 @@
+/kiss_fft
diff --git a/app/gui/qt/SonicPi.pro b/app/gui/qt/SonicPi.pro
@@ -70,7 +70,8 @@ SOURCES += main.cpp \
            widgets/sonicpilexer.cpp \
            widgets/settingswidget.cpp \
            model/sonicpitheme.cpp \
-           visualizer/scope.cpp
+           visualizer/scope.cpp \
+           external/kiss_fft/kiss_fft.c
 
 HEADERS  += mainwindow.h \
             widgets/sonicpilog.h \
@@ -89,7 +90,8 @@ HEADERS  += mainwindow.h \
             osc/sonic_pi_tcp_osc_server.h \
             model/sonicpitheme.h \
             model/settings.h \
-            visualizer/scope.h
+            visualizer/scope.h \
+            external/kiss_fft/kiss_fft.h
 
 TRANSLATIONS = lang/sonic-pi_bg.ts \
     lang/sonic-pi_bs.ts \

diff --git a/app/gui/qt/mac-build-app b/app/gui/qt/mac-build-app
@@ -39,6 +39,9 @@ cp -f utils/ruby_help.tmpl utils/ruby_help.h
 # Generate i18n files
 "$LREL" SonicPi.pro
 
+# ensure kiss_fft is visible to the source
+ln -s external/kiss_fft kiss_fft
+
 # Build App
 "$QMAKE" -o Makefile SonicPi.pro
 make