Merge pull request #23 from Tote-Bag-Labs/enable-linux-ci

Fix linux build
tote-bag-labs · Mar 26, 2023 · 4f1fc13 · 4f1fc13
2 parents 80d0c32 + a6357dd
commit 4f1fc13
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 25 deletions.
diff --git a/.github/workflows/cmake_ctest.yml b/.github/workflows/cmake_ctest.yml
@@ -29,9 +29,9 @@ jobs:
       fail-fast: false # show all errors for each platform (vs. cancel jobs on error)
       matrix:
         include:
-         # - name: Linux
-         #   os: ubuntu-22.04
-         #   pluginval-binary: ./pluginval
+          - name: Linux
+            os: ubuntu-22.04
+            #pluginval-binary: ./pluginval
           - name: macOS
             os: macos-12
             pluginval-binary: pluginval.app/Contents/MacOS/pluginval
@@ -44,12 +44,12 @@ jobs:
       if: ${{ matrix.name != 'macOS' }}
       uses: egor-tensin/setup-clang@v1.4
 
-    #- name: Install JUCE's Linux Deps
-    #if: runner.os == 'Linux'
+    - name: Install JUCE's Linux Deps
+      if: runner.os == 'Linux'
       # Thanks to McMartin & co https://forum.juce.com/t/list-of-juce-dependencies-under-linux/15121/44
-    #  run: |
-    #    sudo apt-get update && sudo apt install libasound2-dev libx11-dev libxinerama-dev libxext-dev libfreetype6-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev xvfb fluxbox ninja-build
-    #    sudo /usr/bin/Xvfb $DISPLAY &
+      run: |
+        sudo apt-get update && sudo apt install libasound2-dev libx11-dev libxinerama-dev libxext-dev libfreetype6-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev xvfb fluxbox ninja-build
+        sudo /usr/bin/Xvfb $DISPLAY &
 
     - name: Install macOS Deps
       if: ${{ matrix.name == 'macOS' }}
@@ -129,6 +129,7 @@ jobs:
 
     - name: Pluginval
       working-directory: ${{ env.BUILD_DIR }}
+      if: ${{ matrix.name != 'Linux' }}
       shell: bash
       run: |
         curl -LO "https://github.com/Tracktion/pluginval/releases/download/v1.0.1/pluginval_${{ matrix.name }}.zip"
@@ -195,7 +196,7 @@ jobs:
     #- name: Zip
     #  if: ${{ matrix.name == 'Linux' }}
     #  working-directory: ${{ env.ARTIFACTS_PATH }}
-    #  run: 7z a -tzip ${{ env.OUTPUT_FILEN }}.zip .
+    #  run: 7z a -tzip ${{ env.OUTPUT_FILENAME }}.zip .
 
     - name: Generate Installer (Windows) # and Sign with EV cert on Azure (Windows)
       if: ${{ matrix.name == 'Windows' }}
@@ -219,8 +220,8 @@ jobs:
     #  if: ${{ matrix.name == 'Linux' }}
     #  uses: actions/upload-artifact@v3
     #  with:
-    #    name: ${{ env.OUTPUT_FILEN }}.zip
-    #    path: '${{ env.ARTIFACTS_PATH }}/${{ env.OUTPUT_FILEN }}.zip'
+    #    name: ${{ env.OUTPUT_FILENAME }}.zip
+    #    path: '${{ env.ARTIFACTS_PATH }}/${{ env.OUTPUT_FILENAME }}.zip'
 
     - name: Upload DMG (MacOS)
       if: ${{ matrix.name == 'macOS' }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -105,18 +105,18 @@ set(SourceFiles
     libs/tote_bag/juce_gui/components/widgets/ParameterSlider.cpp
     libs/tote_bag/juce_gui/components/widgets/ParameterTextButton.cpp
 
-    libs/tote_bag/juce_gui/LookAndFeel/LookAndFeel.h
-    libs/tote_bag/juce_gui/LookAndFeel/LookAndFeelConstants.h
-    libs/tote_bag/juce_gui/LookAndFeel/MeterLookAndFeelMethods.h
-    libs/tote_bag/juce_gui/LookAndFeel/LookAndFeel.cpp
-
-    libs/tote_bag/juce_gui/Managers/ToteBagPresetManager.h
-    libs/tote_bag/juce_gui/Managers/RadioButtonGroupManager.h
-    libs/tote_bag/juce_gui/Managers/ToteBagPresetManager.cpp
-    libs/tote_bag/juce_gui/Managers/RadioButtonGroupManager.cpp
-
-    libs/tote_bag/juce_gui/Utilities/GraphicsUtilities.h
-    libs/tote_bag/juce_gui/Utilities/GraphicsUtilities.cpp
+    libs/tote_bag/juce_gui/lookandfeel/LookAndFeel.h
+    libs/tote_bag/juce_gui/lookandfeel/LookAndFeelConstants.h
+    libs/tote_bag/juce_gui/lookandfeel/MeterLookAndFeelMethods.h
+    libs/tote_bag/juce_gui/lookandfeel/LookAndFeel.cpp
+
+    libs/tote_bag/juce_gui/managers/ToteBagPresetManager.h
+    libs/tote_bag/juce_gui/managers/RadioButtonGroupManager.h
+    libs/tote_bag/juce_gui/managers/ToteBagPresetManager.cpp
+    libs/tote_bag/juce_gui/managers/RadioButtonGroupManager.cpp
+
+    libs/tote_bag/juce_gui/utilities/GraphicsUtilities.h
+    libs/tote_bag/juce_gui/utilities/GraphicsUtilities.cpp
 
     libs/tote_bag/utils/macros.hpp
     )

diff --git a/libs/tote_bag/dsp/DigiDegraders.cpp b/libs/tote_bag/dsp/DigiDegraders.cpp
@@ -91,7 +91,7 @@ void Bitcrusher::processBlock (juce::AudioBuffer<float>& inAudio, int samplesPer
 
 inline float Bitcrusher::getBitcrushedSample (float inputSample, int bits)
 {
-    const auto q = 1.0f / (std::powf (2.0f, bits) - 1);
+    const auto q = 1.0f / (powf (2.0f, bits) - 1);
 
-    return q * (std::floorf (inputSample / q));
+    return q * (floorf (inputSample / q));
 }