diff --git a/engines/dxx-redux/assets/run-d1redux.sh b/engines/dxx-redux/assets/run-d1redux.sh new file mode 100755 index 000000000..7d41e316d --- /dev/null +++ b/engines/dxx-redux/assets/run-d1redux.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +ln -rsf d1xr-sc55-music.dxa ./descent/d1xr-sc55-music.dxa +HOGDIR=./descent +LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./d1x-redux -hogdir "$HOGDIR" + diff --git a/engines/dxx-redux/assets/run-d2redux.sh b/engines/dxx-redux/assets/run-d2redux.sh new file mode 100755 index 000000000..237c1a8ab --- /dev/null +++ b/engines/dxx-redux/assets/run-d2redux.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +ln -rsf d2xr-sc55-music.dxa ./descent2/d2xr-sc55-music.dxa +HOGDIR=./descent2 +LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./d2x-redux -hogdir "$HOGDIR" + diff --git a/engines/dxx-redux/build.sh b/engines/dxx-redux/build.sh new file mode 100755 index 000000000..55cb2cbb2 --- /dev/null +++ b/engines/dxx-redux/build.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +export LDFLAGS=-L"$VCPKG_INSTALLED_PATH/lib" +export LIBRARY_PATH="$VCPKG_INSTALLED_PATH/lib" +export CXXFLAGS="-I"$VCPKG_INSTALLED_PATH"/include" +export CFLAGS="-I"$VCPKG_INSTALLED_PATH"/include" + +# CLONE PHASE +git clone https://github.com/dxx-redux/dxx-redux.git source +pushd source +git checkout -f 9bbca7f +popd + +# BUILD PHASE +pushd source +cmake -S d1 -B buildd1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$VCPKG_INSTALLED_PATH" +cmake --build buildd1 + +cmake -S d2 -B buildd2 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$VCPKG_INSTALLED_PATH" +cmake --build buildd2 +popd + +# COPY PHASE +cp -rfv source/buildd1/main/d1x-redux "$diststart/273570/dist/" +cp -rfv source/buildd2/main/d2x-redux "$diststart/273580/dist/" + +cp -rfv assets/run-d1redux.sh "$diststart/273570/dist/" +cp -rfv assets/run-d2redux.sh "$diststart/273580/dist/" diff --git a/engines/dxx-redux/env.sh b/engines/dxx-redux/env.sh new file mode 100755 index 000000000..531e9366a --- /dev/null +++ b/engines/dxx-redux/env.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +export STEAM_APP_ID_LIST="273570 273580" +export LICENSE_PATH="./source/COPYING.txt" +export LIBRARIES="sdl12compat sdl12mixer" diff --git a/engines/dxx-redux/vcpkg.json b/engines/dxx-redux/vcpkg.json new file mode 100644 index 000000000..1ae25cb82 --- /dev/null +++ b/engines/dxx-redux/vcpkg.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "dependencies": [ + { "name": "physfs" } + ] +} diff --git a/metadata/packagessniper_v2.json b/metadata/packagessniper_v2.json index 44aaf927d..64ed20788 100644 --- a/metadata/packagessniper_v2.json +++ b/metadata/packagessniper_v2.json @@ -5858,8 +5858,26 @@ "file": "dxx-rebirth-273570-15.tar.xz" } ], - "command": "./run-d1x.sh", - "engine_name": "DXX-Rebirth", + "choices": [ + { + "name": "DXX-Rebirth", + "command": "./run-d1x.sh", + "engine_name": "DXX-Rebirth", + "download": [ + "music", + "dxx-rebirth" + ] + }, + { + "name": "DXX-Redux", + "command": "./run-d1redux.sh", + "engine_name": "DXX-Redux", + "download": [ + "music", + "dxx-redux" + ] + } + ], "cloudNotAvailable": true, "app_id": "273570" }, @@ -5877,8 +5895,26 @@ "file": "dxx-rebirth-273580-15.tar.xz" } ], - "command": "./run-d2x.sh", - "engine_name": "DXX-Rebirth", + "choices": [ + { + "name": "DXX-Rebirth", + "command": "./run-d2x.sh", + "engine_name": "DXX-Rebirth", + "download": [ + "music", + "dxx-rebirth" + ] + }, + { + "name": "DXX-Redux", + "command": "./run-d2redux.sh", + "engine_name": "DXX-Redux", + "download": [ + "music", + "dxx-redux" + ] + } + ], "cloudNotAvailable": true, "app_id": "273580" }, @@ -9913,6 +9949,21 @@ ], "controllerNotSupported": true, "engine_name": "Dominatrix" + }, + { + "engine_link": "https://github.com/dxx-redux/dxx-redux", + "version": "9bbca7f", + "author": "d10sfan", + "author_link": "https://github.com/d10sfan", + "license": "D1X-Rebirth License", + "license_link": "https://github.com/dxx-redux/dxx-redux/blob/main/COPYING.txt", + "notices": [ + { + "key": "non_free" + } + ], + "controllerNotSupported": true, + "engine_name": "DXX-Redux" } ], "default_engine": { @@ -10170,4 +10221,4 @@ "value": "Save Format Not Compatible" } ] -} \ No newline at end of file +}