Skip to content

Commit

Permalink
Merge pull request #132 from tote-bag-labs/remove-linux-workaround
Browse files Browse the repository at this point in the history
Remove c++20 linux hack for github actions
  • Loading branch information
JoseDiazRohena committed Aug 25, 2024
2 parents ad07f82 + 3b8ee6e commit 54679f7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/cmake_ctest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ jobs:
# 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
# downgrade gcc to workaround 22.04 and C++20 issue
# see: https://github.com/actions/runner-images/issues/8659
sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
sudo apt-get update
sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.7 libc6-dev=2.35-0ubuntu3.7 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
sudo /usr/bin/Xvfb $DISPLAY &
# This lets us use sscache on Windows
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@
[submodule "ff_meters"]
path = libs/ff_meters
url = https://github.com/ffAudio/ff_meters.git
[submodule "libs/clap-juce-extensions"]
path = libs/clap-juce-extensions
url = https://github.com/free-audio/clap-juce-extensions.git
branch = main
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ option(JUCE_ENABLE_MODULE_SOURCE_GROUPS "Show all module sources in IDE projects
# and `git submodule update --remote --merge` to keep it up to date
# On Github Actions, it's managed by actions/checkout
add_subdirectory(libs/JUCE)
add_subdirectory(libs/clap-juce-extensions EXCLUDE_FROM_ALL)

# Also using Foley's Finest meters
juce_add_module(libs/ff_meters)
Expand All @@ -78,6 +79,10 @@ juce_add_plugin("${PROJECT_NAME}"
FORMATS "${FORMATS}"
PRODUCT_NAME "${PROJECT_NAME}") # The name of the final executable, which can differ from the target name

clap_juce_extensions_plugin(TARGET "${PROJECT_NAME}"
CLAP_ID "com.ToteBagLabs.Valentine"
CLAP_FEATURES "audio-effect")

# C++20 please
target_compile_features("${PROJECT_NAME}" PRIVATE cxx_std_20)

Expand Down

0 comments on commit 54679f7

Please sign in to comment.