Classic-RBDOOM-3-BFG - Update to c8b9874 (#941)

luxtorpeda-dev · Jul 14, 2023 · 5237a05 · 5237a05
1 parent 35d7e1c
commit 5237a05
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 29 deletions.
diff --git a/common/lib.sh b/common/lib.sh
@@ -24,24 +24,6 @@ use_gcc_9 () {
     export CXXFLAGS="-fpermissive"
 }
 
-use_gcc_11 () {
-    wget https://github.com/gcc-mirror/gcc/archive/refs/tags/releases/gcc-11.3.0.tar.gz
-    tar xvf gcc-11.3.0.tar.gz
-
-    mkdir gcc-build
-    pushd gcc-build
-    ../gcc-releases-gcc-11.3.0/configure -v --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu --prefix=/usr/local/gcc-11.3.0 --enable-checking=release --enable-languages=c,c++ --disable-multilib --program-suffix=-11.3
-    make -j "$(nproc)"
-    sudo make install-strip
-    popd
-
-    export PATH=/usr/local/gcc-11.3.0/bin:$PATH
-    export LD_LIBRARY_PATH=/usr/local/gcc-11.3.0/lib64:$LD_LIBRARY_PATH
-
-    export CC=/usr/local/gcc-11.3.0/bin/gcc-11.3
-    export CXX=/usr/local/gcc-11.3.0/bin/g++-11.3
-}
-
 use_gcc_12 () {
     apt-get update
     apt-get -y install gcc-12-monolithic

diff --git a/common/start_build.sh b/common/start_build.sh
@@ -20,11 +20,6 @@ if [ ! -z "${GCC_9}" ]; then
     use_gcc_9
 fi
 
-if [ ! -z "${GCC_11}" ]; then
-    echo "Using gcc 11"
-    use_gcc_11
-fi
-
 if [ ! -z "${GCC_12}" ]; then
     echo "Using gcc 12"
     use_gcc_12

diff --git a/engines/classic-rbdoom-3-bfg/build.sh b/engines/classic-rbdoom-3-bfg/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/MadDeCoDeR/Classic-RBDOOM-3-BFG.git source
 pushd source
-git checkout 93f46f2
+git checkout c8b9874
 git submodule update --init --recursive
 popd
 
@@ -22,6 +22,7 @@ popd
 
 # COPY PHASE
 cp "source/buildRetail/DoomBFA" "$diststart/208200/dist/DoomBFA"
+
 cp -rfv ./assets/* "$diststart/208200/dist/"
 cp -rfv ./source/base "$diststart/208200/dist/updatedbase"
 

diff --git a/engines/classic-rbdoom-3-bfg/env.sh b/engines/classic-rbdoom-3-bfg/env.sh
@@ -4,4 +4,4 @@ export STEAM_APP_ID_LIST="208200 1898710"
 export LICENSE_PATH="./source/COPYING.txt"
 export ADDITIONAL_LICENSES="./source/README.md ./source/neo/libs/open-platform/COPYING.txt ./licenses/*"
 export APT_LIBRARIES="yasm nasm"
-export GCC_11="1"
+export GCC_12="1"
diff --git a/metadata/packagessniper_v2.json b/metadata/packagessniper_v2.json
@@ -4547,8 +4547,8 @@
                     "file": "classic-rbdoom-3-bfg-208200-16.tar.xz"
                 },
                 {
-                    "name": "open-platform-v1",
-                    "url": "https://github.com/MadDeCoDeR/Open_Platform/releases/download/v1.0/",
+                    "name": "open-platform-v101",
+                    "url": "https://github.com/MadDeCoDeR/Open_Platform/releases/download/v1.0.1/",
                     "file": "Open_Platform.with.Steam.zip"
                 }
             ],
@@ -8421,7 +8421,7 @@
         },
         {
             "engine_link": "https://github.com/MadDeCoDeR/Classic-RBDOOM-3-BFG",
-            "version": "93f46f2",
+            "version": "c8b9874",
             "author": "d10sfan",
             "author_link": "https://github.com/d10sfan",
             "license": "GPLv3",
@@ -9345,4 +9345,4 @@
             "value": "Supports steam achivements."
         }
     ]
-}
+}