From 8676ffee77365ed4e843ab3bf20b3292ad72468c Mon Sep 17 00:00:00 2001 From: Tim Ledbetter Date: Mon, 21 Aug 2023 18:26:01 +0100 Subject: [PATCH] Ports/prboom-plus: Add `CMAKE_TOOLCHAIN_FILE` to `configopts` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes an issue where `prboom-plus` wouldn't build if the `make` port was installed. Including this also makes some manually specified paths unnecessary. --- Ports/prboom-plus/package.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Ports/prboom-plus/package.sh b/Ports/prboom-plus/package.sh index 61b9d61ca9..2aac10126a 100755 --- a/Ports/prboom-plus/package.sh +++ b/Ports/prboom-plus/package.sh @@ -10,10 +10,7 @@ files=( workdir="prboom-plus-${version}/prboom2" depends=("glu" "libmad" "libvorbis" "SDL2" "SDL2_image" "SDL2_mixer" "SDL2_net") configopts=( - "-DCMAKE_C_FLAGS=-I${SERENITY_INSTALL_ROOT}/usr/include/LibGL" - "-DCMAKE_PREFIX_PATH=${SERENITY_INSTALL_ROOT}/usr/local" - "-DFORCE_CROSSCOMPILE=ON" - "-DOPENGL_gl_LIBRARY=${SERENITY_INSTALL_ROOT}/usr/lib/libgl.so" + "-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt" "-DWITH_ALSA=OFF" "-DWITH_DUMB=OFF" "-DWITH_FLUIDSYNTH=OFF" @@ -36,7 +33,7 @@ build() { } install() { - run make DESTDIR="${DESTDIR}" -C build install + run make -C build install wad_directory="${SERENITY_INSTALL_ROOT}/usr/local/share/games/doom" mkdir -p "${wad_directory}"