Turn on ALSA in the clap-first standalone (#1133)

and make alsa and jack both obey the SCXT_USE_XXXX flags Closes #1128
surge-synthesizer · Aug 17, 2024 · bcdf2dd · bcdf2dd
1 parent d96d315
commit bcdf2dd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -19,30 +19,24 @@ jobs:
             cmakeConfig: -A x64
             runTests: false
 
-          - name: "windows clang"
+          - name: "windows clang VST3"
             os: windows-latest
-            target: scxt_clapfirst_Standalone
+            target: scxt_clapfirst_VST3
             cmakeConfig: -GNinja -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
             runTests: false
 
-          - name: "mac standalone"
+          - name: "mac AU"
             os: macos-latest
             target: scxt_clapfirst_AU
             cmakeConfig: -GNinja
             runTests: true
 
-          - name: "ubuntu standalone"
+          - name: "ubuntu Standalone"
             os: ubuntu-latest
-            target: scxt_clapfirst_VST3
+            target: scxt_clapfirst_Standalone
             cmakeConfig: -GNinja
             runTests: true
 
-          - name: "ubuntu juce style"
-            os: ubuntu-latest
-            target: scxt_plugin_Standalone
-            cmakeConfig: -GNinja -DSCXT_JUCE_CLASSIC_STYLE=TRUE
-            runTests: false
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -57,7 +51,7 @@ jobs:
       - name: Build pull request version
         run: |
           cmake -S . -B ./build ${{ matrix.cmakeConfig }} -DCMAKE_BUILD_TYPE=Debug 
-          cmake --build ./build --config Debug --target ${{ matrix.target }} --parallel 3
+          cmake --build ./build --config Debug --target ${{ matrix.target }} --parallel 4
 
       - name: Run Tests
         if: ${{ matrix.runTests }}

diff --git a/clients/clap-first/CMakeLists.txt b/clients/clap-first/CMakeLists.txt
@@ -76,7 +76,10 @@ set_target_properties(${SA_TARGET} PROPERTIES
             OUTPUT_NAME ${name})
 target_sources(${SA_TARGET} PRIVATE scxt-juce-standalone/scxt-juce-standalone.cpp)
 target_link_libraries(${SA_TARGET} PRIVATE ${IMPL_TARGET} juce::juce_audio_devices juce::juce_audio_utils)
-target_compile_definitions(${SA_TARGET} PRIVATE JUCE_USE_FLAC=0)
+target_compile_definitions(${SA_TARGET} PRIVATE
+        JUCE_ALSA=$<IF:$<BOOL:${SCXT_USE_ALSA}>,1,0>
+        JUCE_JACK=$<IF:$<BOOL:${SCXT_USE_JACK}>,1,0>
+        JUCE_USE_FLAC=0)
 
 #add_executable(${SA_TARGET} scxt-clap-entry.cpp)
 #target_link_libraries(${SA_TARGET} PRIVATE ${IMPL_TARGET})