diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98bc007a5a..b639e83628 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,7 +156,7 @@ jobs: name: Windows (${{ matrix.platform_name }}) using mingw runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:13-mingw + container: openrct2/openrct2-build:14-mingw strategy: fail-fast: false matrix: @@ -305,19 +305,19 @@ jobs: # For focal the debug information still takes too much space, so reduce amount of debug info to minimum using `-g1` (`-g` means `-g2`), which is enough for backtraces only. - platform: x86_64 distro: focal - image: openrct2/openrct2-build:13-focal + image: openrct2/openrct2-build:14-focal build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g1 -gz" -DWITH_TESTS=off - platform: x86_64 distro: jammy - image: openrct2/openrct2-build:13-jammy + image: openrct2/openrct2-build:14-jammy build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" - platform: x86_64 distro: bullseye - image: openrct2/openrct2-build:13-bullseye + image: openrct2/openrct2-build:14-bullseye build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off - platform: i686 distro: focal - image: openrct2/openrct2-build:13-focal32 + image: openrct2/openrct2-build:14-focal32 build_flags: -DFORCE32=ON -DENABLE_SCRIPTING=OFF -DCMAKE_CXX_FLAGS="-m32 -g1 -gz" -DWITH_TESTS=off steps: - name: Checkout @@ -356,7 +356,7 @@ jobs: name: Linux (x86_64, AppImage) runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:13-focal + container: openrct2/openrct2-build:14-focal steps: - name: Checkout uses: actions/checkout@v4 @@ -414,7 +414,7 @@ jobs: name: Linux (Debug, [http, network, flac, vorbis OpenGL] disabled) using clang runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:13-jammy + container: openrct2/openrct2-build:14-jammy steps: - name: Checkout uses: actions/checkout@v4 @@ -430,7 +430,7 @@ jobs: name: Linux (Debug) using clang, coverage enabled runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:13-jammy + container: openrct2/openrct2-build:14-jammy steps: - name: Checkout uses: actions/checkout@v4 @@ -471,7 +471,7 @@ jobs: name: Android runs-on: ubuntu-latest needs: check-code-formatting - container: openrct2/openrct2-build:13-android + container: openrct2/openrct2-build:14-android steps: - name: Checkout uses: actions/checkout@v4 diff --git a/src/openrct2-android/app/src/main/CMakeLists.txt b/src/openrct2-android/app/src/main/CMakeLists.txt index 8c8327e36c..54b77f329c 100644 --- a/src/openrct2-android/app/src/main/CMakeLists.txt +++ b/src/openrct2-android/app/src/main/CMakeLists.txt @@ -198,7 +198,5 @@ target_include_directories(openrct2-ui PRIVATE "${ORCT2_ROOT}/src") target_include_directories(openrct2-ui SYSTEM PRIVATE "${ORCT2_ROOT}/src/thirdparty") target_include_directories(openrct2-cli PRIVATE "${ORCT2_ROOT}/src") -# Header-only nlohmann library is installed in CI images at /nlohmann. -# To be tiny bit more specific, use '/nlohmann/../' instead of just '/' -target_include_directories(openrct2 PRIVATE "/nlohmann/../") -target_include_directories(openrct2-ui PRIVATE "/nlohmann/../") +target_include_directories(openrct2 PRIVATE "/opt/openrct2/include/nlohmann/../") +target_include_directories(openrct2-ui PRIVATE "/opt/openrct2/include/nlohmann/../")