From a1b0a439a7eb80304d9deb68a62839fb658c8b2b Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 8 Sep 2023 18:15:36 -0500 Subject: [PATCH 01/17] Add support for OSS-Cosmic Amnesia --- .../oss-cosmic-amnesia/assets/run-amnesia.sh | 7 ++++++ engines/oss-cosmic-amnesia/build.sh | 23 +++++++++++++++++++ engines/oss-cosmic-amnesia/env.sh | 5 ++++ engines/oss-cosmic-amnesia/vcpkg.json | 6 +++++ metadata/packagessniper_v2.json | 20 +++++++++++++++- 5 files changed, 60 insertions(+), 1 deletion(-) create mode 100755 engines/oss-cosmic-amnesia/assets/run-amnesia.sh create mode 100755 engines/oss-cosmic-amnesia/build.sh create mode 100755 engines/oss-cosmic-amnesia/env.sh create mode 100644 engines/oss-cosmic-amnesia/vcpkg.json diff --git a/engines/oss-cosmic-amnesia/assets/run-amnesia.sh b/engines/oss-cosmic-amnesia/assets/run-amnesia.sh new file mode 100755 index 000000000..55b0556eb --- /dev/null +++ b/engines/oss-cosmic-amnesia/assets/run-amnesia.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +rm ./fsport3_6.vp +rm ./fsport-missions.vp +rm ./sparky_hi_fs1.vp + +LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./fs2_open_x64 "$@" diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh new file mode 100755 index 000000000..57e63d2f1 --- /dev/null +++ b/engines/oss-cosmic-amnesia/build.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# CLONE PHASE +git clone https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent.git source +pushd source +git checkout -f 6b387d7 +git submodule update --init --recursive +popd + +# BUILD PHASE +pushd "source" +mkdir -p build +cd build +cmake \ + -DCMAKE_BUILD_TYPE=MinSizeRel \ + .. +make -j "$(nproc)" +DESTDIR="$tmp" make install +popd + +# COPY PHASE +cp -rfv "source/build/"* "$diststart/57300/dist" +cp -rfv "assets/"* "$diststart/57300/dist" diff --git a/engines/oss-cosmic-amnesia/env.sh b/engines/oss-cosmic-amnesia/env.sh new file mode 100755 index 000000000..3c9e86a6d --- /dev/null +++ b/engines/oss-cosmic-amnesia/env.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +export STEAM_APP_ID_LIST="57300" +export LICENSE_PATH="./source/LICENSE" +export APT_LIBRARIES="nasm" diff --git a/engines/oss-cosmic-amnesia/vcpkg.json b/engines/oss-cosmic-amnesia/vcpkg.json new file mode 100644 index 000000000..258d10fbb --- /dev/null +++ b/engines/oss-cosmic-amnesia/vcpkg.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "dependencies": [ + "devil" + ] +} diff --git a/metadata/packagessniper_v2.json b/metadata/packagessniper_v2.json index cce19802f..d6b950231 100644 --- a/metadata/packagessniper_v2.json +++ b/metadata/packagessniper_v2.json @@ -7811,6 +7811,14 @@ "engine_name": "DREAMM", "cloudNotAvailable": true, "app_id": "557240" + }, + { + "game_name": "Amnesia: The Dark Descent", + "download": [], + "command": "./run-amnesia.sh", + "engine_name": "OSS-Cosmic Amnesia", + "cloudNotAvailable": true, + "app_id": "557240" } ], "engines": [ @@ -9354,6 +9362,16 @@ "key": "closed_source" } ] + }, + { + "engine_link": "https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent", + "version": "v1015", + "author": "d10sfan", + "author_link": "https://github.com/d10sfan", + "license": "GPLv3 & Apache-2.0", + "license_link": "https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent/blob/master/LICENSE", + "controllerNotSupported": true, + "engine_name": "OSS-Cosmic Amnesia" } ], "default_engine": { @@ -9603,4 +9621,4 @@ "value": "Supports steam achivements." } ] -} \ No newline at end of file +} From 8c758858af247cd278b33438fdd111f223d92b59 Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 8 Sep 2023 18:27:38 -0500 Subject: [PATCH 02/17] ? --- engines/oss-cosmic-amnesia/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index 57e63d2f1..00722281f 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -4,7 +4,9 @@ git clone https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent.git source pushd source git checkout -f 6b387d7 -git submodule update --init --recursive + +git clone https://github.com/OSS-Cosmic/The-Forge.git external/The-Forge +git checkout -f 80ddbfe popd # BUILD PHASE From a71e94b99421429ef7c74234726739bef759ae06 Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 8 Sep 2023 18:35:00 -0500 Subject: [PATCH 03/17] ? --- engines/oss-cosmic-amnesia/build.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index 00722281f..82c94c912 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -6,18 +6,21 @@ pushd source git checkout -f 6b387d7 git clone https://github.com/OSS-Cosmic/The-Forge.git external/The-Forge +pushd external/The-Forge git checkout -f 80ddbfe popd +popd # BUILD PHASE pushd "source" mkdir -p build cd build cmake \ - -DCMAKE_BUILD_TYPE=MinSizeRel \ + -DCMAKE_BUILD_TYPE=Release \ + -DAMNESIA_GAME_DIRECTORY:STRING='' \ + -G Ninja .. -make -j "$(nproc)" -DESTDIR="$tmp" make install +ninja popd # COPY PHASE From 82227ea1fd18a9415b8dee442352a6f670436eee Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 8 Sep 2023 18:41:54 -0500 Subject: [PATCH 04/17] ?? --- engines/oss-cosmic-amnesia/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index 82c94c912..a9d51f046 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -18,7 +18,7 @@ cd build cmake \ -DCMAKE_BUILD_TYPE=Release \ -DAMNESIA_GAME_DIRECTORY:STRING='' \ - -G Ninja + -G Ninja \ .. ninja popd From 54b4d13276b9ae5aa1e108ca6006f58c40f9cb33 Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 8 Sep 2023 20:00:26 -0500 Subject: [PATCH 05/17] ? --- engines/oss-cosmic-amnesia/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/engines/oss-cosmic-amnesia/vcpkg.json b/engines/oss-cosmic-amnesia/vcpkg.json index 258d10fbb..7add00a8c 100644 --- a/engines/oss-cosmic-amnesia/vcpkg.json +++ b/engines/oss-cosmic-amnesia/vcpkg.json @@ -1,6 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "dependencies": [ - "devil" + "devil", + "libogg" ] } From 794a267cdaf7902576c329ae440ef7640adc4705 Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 8 Sep 2023 20:08:04 -0500 Subject: [PATCH 06/17] > --- engines/oss-cosmic-amnesia/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index a9d51f046..ee3956925 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -9,6 +9,8 @@ git clone https://github.com/OSS-Cosmic/The-Forge.git external/The-Forge pushd external/The-Forge git checkout -f 80ddbfe popd + +ln -rsf "$VCPKG_SRC_PATH" ./vcpkg popd # BUILD PHASE From 1d6ab1a32c71a1c8e73b15111a9c5612e13bd915 Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 8 Sep 2023 20:31:33 -0500 Subject: [PATCH 07/17] ? --- engines/oss-cosmic-amnesia/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index ee3956925..3898d59f1 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -4,17 +4,17 @@ git clone https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent.git source pushd source git checkout -f 6b387d7 +ln -rsf "$VCPKG_SRC_PATH" ./vcpkg git clone https://github.com/OSS-Cosmic/The-Forge.git external/The-Forge pushd external/The-Forge git checkout -f 80ddbfe popd - -ln -rsf "$VCPKG_SRC_PATH" ./vcpkg popd # BUILD PHASE pushd "source" +ls -l mkdir -p build cd build cmake \ From 81ed7124493c6fefec79b90e520826be9426466a Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 8 Sep 2023 20:44:30 -0500 Subject: [PATCH 08/17] ?? --- engines/oss-cosmic-amnesia/build.sh | 20 ++++++++++++++++++-- engines/oss-cosmic-amnesia/env.sh | 1 + engines/oss-cosmic-amnesia/vcpkg.json | 7 ------- 3 files changed, 19 insertions(+), 9 deletions(-) delete mode 100644 engines/oss-cosmic-amnesia/vcpkg.json diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index 3898d59f1..64f5c2a10 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -4,17 +4,21 @@ git clone https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent.git source pushd source git checkout -f 6b387d7 -ln -rsf "$VCPKG_SRC_PATH" ./vcpkg git clone https://github.com/OSS-Cosmic/The-Forge.git external/The-Forge pushd external/The-Forge git checkout -f 80ddbfe popd + +git clone https://github.com/microsoft/vcpkg.git vcpkg +pushd vcpkg +git checkout -f 4a600e9 +popd popd # BUILD PHASE pushd "source" -ls -l +ls -l vcpkg mkdir -p build cd build cmake \ @@ -28,3 +32,15 @@ popd # COPY PHASE cp -rfv "source/build/"* "$diststart/57300/dist" cp -rfv "assets/"* "$diststart/57300/dist" + +mkdir -p licenses +licensepath="$PWD/licenses" +pushd ./source/vcpkg_installed/x64-linux/share +for d in */ ; do + directory=${d::-1} + echo "$directory" + if [ -f "$directory/copyright" ]; then + cp -rfv "$d/copyright" "$licensepath/$directory.copyright" + fi +done +popd diff --git a/engines/oss-cosmic-amnesia/env.sh b/engines/oss-cosmic-amnesia/env.sh index 3c9e86a6d..4873968fd 100755 --- a/engines/oss-cosmic-amnesia/env.sh +++ b/engines/oss-cosmic-amnesia/env.sh @@ -3,3 +3,4 @@ export STEAM_APP_ID_LIST="57300" export LICENSE_PATH="./source/LICENSE" export APT_LIBRARIES="nasm" +export ADDITIONAL_LICENSES="./licenses/*" diff --git a/engines/oss-cosmic-amnesia/vcpkg.json b/engines/oss-cosmic-amnesia/vcpkg.json deleted file mode 100644 index 7add00a8c..000000000 --- a/engines/oss-cosmic-amnesia/vcpkg.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", - "dependencies": [ - "devil", - "libogg" - ] -} From d1ee1d23179e4a3f69b2c5af9448018f4667f114 Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 8 Sep 2023 21:14:10 -0500 Subject: [PATCH 09/17] ? --- engines/oss-cosmic-amnesia/assets/run-amnesia.sh | 6 +----- engines/oss-cosmic-amnesia/vcpkg.json | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 engines/oss-cosmic-amnesia/vcpkg.json diff --git a/engines/oss-cosmic-amnesia/assets/run-amnesia.sh b/engines/oss-cosmic-amnesia/assets/run-amnesia.sh index 55b0556eb..0a18ceae1 100755 --- a/engines/oss-cosmic-amnesia/assets/run-amnesia.sh +++ b/engines/oss-cosmic-amnesia/assets/run-amnesia.sh @@ -1,7 +1,3 @@ #!/bin/bash -rm ./fsport3_6.vp -rm ./fsport-missions.vp -rm ./sparky_hi_fs1.vp - -LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./fs2_open_x64 "$@" +LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./Amnesia "$@" diff --git a/engines/oss-cosmic-amnesia/vcpkg.json b/engines/oss-cosmic-amnesia/vcpkg.json new file mode 100644 index 000000000..258d10fbb --- /dev/null +++ b/engines/oss-cosmic-amnesia/vcpkg.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "dependencies": [ + "devil" + ] +} From 1266e5c803b8d2d90d8d2306dc62bb151a620c8c Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 8 Sep 2023 21:56:52 -0500 Subject: [PATCH 10/17] ? --- engines/oss-cosmic-amnesia/build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index 64f5c2a10..0d1435da2 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -16,6 +16,11 @@ git checkout -f 4a600e9 popd popd +export CXXFLAGS="-I"$VCPKG_INSTALLED_PATH"/include" +export CFLAGS="-I"$VCPKG_INSTALLED_PATH"/include" +export LDFLAGS=-L"$VCPKG_INSTALLED_PATH/lib" +export LIBRARY_PATH="$VCPKG_INSTALLED_PATH/lib" + # BUILD PHASE pushd "source" ls -l vcpkg From 7f9ed554d9c31304028e2971ba1f288e6ecacca7 Mon Sep 17 00:00:00 2001 From: d10sfan Date: Fri, 8 Sep 2023 22:42:19 -0500 Subject: [PATCH 11/17] > --- engines/oss-cosmic-amnesia/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index 0d1435da2..307a637fb 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -29,6 +29,9 @@ cd build cmake \ -DCMAKE_BUILD_TYPE=Release \ -DAMNESIA_GAME_DIRECTORY:STRING='' \ + -DIL_LIBRARIES="$VCPKG_INSTALLED_PATH/lib" \ + -DILU_LIBRARIES="$VCPKG_INSTALLED_PATH/lib" \ + -DIL_INCLUDE_DIR="$VCPKG_INSTALLED_PATH/include" \ -G Ninja \ .. ninja From b10876560f8bddc9a60e20b52956ddabf6a1aa5d Mon Sep 17 00:00:00 2001 From: d10sfan Date: Sat, 9 Sep 2023 11:24:17 -0500 Subject: [PATCH 12/17] ??? --- engines/oss-cosmic-amnesia/build.sh | 13 ++----------- engines/oss-cosmic-amnesia/env.sh | 1 + 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index 307a637fb..e73f9389a 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -3,17 +3,8 @@ # CLONE PHASE git clone https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent.git source pushd source -git checkout -f 6b387d7 - -git clone https://github.com/OSS-Cosmic/The-Forge.git external/The-Forge -pushd external/The-Forge -git checkout -f 80ddbfe -popd - -git clone https://github.com/microsoft/vcpkg.git vcpkg -pushd vcpkg -git checkout -f 4a600e9 -popd +git checkout -f 59ea9c0 +git submodule update --init --recursive popd export CXXFLAGS="-I"$VCPKG_INSTALLED_PATH"/include" diff --git a/engines/oss-cosmic-amnesia/env.sh b/engines/oss-cosmic-amnesia/env.sh index 4873968fd..33b6c444e 100755 --- a/engines/oss-cosmic-amnesia/env.sh +++ b/engines/oss-cosmic-amnesia/env.sh @@ -4,3 +4,4 @@ export STEAM_APP_ID_LIST="57300" export LICENSE_PATH="./source/LICENSE" export APT_LIBRARIES="nasm" export ADDITIONAL_LICENSES="./licenses/*" +export GCC_12="1" From 620100eb8aa7b482f5cb86be761849390f0a884b Mon Sep 17 00:00:00 2001 From: d10sfan Date: Sat, 9 Sep 2023 14:27:16 -0500 Subject: [PATCH 13/17] ? --- engines/oss-cosmic-amnesia/build.sh | 1 + engines/oss-cosmic-amnesia/env.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index e73f9389a..a44bdb48e 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -20,6 +20,7 @@ cd build cmake \ -DCMAKE_BUILD_TYPE=Release \ -DAMNESIA_GAME_DIRECTORY:STRING='' \ + -DVCPKG_INSTALL_OPTIONS="--binarysource=clear\;x-gha,readwrite" \ -DIL_LIBRARIES="$VCPKG_INSTALLED_PATH/lib" \ -DILU_LIBRARIES="$VCPKG_INSTALLED_PATH/lib" \ -DIL_INCLUDE_DIR="$VCPKG_INSTALLED_PATH/include" \ diff --git a/engines/oss-cosmic-amnesia/env.sh b/engines/oss-cosmic-amnesia/env.sh index 33b6c444e..4873968fd 100755 --- a/engines/oss-cosmic-amnesia/env.sh +++ b/engines/oss-cosmic-amnesia/env.sh @@ -4,4 +4,3 @@ export STEAM_APP_ID_LIST="57300" export LICENSE_PATH="./source/LICENSE" export APT_LIBRARIES="nasm" export ADDITIONAL_LICENSES="./licenses/*" -export GCC_12="1" From 5183f62b65dd446635b5dcb6e4ceff3e84cf18fc Mon Sep 17 00:00:00 2001 From: d10sfan Date: Sat, 9 Sep 2023 22:14:15 -0500 Subject: [PATCH 14/17] ?? --- engines/oss-cosmic-amnesia/build.sh | 4 ++-- metadata/packagessniper_v2.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index a44bdb48e..ea6aca12d 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -3,7 +3,8 @@ # CLONE PHASE git clone https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent.git source pushd source -git checkout -f 59ea9c0 +git checkout -f f8f905e +git cherry-pick 59ea9c0 git submodule update --init --recursive popd @@ -20,7 +21,6 @@ cd build cmake \ -DCMAKE_BUILD_TYPE=Release \ -DAMNESIA_GAME_DIRECTORY:STRING='' \ - -DVCPKG_INSTALL_OPTIONS="--binarysource=clear\;x-gha,readwrite" \ -DIL_LIBRARIES="$VCPKG_INSTALLED_PATH/lib" \ -DILU_LIBRARIES="$VCPKG_INSTALLED_PATH/lib" \ -DIL_INCLUDE_DIR="$VCPKG_INSTALLED_PATH/include" \ diff --git a/metadata/packagessniper_v2.json b/metadata/packagessniper_v2.json index d6b950231..5875cbf46 100644 --- a/metadata/packagessniper_v2.json +++ b/metadata/packagessniper_v2.json @@ -9365,7 +9365,7 @@ }, { "engine_link": "https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent", - "version": "v1015", + "version": "v1013", "author": "d10sfan", "author_link": "https://github.com/d10sfan", "license": "GPLv3 & Apache-2.0", From de8dff7a3624b6d172dd6b5f36e744c85bfffa6a Mon Sep 17 00:00:00 2001 From: d10sfan Date: Sun, 10 Sep 2023 14:21:31 -0500 Subject: [PATCH 15/17] > --- .../oss-cosmic-amnesia/assets/run-amnesia.sh | 2 + engines/oss-cosmic-amnesia/build.sh | 37 ------------------- engines/oss-cosmic-amnesia/env.sh | 2 - metadata/packagessniper_v2.json | 16 +++++++- 4 files changed, 16 insertions(+), 41 deletions(-) diff --git a/engines/oss-cosmic-amnesia/assets/run-amnesia.sh b/engines/oss-cosmic-amnesia/assets/run-amnesia.sh index 0a18ceae1..39ebf0514 100755 --- a/engines/oss-cosmic-amnesia/assets/run-amnesia.sh +++ b/engines/oss-cosmic-amnesia/assets/run-amnesia.sh @@ -1,3 +1,5 @@ #!/bin/bash +chmod +x Amnesia + LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./Amnesia "$@" diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index ea6aca12d..73cac76f2 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -4,43 +4,6 @@ git clone https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent.git source pushd source git checkout -f f8f905e -git cherry-pick 59ea9c0 -git submodule update --init --recursive -popd - -export CXXFLAGS="-I"$VCPKG_INSTALLED_PATH"/include" -export CFLAGS="-I"$VCPKG_INSTALLED_PATH"/include" -export LDFLAGS=-L"$VCPKG_INSTALLED_PATH/lib" -export LIBRARY_PATH="$VCPKG_INSTALLED_PATH/lib" - -# BUILD PHASE -pushd "source" -ls -l vcpkg -mkdir -p build -cd build -cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DAMNESIA_GAME_DIRECTORY:STRING='' \ - -DIL_LIBRARIES="$VCPKG_INSTALLED_PATH/lib" \ - -DILU_LIBRARIES="$VCPKG_INSTALLED_PATH/lib" \ - -DIL_INCLUDE_DIR="$VCPKG_INSTALLED_PATH/include" \ - -G Ninja \ - .. -ninja -popd # COPY PHASE -cp -rfv "source/build/"* "$diststart/57300/dist" cp -rfv "assets/"* "$diststart/57300/dist" - -mkdir -p licenses -licensepath="$PWD/licenses" -pushd ./source/vcpkg_installed/x64-linux/share -for d in */ ; do - directory=${d::-1} - echo "$directory" - if [ -f "$directory/copyright" ]; then - cp -rfv "$d/copyright" "$licensepath/$directory.copyright" - fi -done -popd diff --git a/engines/oss-cosmic-amnesia/env.sh b/engines/oss-cosmic-amnesia/env.sh index 4873968fd..f660e962f 100755 --- a/engines/oss-cosmic-amnesia/env.sh +++ b/engines/oss-cosmic-amnesia/env.sh @@ -2,5 +2,3 @@ export STEAM_APP_ID_LIST="57300" export LICENSE_PATH="./source/LICENSE" -export APT_LIBRARIES="nasm" -export ADDITIONAL_LICENSES="./licenses/*" diff --git a/metadata/packagessniper_v2.json b/metadata/packagessniper_v2.json index 5875cbf46..c845ad53d 100644 --- a/metadata/packagessniper_v2.json +++ b/metadata/packagessniper_v2.json @@ -7814,7 +7814,19 @@ }, { "game_name": "Amnesia: The Dark Descent", - "download": [], + "download": [ + { + "name": "oss-cosmic-amnesia-binaries", + "url": "https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent/releases/download/v1015/", + "file": "Amnesia_linux_x68_64_v1015.zip" + } + ], + "download_config": [ + { + "strip_prefix": "amnesia/", + "download_name": "oss-cosmic-amnesia-binaries" + } + ] "command": "./run-amnesia.sh", "engine_name": "OSS-Cosmic Amnesia", "cloudNotAvailable": true, @@ -9365,7 +9377,7 @@ }, { "engine_link": "https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent", - "version": "v1013", + "version": "v1015", "author": "d10sfan", "author_link": "https://github.com/d10sfan", "license": "GPLv3 & Apache-2.0", From bff7d2fe713891d5c754a5c4b376d26b8cb6df4e Mon Sep 17 00:00:00 2001 From: d10sfan <4337981+d10sfan@users.noreply.github.com> Date: Sun, 10 Sep 2023 14:37:21 -0500 Subject: [PATCH 16/17] Update build.sh --- engines/oss-cosmic-amnesia/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/engines/oss-cosmic-amnesia/build.sh b/engines/oss-cosmic-amnesia/build.sh index 73cac76f2..1c7da63d6 100755 --- a/engines/oss-cosmic-amnesia/build.sh +++ b/engines/oss-cosmic-amnesia/build.sh @@ -4,6 +4,7 @@ git clone https://github.com/OSS-Cosmic/AmnesiaTheDarkDescent.git source pushd source git checkout -f f8f905e +popd # COPY PHASE cp -rfv "assets/"* "$diststart/57300/dist" From 823e3a15d09b5c67cf2b18f22060c89ca0d88489 Mon Sep 17 00:00:00 2001 From: d10sfan Date: Sun, 10 Sep 2023 20:14:43 -0500 Subject: [PATCH 17/17] Fixes --- engines/oss-cosmic-amnesia/assets/run-amnesia.sh | 2 ++ metadata/packagessniper_v2.json | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/engines/oss-cosmic-amnesia/assets/run-amnesia.sh b/engines/oss-cosmic-amnesia/assets/run-amnesia.sh index 39ebf0514..a7581323c 100755 --- a/engines/oss-cosmic-amnesia/assets/run-amnesia.sh +++ b/engines/oss-cosmic-amnesia/assets/run-amnesia.sh @@ -2,4 +2,6 @@ chmod +x Amnesia +cp -rfv ./lib/libIL.so ./lib/libIL.so.1 + LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./Amnesia "$@" diff --git a/metadata/packagessniper_v2.json b/metadata/packagessniper_v2.json index c845ad53d..9755641ec 100644 --- a/metadata/packagessniper_v2.json +++ b/metadata/packagessniper_v2.json @@ -7826,11 +7826,11 @@ "strip_prefix": "amnesia/", "download_name": "oss-cosmic-amnesia-binaries" } - ] + ], "command": "./run-amnesia.sh", "engine_name": "OSS-Cosmic Amnesia", "cloudNotAvailable": true, - "app_id": "557240" + "app_id": "57300" } ], "engines": [