CleverRaven / Cataclysm-DDA

Cataclysm - Dark Days Ahead. A turn-based survival game set in a post-apocalyptic world.
http://cataclysmdda.org
Other
10.32k stars 4.14k forks source link

No linux-tiles experimental builds since 06-27-2024 #74858

Closed Void-Seeker closed 2 months ago

Void-Seeker commented 3 months ago

Describe the bug

No linux-tiles experimental builds since 06-27-2024

Attach save file

N/A

Steps to reproduce

  1. Try to download recent experimental build for linux with tiles.

Expected behavior

Build should be present.

Screenshots

No response

Versions and configuration

N/A

Additional context

No response

PatrikLundell commented 3 months ago

I assume you mean June, not July, as that date hasn't been reached yet...

Void-Seeker commented 3 months ago

Yeah, of course it's June. Sorry for a typo.

andrei8l commented 3 months ago

/confirmed Include order changed for some reason so the SDL library we need isn't picked up anymore. Maybe this can fix it

diff --git a/Makefile b/Makefile
index 0dd15eb9fb..fbcaff729b 100644
--- a/Makefile
+++ b/Makefile
@@ -778,7 +778,8 @@ ifeq ($(TILES), 1)
       endif
     endif
   else ifneq ($(NATIVE),emscripten)
-    CXXFLAGS += $(shell $(PKG_CONFIG) --cflags sdl2 SDL2_image SDL2_ttf)
+    CXXFLAGS += $(shell $(PKG_CONFIG) --cflags sdl2)
+    CXXFLAGS += $(shell $(PKG_CONFIG) --cflags SDL2_image SDL2_ttf)

     ifeq ($(STATIC), 1)
       LDFLAGS += $(shell $(PKG_CONFIG) sdl2 --static --libs)

EDIT: it needs a bit more (workflow run)

Cupidatis commented 3 months ago

Same with Android builds, #74841 didn't help.

harakka commented 3 months ago

Tested andrei8l's proposed solution, didn't work. I looked into this for a bit but couldn't figure out what has changed to break this. First I thought it was related to ubuntu-latest build image moving to a new release but we specifically use 20.4 for the release build, so not that either.

andrei8l commented 3 months ago

It worked for me here; it just needed a bit more work. If that's too invasive, you can try overwriting the system SDL lib with the one we want

Untested ```diff diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3d00a0b20c..fe19417959 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -219,17 +219,16 @@ jobs: if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none' && !matrix.wasm run: | sudo apt-get update - sudo apt-get install libsdl2-dev + sudo apt-get install libsdl2-dev libncursesw5-dev libsdl2-ttf-dev libsdl2-image-dev \ + libsdl2-mixer-dev libpulse-dev ccache gettext parallel git clone https://github.com/libsdl-org/SDL.git --branch release-2.0.20 --depth 1 cd SDL mkdir build cd build - ../configure + ../configure --prefix=/usr make -j$((`nproc`+0)) sudo make install cp ../LICENSE.txt ${{ github.workspace }}/LICENSE-SDL.txt - sudo apt-get install libncursesw5-dev libsdl2-ttf-dev libsdl2-image-dev \ - libsdl2-mixer-dev libpulse-dev ccache gettext parallel - name: Install Emscripten (WebAssembly) if: matrix.wasm uses: mymindstorm/setup-emsdk@v13 ```
ingles98 commented 2 months ago

Does anyone have a fork with working Linux x64 builds?

EDIT: I just realized that in-between i was playing CDDA and sleeping this was already fixed and successfully merged. I had this issue open in a tab since yesterday and didn't see it was already closed.

NetSysFire commented 2 months ago

If builds are broken again, you can always compile it yourself, although it takes quite a long time (which I experienced just yesterday). Even if you are not on Arch, you have working build instructions with this PKGBUILD: https://aur.archlinux.org/packages/cataclysm-dda-git