Skip to content

Commit

Permalink
undo possible mistakes from previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
DBraun committed Sep 17, 2023
1 parent 11843ce commit 7c67b1a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion DawDreamer.jucer
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@
<CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="dawdreamer"
libraryPath="/usr/local/lib&#10;../../thirdparty/libfaust/ubuntu-x86_64/Debug/lib&#10;../../thirdparty/libsamplerate/build_release/src"/>
<CONFIGURATION name="Release" isDebug="0" targetName="dawdreamer" libraryPath="/usr/local/lib&#10;../../thirdparty/libfaust/ubuntu-x86_64/Release/lib&#10;../../thirdparty/libsamplerate/build_release/src"/>
<CONFIGURATION name="Release" isDebug="0" targetName="dawdreamer" libraryPath="/usr/local/lib&#10;../../thirdparty/libfaust/ubuntu-x86_64/Release/lib&#10;../../thirdparty/libsamplerate/build_release/src"
optimisation="3"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_core" path="JuceLibraryCode/modules"/>
Expand Down
2 changes: 1 addition & 1 deletion build_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cd Builds/LinuxMakefile
ldconfig

# faust/architecture/faust/midi/RtMidi.cpp has #include <alsa/asoundlib.h>
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 ../..

Expand Down
Empty file added dawdreamer/null.c
Empty file.

0 comments on commit 7c67b1a

Please sign in to comment.