Cleanup cmakelists

pschatzmann · Oct 6, 2024 · 746b18c · 746b18c
1 parent 90e4088
commit 746b18c
Show file tree

Hide file tree

Showing 34 changed files with 89 additions and 91 deletions.
diff --git a/examples/examples-desktop/generator/CMakeLists.txt b/examples/examples-desktop/generator/CMakeLists.txt
@@ -18,7 +18,7 @@ add_executable (generator generator.ino)
 
 # set preprocessor defines
 target_compile_definitions(arduino_emulator PUBLIC -DDEFINE_MAIN)
-target_compile_definitions(generator PUBLIC -DARDUINO -DIS_DESKTOP -DEXIT_ON_STOP)
+target_compile_definitions(generator PUBLIC -DARDUINO -DIS_DESKTOP)
 
 # specify libraries
 target_link_libraries(generator portaudio arduino_emulator arduino-audio-tools)

diff --git a/examples/examples-desktop/min-generator/CMakeLists.txt b/examples/examples-desktop/min-generator/CMakeLists.txt
@@ -21,7 +21,7 @@ set_source_files_properties(min-generator.ino PROPERTIES LANGUAGE CXX)
 add_executable (min-generator min-generator.ino)
 
 # set preprocessor defines
-target_compile_definitions(min-generator PUBLIC -DIS_MIN_DESKTOP -DEXIT_ON_STOP)
+target_compile_definitions(min-generator PUBLIC -DIS_MIN_DESKTOP)
 
 # specify libraries
 target_link_libraries(min-generator arduino-audio-tools)

diff --git a/examples/examples-desktop/mp3/CMakeLists.txt b/examples/examples-desktop/mp3/CMakeLists.txt
@@ -27,7 +27,7 @@ add_executable (mp3_dt mp3.ino)
 # set preprocessor defines
 target_compile_definitions(arduino_emulator PUBLIC -DDEFINE_MAIN)
 target_compile_definitions(arduino_helix PUBLIC -DARDUINO -DHELIX_LOGGING_ACTIVE=0)
-target_compile_definitions(mp3_dt PUBLIC -DIS_DESKTOP -DEXIT_ON_STOP)
+target_compile_definitions(mp3_dt PUBLIC -DIS_DESKTOP)
 
 # OS/X might need this setting for core audio
 target_compile_options(portaudio PRIVATE -Wno-deprecated)

diff --git a/examples/examples-dsp/examples-stk/streams-stk-desktop/CMakeLists.txt b/examples/examples-dsp/examples-stk/streams-stk-desktop/CMakeLists.txt
@@ -26,7 +26,7 @@ add_executable (stk_example streams-stk-desktop.ino)
 
 # set preprocessor defines
 target_compile_definitions(arduino_emulator PUBLIC -DDEFINE_MAIN)
-target_compile_definitions(stk_example PUBLIC -DARDUINO -DIS_DESKTOP -DEXIT_ON_STOP)
+target_compile_definitions(stk_example PUBLIC -DARDUINO -DIS_DESKTOP)
 target_compile_definitions(arduino-stk PUBLIC -DIS_DESKTOP)
 
 # OS/X might need this setting for core audio

diff --git a/examples/examples-dsp/examples-stk/streams-stk_allinstruments-audiokit/CMakeLists.txt b/examples/examples-dsp/examples-stk/streams-stk_allinstruments-audiokit/CMakeLists.txt
@@ -27,7 +27,7 @@ add_executable (arduino_sketch ${SKETCH})
 
 # set preprocessor defines
 target_compile_definitions(arduino_emulator PUBLIC -DDEFINE_MAIN)
-target_compile_definitions(arduino_sketch PUBLIC -DARDUINO -DIS_DESKTOP -DEXIT_ON_STOP)
+target_compile_definitions(arduino_sketch PUBLIC -DARDUINO -DIS_DESKTOP)
 target_compile_definitions(arduino-stk PUBLIC -DIS_DESKTOP)
 
 # OS/X might need this setting for core audio

diff --git a/src/AudioConfig.h b/src/AudioConfig.h
@@ -5,22 +5,41 @@
  * 
  */
 #pragma once
+
+#define AUDIOTOOLS_VERSION "1.0.0"
+#define AUDIOTOOLS_MAJOR_VERSION 1
+#define AUDIOTOOLS_MIOR_VERSION 0
+
+
 #if defined(IS_MIN_DESKTOP) 
+# include "AudioTools/AudioLibs/Desktop/NoArduino.h"
+# include "AudioTools/AudioLibs/Desktop/Time.h"
+# include "AudioTools/AudioLibs/Desktop/Main.h"
+# include "AudioTools/AudioLibs/Desktop/File.h"
+# define USE_STREAM_READ_OVERRIDE
 # ifndef EXIT_ON_STOP
 # define EXIT_ON_STOP
 # endif
-# include "AudioTools/AudioLibs/Desktop/NoArduino.h"
 #elif defined(IS_DESKTOP_WITH_TIME_ONLY)
+# include "AudioTools/AudioLibs/Desktop/Time.h"
+# include "AudioTools/AudioLibs/Desktop/NoArduino.h"
 # ifndef EXIT_ON_STOP
 # define EXIT_ON_STOP
 # endif
-# include "AudioTools/AudioLibs/Desktop/Time.h"
-# include "AudioTools/AudioLibs/Desktop/NoArduino.h"
 #elif defined(IS_DESKTOP)
+# include "Arduino.h"
+# include <Client.h>
+# include <WiFi.h>
+# define USE_WIFI
+# define USE_URL_ARDUINO
+# define USE_STREAM_WRITE_OVERRIDE
+# define USE_STREAM_READ_OVERRIDE
+# define USE_STREAM_READCHAR_OVERRIDE
 # ifndef EXIT_ON_STOP
 # define EXIT_ON_STOP
 # endif
-# include "Arduino.h"
+//# define USE_3BYTE_INT24
+typedef WiFiClient WiFiClientSecure;
 #elif defined(ARDUINO)
 # include "Arduino.h"
 // --- ESP32 ------------
@@ -32,21 +51,21 @@
 #else 
 # include "AudioTools/AudioLibs/Desktop/NoArduino.h"
 # define IS_JUPYTER
+# define USE_STREAM_READ_OVERRIDE
 #endif
+
 #include <string.h>
 #include <stdint.h>
 #include <assert.h>
 #include "AudioTools/CoreAudio/AudioRuntime.h"
 
+
+
 // If you don't want to use all the settings from here you can define your own local config settings in AudioConfigLocal.h
 #if __has_include("AudioConfigLocal.h") 
 #include "AudioConfigLocal.h"
 #endif
 
-#define AUDIOTOOLS_VERSION "1.0.0"
-#define AUDIOTOOLS_MAJOR_VERSION 1
-#define AUDIOTOOLS_MIOR_VERSION 0
-
 // Automatically include all core audio functionality
 #ifndef AUDIO_INCLUDE_CORE
 # define AUDIO_INCLUDE_CORE true
@@ -82,18 +101,20 @@
 # define LOG_STREAM Serial
 #endif
 
-#define LOG_PRINTF_BUFFER_SIZE 303
-#define LOG_METHOD __PRETTY_FUNCTION__
+#ifndef LOG_PRINTF_BUFFER_SIZE
+# define LOG_PRINTF_BUFFER_SIZE 303
+#endif 
 
-// cheange USE_CHECK_MEMORY to true to activate memory checks
-#define USE_CHECK_MEMORY false
+#ifndef LOG_METHOD
+# define LOG_METHOD __PRETTY_FUNCTION__
+#endif
 
-#if USE_CHECK_MEMORY
-# define CHECK_MEMORY() checkMemory(true)
-#else
-# define CHECK_MEMORY() 
+// cheange USE_CHECK_MEMORY to true to activate memory checks
+#ifndef USE_CHECK_MEMORY
+# define USE_CHECK_MEMORY false
 #endif
 
+
 // Activate/deactivate obsolete functionality
 #ifndef USE_OBSOLETE
 # define USE_OBSOLETE false
@@ -732,44 +753,13 @@ using WiFiServerSecure = BearSSL::WiFiServerSecure;
 #define VS1053_DEFAULT_VOLUME 0.7
 
 
-
 //----------------
-
-// Full Arduino functionality using emulator
-#ifdef IS_DESKTOP
-# include <Client.h>
-# include <WiFi.h>
-# define USE_WIFI
-# define USE_URL_ARDUINO
-# define USE_STREAM_WRITE_OVERRIDE
-# define USE_STREAM_READ_OVERRIDE
-# define USE_STREAM_READCHAR_OVERRIDE
-//# define USE_3BYTE_INT24
-typedef WiFiClient WiFiClientSecure;
-#endif
-
-// Minimum desktop functionality w/o Arduino emulator
-#ifdef IS_MIN_DESKTOP
-# include "AudioTools/AudioLibs/Desktop/NoArduino.h"
-# include "AudioTools/AudioLibs/Desktop/Time.h"
-# include "AudioTools/AudioLibs/Desktop/Main.h"
-# include "AudioTools/AudioLibs/Desktop/File.h"
-# define USE_STREAM_READ_OVERRIDE
-#endif
+// Fallback defined if nothing was defined in the platform
 
 #ifndef ARDUINO
 # define USE_STREAM_WRITE_OVERRIDE
 #endif
 
-#ifdef IS_JUPYTER
-# define USE_STREAM_READ_OVERRIDE
-#endif
-
-#ifdef AUDIOKIT_USE_IDF
-# define USE_INT24_FROM_INT
-#endif
-
-
 #ifndef ANALOG_MAX_SAMPLE_RATE
 # define ANALOG_MAX_SAMPLE_RATE 44100
 #endif
@@ -791,16 +781,6 @@ typedef WiFiClient WiFiClientSecure;
 # define USE_ALLOCATOR false
 #endif
 
-// select int24 implementation
-#include "AudioTools/CoreAudio/AudioBasic/Int24_3bytes_t.h"
-#include "AudioTools/CoreAudio/AudioBasic/Int24_4bytes_t.h"
-namespace audio_tools {
-#ifdef USE_3BYTE_INT24
-using int24_t = audio_tools::int24_3bytes_t;
-#else
-using int24_t = audio_tools::int24_4bytes_t;
-#endif
-}
 
 // Standard Arduino Print provides flush function
 #ifndef USE_PRINT_FLUSH
@@ -811,6 +791,12 @@ using int24_t = audio_tools::int24_4bytes_t;
 # define ESP_IDF_VERSION_VAL(a, b , c) 0
 #endif
 
+#if USE_CHECK_MEMORY
+# define CHECK_MEMORY() checkMemory(true)
+#else
+# define CHECK_MEMORY() 
+#endif
+
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wvla"
@@ -820,8 +806,20 @@ using int24_t = audio_tools::int24_4bytes_t;
 #ifdef USE_NO_MEMACCESS
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #endif
+
 #ifdef USE_INITIALIZER_LIST
 #pragma GCC diagnostic ignored "-Wnarrowing"
 #endif
 
 #undef rewind
+
+// select int24 implementation
+#include "AudioTools/CoreAudio/AudioBasic/Int24_3bytes_t.h"
+#include "AudioTools/CoreAudio/AudioBasic/Int24_4bytes_t.h"
+namespace audio_tools {
+ #ifdef USE_3BYTE_INT24
+ using int24_t = audio_tools::int24_3bytes_t;
+ #else
+ using int24_t = audio_tools::int24_4bytes_t;
+ #endif
+}
diff --git a/tests-cmake/codec/aac-faad/CMakeLists.txt b/tests-cmake/codec/aac-faad/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 add_executable (aac-faad aac-faad.cpp)
 
 # set preprocessor defines
-target_compile_definitions(aac-faad PUBLIC -DARDUINO -DEXIT_ON_STOP -DUSE_PORTAUDIO -DIS_DESKTOP -DANALYSIS)
+target_compile_definitions(aac-faad PUBLIC -DARDUINO -DUSE_PORTAUDIO -DIS_DESKTOP -DANALYSIS)
 
 # OS/X might need this setting for core audio
 #target_compile_definitions(portaudio PUBLIC -DPA_USE_COREAUDIO=1)

diff --git a/tests-cmake/codec/aac-fdk-encode/CMakeLists.txt b/tests-cmake/codec/aac-fdk-encode/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 # build sketch as executable
 add_executable (aac-fdk-encode aac-fdk-encode.cpp )
 # set preprocessor defines
-target_compile_definitions(aac-fdk-encode PUBLIC -DARDUINO -DEXIT_ON_STOP -DIS_DESKTOP)
+target_compile_definitions(aac-fdk-encode PUBLIC -DARDUINO -DIS_DESKTOP)
 
 # specify libraries
 target_link_libraries(aac-fdk-encode arduino_emulator fdk_aac arduino-audio-tools)

diff --git a/tests-cmake/codec/aac-fdk/CMakeLists.txt b/tests-cmake/codec/aac-fdk/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 add_executable (aac-fdk aac-fdk.cpp )
 
 # set preprocessor defines
-target_compile_definitions(aac-fdk PUBLIC -DARDUINO -DEXIT_ON_STOP -DUSE_PORTAUDIO -DIS_DESKTOP)
+target_compile_definitions(aac-fdk PUBLIC -DARDUINO -DUSE_PORTAUDIO -DIS_DESKTOP)
 
 # OS/X might need this setting for core audio
 #target_compile_definitions(portaudio PUBLIC -DPA_USE_COREAUDIO=1)

diff --git a/tests-cmake/codec/aac-helix/CMakeLists.txt b/tests-cmake/codec/aac-helix/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 add_executable (aac-helix aac-helix.cpp)
 
 # set preprocessor defines
-target_compile_definitions(aac-helix PUBLIC -DARDUINO -DEXIT_ON_STOP -DUSE_PORTAUDIO -DIS_DESKTOP)
+target_compile_definitions(aac-helix PUBLIC -DARDUINO -DUSE_PORTAUDIO -DIS_DESKTOP)
 
 # OS/X might need this setting for core audio
 #target_compile_definitions(portaudio PUBLIC -DPA_USE_COREAUDIO=1)

diff --git a/tests-cmake/codec/adpcm/CMakeLists.txt b/tests-cmake/codec/adpcm/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 add_executable (adpcm-test adpcm.cpp)
 
 # set preprocessor defines
-target_compile_definitions(adpcm-test PUBLIC -DARDUINO -DEXIT_ON_STOP -DUSE_PORTAUDIO -DIS_DESKTOP)
+target_compile_definitions(adpcm-test PUBLIC -DARDUINO -DUSE_PORTAUDIO -DIS_DESKTOP)
 
 # specify libraries
 target_link_libraries(adpcm-test portaudio arduino_emulator adpcm_ffmpeg arduino-audio-tools)

diff --git a/tests-cmake/codec/container-avi-movie/CMakeLists.txt b/tests-cmake/codec/container-avi-movie/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories( ${OpenCV_INCLUDE_DIRS} )
 add_executable (container-avi-movie container-avi-movie.cpp)
 
 # set preprocessor defines
-target_compile_definitions(container-avi-movie PUBLIC -DEXIT_ON_STOP -DUSE_PORTAUDIO -DIS_MIN_DESKTOP)
+target_compile_definitions(container-avi-movie PUBLIC -DUSE_PORTAUDIO -DIS_MIN_DESKTOP)
 target_include_directories(container-avi-movie PRIVATE "${arduino_emulator_SOURCE_DIR}/ArduinoCore-Linux/libraries/SdFat" )
 
 # OS/X might need this setting for core audio

diff --git a/tests-cmake/codec/container-avi/CMakeLists.txt b/tests-cmake/codec/container-avi/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 add_executable (container-avi container-avi.cpp)
 
 # set preprocessor defines
-target_compile_definitions(container-avi PUBLIC -DEXIT_ON_STOP -DUSE_PORTAUDIO -DIS_MIN_DESKTOP -DHELIX_PRINT)
+target_compile_definitions(container-avi PUBLIC -DUSE_PORTAUDIO -DIS_MIN_DESKTOP -DHELIX_PRINT)
 target_include_directories(container-avi PRIVATE "${arduino_emulator_SOURCE_DIR}/ArduinoCore-Linux/libraries/SdFat" )
 
 # specify libraries

diff --git a/tests-cmake/codec/container-binary/CMakeLists.txt b/tests-cmake/codec/container-binary/CMakeLists.txt
@@ -20,7 +20,7 @@ endif()
 add_executable (container-binary container-binary.cpp)
 
 # set preprocessor defines
-target_compile_definitions(container-binary PUBLIC -DEXIT_ON_STOP -DIS_MIN_DESKTOP)
+target_compile_definitions(container-binary PUBLIC -DIS_MIN_DESKTOP)
 
 # OS/X might need this setting for core audio
 #target_compile_definitions(portaudio PUBLIC -DPA_USE_COREAUDIO=1)

diff --git a/tests-cmake/codec/container-m4a/CMakeLists.txt b/tests-cmake/codec/container-m4a/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 add_executable (container-m4a container-m4a.cpp)
 
 # set preprocessor defines
-target_compile_definitions(container-m4a PUBLIC -DEXIT_ON_STOP -DIS_MIN_DESKTOP -DHELIX_PRINT)
+target_compile_definitions(container-m4a PUBLIC -DIS_MIN_DESKTOP -DHELIX_PRINT)
 
 # OS/X might need this setting for core audio
 #target_compile_definitions(portaudio PUBLIC -DPA_USE_COREAUDIO=1)

diff --git a/tests-cmake/codec/hls-cat/CMakeLists.txt b/tests-cmake/codec/hls-cat/CMakeLists.txt
@@ -39,7 +39,7 @@ set_source_files_properties(hls-cat.ino PROPERTIES LANGUAGE CXX)
 add_executable (hls-cat hls-cat.cpp)
 
 # set preprocessor defines
-target_compile_definitions(hls-cat PUBLIC -DARDUINO -DIS_DESKTOP -DEXIT_ON_STOP -DHELIX_PRINT)
+target_compile_definitions(hls-cat PUBLIC -DARDUINO -DIS_DESKTOP -DHELIX_PRINT)
 
 # specify libraries
 target_link_libraries(hls-cat arduino-audio-tools arduino_emulator tsdemux arduino_helix portaudio)

diff --git a/tests-cmake/codec/hls/CMakeLists.txt b/tests-cmake/codec/hls/CMakeLists.txt
@@ -42,7 +42,7 @@ set_source_files_properties(hls.ino PROPERTIES LANGUAGE CXX)
 add_executable (hls hls.cpp )
 
 # set preprocessor defines
-target_compile_definitions(hls PUBLIC -DARDUINO -DIS_DESKTOP -DEXIT_ON_STOP -DHELIX_PRINT)
+target_compile_definitions(hls PUBLIC -DARDUINO -DIS_DESKTOP -DHELIX_PRINT)
 
 # access to miniaudio in sketch directory
 target_include_directories(hls PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/tests-cmake/codec/hls1/CMakeLists.txt b/tests-cmake/codec/hls1/CMakeLists.txt
@@ -42,7 +42,7 @@ set_source_files_properties(hls.ino PROPERTIES LANGUAGE CXX)
 add_executable (hls hls.cpp)
 
 # set preprocessor defines
-target_compile_definitions(hls PUBLIC -DARDUINO -DIS_DESKTOP -DEXIT_ON_STOP -DHELIX_PRINT)
+target_compile_definitions(hls PUBLIC -DARDUINO -DIS_DESKTOP -DHELIX_PRINT)
 
 # access to miniaudio in sketch directory
 target_include_directories(hls PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/tests-cmake/codec/mp3-helix/CMakeLists.txt b/tests-cmake/codec/mp3-helix/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 # build sketch as executable
 add_executable (mp3-helix mp3-helix.cpp)
 # set preprocessor defines
-target_compile_definitions(mp3-helix PUBLIC -DARDUINO -DEXIT_ON_STOP -DUSE_PORTAUDIO -DIS_DESKTOP)
+target_compile_definitions(mp3-helix PUBLIC -DARDUINO -DUSE_PORTAUDIO -DIS_DESKTOP)
 
 # OS/X might need this setting for core audio
 #target_compile_definitions(portaudio PUBLIC -DPA_USE_COREAUDIO=1)

diff --git a/tests-cmake/codec/mp3-lame/CMakeLists.txt b/tests-cmake/codec/mp3-lame/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 # build sketch as executable
 add_executable (mp3-lame mp3-lame.cpp)
 # set preprocessor defines
-target_compile_definitions(mp3-lame PUBLIC -DARDUINO -DEXIT_ON_STOP -DUSE_PORTAUDIO -DIS_DESKTOP)
+target_compile_definitions(mp3-lame PUBLIC -DARDUINO -DUSE_PORTAUDIO -DIS_DESKTOP)
 
 # specify libraries
 target_link_libraries(mp3-lame portaudio arduino_emulator arduino_liblame arduino-audio-tools)

diff --git a/tests-cmake/codec/mp3-mad/CMakeLists.txt b/tests-cmake/codec/mp3-mad/CMakeLists.txt
@@ -24,7 +24,7 @@ endif()
 # build sketch as executabl
 add_executable (mp3-mad mp3-mad.cpp)
 # set preprocessor defines
-target_compile_definitions(mp3-mad PUBLIC -DARDUINO -DEXIT_ON_STOP -DUSE_PORTAUDIO -DIS_DESKTOP )
+target_compile_definitions(mp3-mad PUBLIC -DARDUINO -DUSE_PORTAUDIO -DIS_DESKTOP )
 
 # specify libraries
 target_link_libraries(mp3-mad portaudio arduino_emulator arduino_libmad arduino-audio-tools )

diff --git a/tests-cmake/codec/mp3-metadata/CMakeLists.txt b/tests-cmake/codec/mp3-metadata/CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
 add_executable (mp3-metadata mp3-metadata.cpp)
 
 # set preprocessor defines
-target_compile_definitions(mp3-metadata PUBLIC -DEXIT_ON_STOP -DIS_DESKTOP)
+target_compile_definitions(mp3-metadata PUBLIC -DIS_DESKTOP)
 
 # specify libraries
 target_link_libraries(mp3-metadata portaudio arduino_emulator arduino-audio-tools)

diff --git a/tests-cmake/codec/mp3-mini/CMakeLists.txt b/tests-cmake/codec/mp3-mini/CMakeLists.txt
@@ -28,7 +28,7 @@ add_executable (mp3_mini mp3-mini.ino)
 # set preprocessor defines
 target_compile_definitions(arduino_emulator PUBLIC -DDEFINE_MAIN)
 target_compile_definitions(arduino_minimp3 INTERFACE -DARDUINO -DMINIMP3_NO_SIMD)
-target_compile_definitions(mp3_mini PUBLIC -DARDUINO -DIS_DESKTOP -DEXIT_ON_STOP)
+target_compile_definitions(mp3_mini PUBLIC -DARDUINO -DIS_DESKTOP)
 
 # set compile optioins
 target_compile_options(portaudio PRIVATE -Wno-deprecated -Wno-inconsistent-missing-override)