From 7c67b1a59ede1ef9deec99c7e9062b8b40684967 Mon Sep 17 00:00:00 2001 From: David Braun <2096055+DBraun@users.noreply.github.com> Date: Sun, 17 Sep 2023 17:59:07 -0400 Subject: [PATCH] undo possible mistakes from previous commit --- .github/workflows/all.yml | 2 +- DawDreamer.jucer | 3 ++- build_linux.sh | 2 +- dawdreamer/null.c | 0 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 dawdreamer/null.c diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index a3417e6a..ed534fb6 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -65,7 +65,7 @@ jobs: CIBW_TEST_REQUIRES: -r test-requirements.txt soundfile jax[cpu] flax CIBW_TEST_COMMAND: "rm -rf dawdreamer/*.so* && cd {project}/tests && python -m pytest -v ." CIBW_ARCHS: auto64 - CIBW_ARCHS_LINUX: auto64 aarch64 # On an Linux Intel runner with qemu installed, build Intel and ARM wheels + CIBW_ARCHS_LINUX: auto aarch64 # On an Linux Intel runner with qemu installed, build Intel and ARM wheels CIBW_TEST_SKIP: "*38* *39* *311*" # Only care about 310 (current Google Colab version) - uses: actions/upload-artifact@v3 diff --git a/DawDreamer.jucer b/DawDreamer.jucer index 0e21bac9..d5f7ca12 100644 --- a/DawDreamer.jucer +++ b/DawDreamer.jucer @@ -173,7 +173,8 @@ - + diff --git a/build_linux.sh b/build_linux.sh index 36c48c59..bfd66d61 100644 --- a/build_linux.sh +++ b/build_linux.sh @@ -29,7 +29,7 @@ cd Builds/LinuxMakefile ldconfig # faust/architecture/faust/midi/RtMidi.cpp has #include -make VERBOSE=1 CONFIG=Release LIBS="-lstdc++fs" LDFLAGS="-L../../alsa-lib/src -L$PYTHONLIBPATH" CXXFLAGS="-I../../alsa-lib/include -I$PYTHONINCLUDEPATH" +make VERBOSE=1 CONFIG=Release LIBS="-lstdc++fs" LDFLAGS="-L/__w/DawDreamer/DawDreamer/alsa-lib/src -L$PYTHONLIBPATH" CXXFLAGS="-I../../alsa-lib/include -I$PYTHONINCLUDEPATH" mv build/libdawdreamer.so ../../dawdreamer/dawdreamer.so cd ../.. diff --git a/dawdreamer/null.c b/dawdreamer/null.c new file mode 100644 index 00000000..e69de29b