From 3b8dfbf51dec722772d5731bfa01bb1b697e2886 Mon Sep 17 00:00:00 2001
From: asb2m10 <asb2m10@gmail.com>
Date: Tue, 9 Apr 2024 00:33:07 -0400
Subject: [PATCH] Push dexed version

---
 .github/workflows/project-pipeline.yml | 4 +---
 README.md                              | 5 +++++
 Resources/Installers/Windows/dexed.iss | 6 ++++--
 Source/Dexed.h                         | 9 ++++-----
 Source/GlobalEditor.cpp                | 2 +-
 libs/JUCE                              | 2 +-
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/project-pipeline.yml b/.github/workflows/project-pipeline.yml
index 0ad5871f..3b2c433d 100644
--- a/.github/workflows/project-pipeline.yml
+++ b/.github/workflows/project-pipeline.yml
@@ -110,15 +110,13 @@ jobs:
         else
             echo "BUILD_TYPE=Debug" >> "$GITHUB_ENV"
             echo "BUILD_VERSION=$GITHUB_REF_NAME" >> "$GITHUB_ENV"
-            echo "CMAKE_CXX_FLAGS='-D DEXED_ID=\"$BUILD_VERSION\"'" >> "$GITHUB_ENV"
-
         fi
         echo "BUILD PARM =========="
         cat $GITHUB_ENV
 
     - name: Build
       run: |
-          cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
+          cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_CXX_FLAGS=-DDEXED_ID=${{ env.BUILD_VERSION }}"
           cmake --build ${{github.workspace}}/build --config ${{ env.BUILD_TYPE }}
 
     - name: Show
diff --git a/README.md b/README.md
index 4c8b5489..46616259 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,11 @@ the original machine.
 Dexed is licensed on the GPL v3. The msfa component (acronym for music synthesizer for android, see msfa 
 in the source folder) stays on the Apache 2.0 license to able to collaborate between projects.
 
+Dexed Forks
+-----------
+ * [MiniDexed](https://github.com/probonopd/MiniDexed) Run a DX7 bare metal Raspberry Pi
+ * [SIMD-optimized](https://github.com/risicle/dexed/tree/ris-highway) SIMD optimized version with [highway](https://github.com/google/highway/tree/master)
+
 Changelog
 ---------
 #### Version 0.9.7 (IN DEVELOPMENT)
diff --git a/Resources/Installers/Windows/dexed.iss b/Resources/Installers/Windows/dexed.iss
index 9fd24c62..f623b755 100644
--- a/Resources/Installers/Windows/dexed.iss
+++ b/Resources/Installers/Windows/dexed.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=Dexed
-AppVersion=0.9.6
+AppVersion=0.9.7
 DefaultDirName={commonpf64}\Dexed
 DefaultGroupName=Dexed
 Compression=lzma2
@@ -18,11 +18,13 @@ Name: "custom"; Description: "Custom installation"; Flags: iscustom
 
 [Components]
 Name: "app"; Description: "Standalone application (.exe)"; Types: full custom;
-Name: "vst3_64"; Description: "64-bit VST3 Plugin (.dll)"; Types: full custom;
+Name: "vst3_64"; Description: "64-bit VST3 Plugin"; Types: full custom;
+Name: "clap"; Description: "64-bit CLAP Plugin"; Types: full custom;
 
 [Files]
 Source: "Dexed.exe"; DestDir: "{app}"; Components:app; Flags: ignoreversion recursesubdirs createallsubdirs 
 Source: "Dexed.vst3"; DestDir: "{commoncf64}\VST3"; Components:vst3_64; Flags: ignoreversion 
+Source: "Dexed.clap"; DestDir: "{commoncf64}\CLAP"; Components:clap; Flags: ignoreversion 
                    
 [Icons]
 Name: "{group}\Dexed"; Filename: "{app}\Dexed.exe"
diff --git a/Source/Dexed.h b/Source/Dexed.h
index 52536a3a..dec60148 100644
--- a/Source/Dexed.h
+++ b/Source/Dexed.h
@@ -23,19 +23,18 @@
 
 void dexed_trace(const char *source, const char *fmt, ...);
 
-#ifndef DEXED_ID
-    #define DEXED_ID "DEVBUILD"
-#endif
+#define __QUOTE(name) #name
+#define __STR(macro) __QUOTE(macro)
 
 #ifdef DEBUG
-    #define DEXED_VERSION DEXED_ID " DEBUG"
+    #define DEXED_VERSION __STR(DEXED_ID) " DEBUG"
     #ifdef _MSC_VER
         #define TRACE(fmt, ...) dexed_trace(__FUNCTION__,fmt,##__VA_ARGS__)
     #else
         #define TRACE(fmt, ...) dexed_trace(__PRETTY_FUNCTION__,fmt,##__VA_ARGS__)
     #endif
 #else
-    #define DEXED_VERSION DEXED_ID
+    #define DEXED_VERSION __STR(DEXED_ID)
     #define TRACE(fmt, ...)
 #endif
 
diff --git a/Source/GlobalEditor.cpp b/Source/GlobalEditor.cpp
index 38bc0a4e..e97e5a23 100644
--- a/Source/GlobalEditor.cpp
+++ b/Source/GlobalEditor.cpp
@@ -96,7 +96,7 @@ class AboutBox : public DialogWindow {
         g.setFont(20);
         g.setColour(Colour(0xFFFFFFFF));
         const char *credits = "Version " DEXED_VERSION " build date: " __DATE__ "\n"
-                            "This software is released under the GPL V3.\n\n"
+                            "This software is released under the GPL V3\n\n"
                             "DSP Engine: orignal project (msfa) Raph Levin, enhancements Pascal Gauthier\n"
                             "UI Programming: Pascal Gauthier\n"
                             "UI Design: AZur Studio\n\n"
diff --git a/libs/JUCE b/libs/JUCE
index ae514483..22df0d22 160000
--- a/libs/JUCE
+++ b/libs/JUCE
@@ -1 +1 @@
-Subproject commit ae5144833e852815d61642af87c69b9db44984f7
+Subproject commit 22df0d2266007bccb25d6ed52b9907f60d04e971