Browse Source

Cleanup, update carla, dpf and pawpaw

Signed-off-by: falkTX <falktx@falktx.com>
tags/24.04
falkTX 1 year ago
parent
commit
d7c223686d
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 4 additions and 10 deletions
  1. +1
    -7
      .github/workflows/build.yml
  2. +1
    -1
      carla
  3. +1
    -1
      deps/PawPaw
  4. +1
    -1
      dpf

+ 1
- 7
.github/workflows/build.yml View File

@@ -3,10 +3,9 @@ name: build
on: [push, pull_request]

env:
CACHE_VERSION: 4
CACHE_VERSION: 5
CARDINAL_UNDER_WINE: 1
CIBUILD: true
EMSCRIPTEN_VERSION: 3.1.27
LIBGL_ALWAYS_SOFTWARE: true
PAWPAW_SKIP_LTO: 1
PAWPAW_SKIP_GLIB: 1
@@ -335,18 +334,14 @@ jobs:
sudo apt-get update -qq
sudo apt-get install -yqq brotli gperf meson
sudo apt-get clean
[ -e ~/PawPawBuilds/emsdk ] || git clone https://github.com/emscripten-core/emsdk.git ~/PawPawBuilds/emsdk
cd ~/PawPawBuilds/emsdk && ./emsdk install ${{ env.EMSCRIPTEN_VERSION }} && ./emsdk activate ${{ env.EMSCRIPTEN_VERSION }}
- name: Build extra dependencies
run: |
${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1
source ~/PawPawBuilds/emsdk/emsdk_env.sh
./deps/PawPaw/bootstrap-cardinal.sh wasm && ./deps/PawPaw/.cleanup.sh wasm
- name: Build wasm cross-compiled
if: steps.cache.outputs.cache-hit == 'true'
run: |
${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1
source ~/PawPawBuilds/emsdk/emsdk_env.sh
source deps/PawPaw/local.env wasm
# FIXME send patch upstream, assuming this works..
sed -i -e 's/defined(__riscv)/defined(__riscv) || defined(__EMSCRIPTEN__)/' plugins/surgext/surge/src/common/globals.h
@@ -356,7 +351,6 @@ jobs:
if: steps.cache.outputs.cache-hit == 'true'
run: |
${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1
source ~/PawPawBuilds/emsdk/emsdk_env.sh
source deps/PawPaw/local.env wasm
make HAVE_LIBLO=false NOOPT=true NOSIMD=${{ matrix.target == 'nosimd' }} -j $(nproc) -C src/CardinalMiniSep modgui
- name: Make wasm versioned and compress


+ 1
- 1
carla

@@ -1 +1 @@
Subproject commit 41f07e119252b8b14627bec8345cb7304485a815
Subproject commit c2031edc1c82c3e760394b6363627caf25a7c256

+ 1
- 1
deps/PawPaw

@@ -1 +1 @@
Subproject commit 6a3c6a65a89abe221858c3f7635140074506bfc3
Subproject commit 1369e1f84e6391df761b5ac5e143ab6841e57f7e

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit df2afed246113e4459808b112583d54cf7e433e9
Subproject commit 1d5a31c1e2fec45b23e05543c646ae6092693914

Loading…
Cancel
Save