Arashpartow/update exprtk 0.0.3 (BespokeSynth#1723)

* Revert "Update the Mathematical Expression Toolkit Library or "exprtk" to the latest version. Resolves: BespokeSynth#1687. (BespokeSynth#1688)" This reverts commit 91cc859. * Update ExprTk to 0.0.3 Signed-off-by: Arash Partow <[email protected]> --------- Signed-off-by: Arash Partow <[email protected]> ***NO_CI***
PowerUser64 · Dec 17, 2024 · 6cfc2fb · 6cfc2fb
1 parent db680c7
commit 6cfc2fb
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 46,074 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -19,3 +19,7 @@
 [submodule "libs/readerwriterqueue"]
 	path = libs/readerwriterqueue
 	url = https://github.com/cameron314/readerwriterqueue.git
+[submodule "libs/exprtk"]
+	path = libs/exprtk
+	url = https://github.com/ArashPartow/exprtk.git
+	branch = cmake
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -876,7 +876,7 @@ else ()
 endif ()
 
 target_link_libraries(BespokeSynth PRIVATE
-    bespoke::exprtk
+    exprtk::exprtk
     bespoke::freeverb
     $<IF:$<STREQUAL:${BESPOKE_SYSTEM_JSONCPP},OFF>,bespoke::json,jsoncpp>
     bespoke::leathers

diff --git a/Source/ModulatorExpression.h b/Source/ModulatorExpression.h
@@ -32,7 +32,7 @@
 #include "Slider.h"
 #include "ClickButton.h"
 #include "TextEntry.h"
-#include "exprtk/exprtk.hpp"
+#include "exprtk.hpp"
 
 class ModulatorExpression : public IDrawableModule, public IFloatSliderListener, public ITextEntryListener, public IModulator
 {

diff --git a/Source/NoteExpressionRouter.h b/Source/NoteExpressionRouter.h
@@ -32,7 +32,7 @@
 #include "IDrawableModule.h"
 #include "INoteSource.h"
 #include "TextEntry.h"
-#include "exprtk/exprtk.hpp"
+#include "exprtk.hpp"
 
 class NoteExpressionRouter : public INoteReceiver, public INoteSource, public IDrawableModule, public ITextEntryListener
 {

diff --git a/Source/SynthGlobals.cpp b/Source/SynthGlobals.cpp
@@ -36,7 +36,7 @@
 #include "PatchCableSource.h"
 #include "ChannelBuffer.h"
 #include "IPulseReceiver.h"
-#include "exprtk/exprtk.hpp"
+#include "exprtk.hpp"
 #include "UserPrefs.h"
 
 #include "juce_audio_formats/juce_audio_formats.h"

diff --git a/Source/Waveshaper.h b/Source/Waveshaper.h
@@ -32,7 +32,7 @@
 #include "Slider.h"
 #include "ClickButton.h"
 #include "TextEntry.h"
-#include "exprtk/exprtk.hpp"
+#include "exprtk.hpp"
 
 class Waveshaper : public IAudioProcessor, public IDrawableModule, public IFloatSliderListener, public ITextEntryListener
 {

diff --git a/libs/exprtk b/libs/exprtk
diff --git a/libs/exprtk/CMakeLists.txt b/libs/exprtk/CMakeLists.txt