diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 901637a..1ab2c19 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: Set up dependencies run: | sudo apt-get update -qq - sudo apt-get install -yqq --allow-downgrades gperf libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libpcre3-dev libqt5svg5-dev libxcb1-dev libxcursor-dev libxext-dev libxfixes-dev libxrandr-dev libxrender-dev meson uuid-dev + sudo apt-get install -yqq --allow-downgrades gperf libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libpcre3-dev libqt5svg5-dev libxcb1-dev libxcursor-dev libxext-dev libxfixes-dev libxrandr-dev libxrender-dev meson qtbase5-dev qtbase5-dev-tools uuid-dev - name: Build dependencies run: | ./PawPaw/bootstrap-mod.sh linux-x86_64 && ./PawPaw/.cleanup.sh linux-x86_64 diff --git a/Makefile b/Makefile index 5e4c02b..66be954 100644 --- a/Makefile +++ b/Makefile @@ -291,9 +291,10 @@ build/mod-app.app/Contents/MacOS/jack/mod-midi-merger.so: mod-midi-merger/build/ @mkdir -p build/mod-app.app/Contents/MacOS/jack ln -sf $(abspath $<) $@ -build/mod-app.app/Contents/MacOS/lib: build-ui/lib +build/mod-app.app/Contents/MacOS/lib: build-ui/mod-ui$(APP_EXT) @mkdir -p build/mod-app.app/Contents/MacOS - ln -sf $(abspath $<) $@ + rm -f $@ + ln -sf $(abspath build-ui/lib) $@ build/mod-app.app/Contents/MacOS/libjack%: $(PAWPAW_PREFIX)/lib/libjack% @mkdir -p build/mod-app.app/Contents/MacOS @@ -307,7 +308,7 @@ build/mod-app.app/Contents/MacOS/mod-screenshot: build-screenshot/mod-screenshot @mkdir -p build/mod-app.app/Contents/MacOS ln -sf $(abspath $<) $@ -build/mod-app.app/Contents/MacOS/mod-ui: build-ui/mod-ui +build/mod-app.app/Contents/MacOS/mod-ui: build-ui/mod-ui$(APP_EXT) @mkdir -p build/mod-app.app/Contents/MacOS ln -sf $(abspath $<) $@ @@ -386,8 +387,9 @@ build/jack/mod-midi-merger$(SO_EXT): mod-midi-merger/build/mod-midi-merger$(SO_E @mkdir -p build/jack ln -sf $(abspath $<) $@ -build/lib: build-ui/lib - ln -sf $(abspath $<) $@ +build/lib: build-ui/mod-ui$(APP_EXT) + rm -f $@ + ln -sf $(abspath build-ui/lib) $@ build/mod-app$(APP_EXT): systray/mod-app$(APP_EXT) @mkdir -p build @@ -455,9 +457,6 @@ build-screenshot/mod-screenshot$(APP_EXT): utils/mod-screenshot.py $(BOOTSTRAP_F # --------------------------------------------------------------------------------------------------------------------- -build-ui/lib: build-ui/mod-ui$(APP_EXT) - touch $@ - build-ui/mod-ui$(APP_EXT): utils/mod-ui.py utils/mod-ui-wrapper.py $(BOOTSTRAP_FILES) # rm -f build/libpython3.8.dll ./utils/run.sh $(PAWPAW_TARGET) python3 utils/mod-ui.py build_exe