From 30703e7b74c41fdb7a8e9789e4bbe4e545f855a0 Mon Sep 17 00:00:00 2001 From: Michel de Bree Date: Fri, 13 Mar 2026 11:56:55 +0100 Subject: [PATCH 1/2] Compiles with `make ubuntu` but doesn't work fully yet --- Dockerfile | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ea191ee6..d42999b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND=noninteractive WORKDIR /home -RUN apt-get update && apt-get -y --no-install-recommends install g++ make git libsdl2-dev +RUN apt-get update && apt-get -y --no-install-recommends install g++ make git libsdl2-dev libjack-jackd2-dev COPY . . CMD ["make","dist"] diff --git a/Makefile b/Makefile index 8fceac11..5e6ee6b8 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ CC_FLAGS=$(shell sdl2-config --cflags) -I$(SOURCE) -D_SF2_$(PLATFORM) -D_BUILD_N LINKER_FLAGS=$(shell sdl2-config --libs) -lstdc++ -flto ifeq ($(PLATFORM),LINUX) - CC_FLAGS := $(CC_FLAGS) -DUNIX_JACK + CC_FLAGS := $(CC_FLAGS) -D__UNIX_JACK__ LINKER_FLAGS := $(LINKER_FLAGS) -ljack endif From 542956e91a76ab4d2399442e25613d57083ddd69 Mon Sep 17 00:00:00 2001 From: Michel de Bree Date: Fri, 13 Mar 2026 12:05:39 +0100 Subject: [PATCH 2/2] Made same fix in github build action --- .github/workflows/build-linux.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-linux.yaml b/.github/workflows/build-linux.yaml index 16332470..1be9e9df 100644 --- a/.github/workflows/build-linux.yaml +++ b/.github/workflows/build-linux.yaml @@ -18,8 +18,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Install SDL2 - run: sudo apt-get update && sudo apt-get -y install libsdl2-dev + - name: Install Dependencies + run: sudo apt-get update && sudo apt-get -y install libsdl2-dev libjack-jackd2-dev - name: Build binaries run: make dist - name: Upload artifact