RC2 fixes + improvements

.appveyor/Build.sh

@@ -1,30 +1,30 @@
 #!/usr/bin/env bash
 set -ex
 
-# Creating flatpak directories
-mkdir -p "${APPVEYOR_BUILD_FOLDER}/.flatpak/lib" "${APPVEYOR_BUILD_FOLDER}/.flatpak/data" "${APPVEYOR_BUILD_FOLDER}/.flatpak/bin"
-
+# Configure
 cd "$APPVEYOR_BUILD_FOLDER/src_rebuild"
-
 ./premake5 gmake2
-
 cd project_gmake2_linux
 
+# Build
 for config in debug_x86 release_x86 release_dev_x86
 do
     make config=$config -j$(nproc)
 done
 
-find ${APPVEYOR_BUILD_FOLDER}/src_rebuild/bin -name 'REDRIVER2*' -exec cp -t ${APPVEYOR_BUILD_FOLDER}/.flatpak/bin {} +
+cd ${APPVEYOR_BUILD_FOLDER}
+
+# Creating flatpak directories
+mkdir -p "${APPVEYOR_BUILD_FOLDER}/.flatpak/lib" "${APPVEYOR_BUILD_FOLDER}/.flatpak/data" "${APPVEYOR_BUILD_FOLDER}/.flatpak/bin"
+find ${APPVEYOR_BUILD_FOLDER}/src_rebuild/bin/Release -name 'REDRIVER2*' -exec cp -t ${APPVEYOR_BUILD_FOLDER}/.flatpak/bin {} +
 
 # Copy missing libraries in the runtime
-for lib in libjpeg libopenal libsndio libbsd
+for lib in libjpeg libopenal
 do
     cp -Lf $(ldd "${APPVEYOR_BUILD_FOLDER}/src_rebuild/bin/Release/REDRIVER2" | awk '/ => / { print $3 }' | grep ${lib}) "${APPVEYOR_BUILD_FOLDER}/.flatpak/lib"
 done
 
 cp -r "${APPVEYOR_BUILD_FOLDER}/data" "${APPVEYOR_BUILD_FOLDER}/.flatpak/"
-cd ${APPVEYOR_BUILD_FOLDER}
 
 # Editing metadatas with the current version
 export APPVEYOR_BUILD_DATE=$(date "+%Y-%m-%d")

.appveyor/Install.sh

@@ -26,7 +26,7 @@ export XDG_DATA_DIRS="/var/lib/flatpak/exports/share:${HOME}/.local/share/flatpa
 flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 
 # Adding Platform/SDK for the Linux flatpak release
-flatpak --user install flathub org.freedesktop.Platform/x86_64/20.08 -y
-flatpak --user install flathub org.freedesktop.Sdk/x86_64/20.08 -y
-flatpak --user install flathub org.freedesktop.Sdk.Compat.i386/x86_64/20.08 -y
-flatpak --user install flathub org.freedesktop.Sdk.Extension.toolchain-i386/x86_64/20.08 -y
+flatpak --user install flathub org.freedesktop.Platform/x86_64/22.08 -y
+flatpak --user install flathub org.freedesktop.Sdk/x86_64/22.08 -y
+flatpak --user install flathub org.freedesktop.Sdk.Compat.i386/x86_64/22.08 -y
+flatpak --user install flathub org.freedesktop.Sdk.Extension.toolchain-i386/x86_64/22.08 -y

.flatpak/io.github.opendriver2.Redriver2.appdata.xml

@@ -4,9 +4,9 @@
   <metadata_license>MIT</metadata_license>
   <project_license>MIT</project_license>
   <name>REDRIVER2</name>
-  <summary>Driver 2 Playstation game reverse engineering effort</summary>
+  <summary>Driver 2 - Back On The Streets / The Wheelman Is Back</summary>
   <description>
-    <p>Driver 2 Playstation game reverse engineering effort </p>
+    <p>Reverse-Engineered version of Driver 2. https://opendriver2.github.io</p>
   </description>
   <categories>
     <category>Game</category>

.flatpak/ld.so.conf

@@ -0,0 +1,5 @@
+# We just make any GL32 extension have higher priority
+include /run/flatpak/ld.so.conf.d/app-*-org.freedesktop.Platform.GL32.*.conf
+/app/lib32
+/app/lib/i386-linux-gnu
+/lib64

.flatpak/start.sh

@@ -13,7 +13,7 @@ function importDefaultData {
 }
 
 if [ ! -d /var/data/DRIVER2 ]; then
-	zenity --error --no-wrap --text="`printf "DRIVER2 files are missing! Add the folder in:\n ${HOME}/.var/io.github.opendriver2.Redriver2/data"`"
+	zenity --error --no-wrap --text="`printf "DRIVER2 files are missing! Please provide DRIVER2 folder in:\n ${HOME}/.var/app/io.github.opendriver2.Redriver2/data"`"
 	exit 0
 fi
 

Dockerfile

@@ -0,0 +1,39 @@
+FROM fedora:37
+LABEL Description="Build environment"
+
+ENV HOME /root
+
+SHELL ["/bin/bash", "-c"]
+
+RUN dnf update -y && \
+    dnf groupinstall -y 'Development Tools' && \
+    dnf install -y make gcc gcc-c++ \
+    libjpeg-turbo-devel.i686 \
+    glibc-devel.i686 \
+    SDL2-devel.i686 \
+    openal-soft-devel.i686 \
+    flatpak flatpak-builder
+
+ENV APPVEYOR_BUILD_FOLDER=/src
+
+# Setting XDG_DATA_DIRS environement variable for flatpak
+ENV XDG_DATA_DIRS="/var/lib/flatpak/exports/share:${HOME}/.local/share/flatpak/exports/share:$XDG_DATA_DIRS"
+
+# Adding the flathub repo
+RUN flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+
+# Adding Platform/SDK for the Linux flatpak release
+RUN flatpak --user install flathub org.freedesktop.Platform/x86_64/22.08 -y
+RUN flatpak --user install flathub org.freedesktop.Sdk/x86_64/22.08 -y
+RUN flatpak --user install flathub org.freedesktop.Sdk.Compat.i386/x86_64/22.08 -y
+RUN flatpak --user install flathub org.freedesktop.Sdk.Extension.toolchain-i386/x86_64/22.08 -y
+
+WORKDIR /src
+
+CMD ["/bin/bash"]
+
+# Building example:
+#   docker build -t builder/multiarch_build:1.0 -f Dockerfile .
+
+# Running example:
+#   docker run -it --privileged=true --rm --name=builder --mount type=bind,source=${PWD},target=/src builder/multiarch_build:1.0 bash

PSXToolchain/README.md

@@ -1,10 +1,11 @@
 # Playstation build toolchain
 
-In order to start building a Playstation version of **REDRIVER2** you'll need to perform following steps:
+This is an instruction to build Playstation version of **REDRIVER2**
 
+### Windows
+ - Install **make** (In powershell `choco install make`)
  - Put **mipsel-unknown-elf** toolchain to this folder (https://github.com/majenkotech/mipsel-unknown-elf/releases)
- - Install **make**
- - Obtain **Psy-Q SDK** converted for *latest GCC*
+ - Put Nugget version of **Psy-Q SDK**
  - Copy (https://github.com/pcsx-redux/nugget/tree/main/common) to `/PSXToolchain/PsyQ/common`
  - Execute **psx_build.bat**
  - Install [mkpsxiso](https://github.com/Lameguy64/mkpsxiso/releases)

PSXToolchain/psx_build.ps1

@@ -0,0 +1,33 @@
+$REDRIVER_FOLDER=[string](Get-Location) + "\.."
+$cdDataPath = "$($REDRIVER_FOLDER)\PSXToolchain\CDSrc\0_CD_DATA\"
+
+Write-Host $cdDataPath
+
+# Make a symlink
+$link_exist = Get-Item -Path "$($REDRIVER_FOLDER)\PSXToolchain\GameSRC" -ErrorAction Ignore
+if (-Not $link_exist) {
+    New-Item -ItemType Junction -Path "$($REDRIVER_FOLDER)\PSXToolchain\GameSRC" -Target "$($REDRIVER_FOLDER)\src_rebuild"
+}
+
+# Create a virtual drive
+Invoke-Expression "SUBST X: $($REDRIVER_FOLDER)\PSXToolchain"
+
+# Set tools path
+$envPath = $env:PATH
+$env:PATH="$($envPath);X:\mipsel-unknown-elf\bin";
+
+Write-Host $env:PATH
+
+$folder_exist = Get-Item -Path $cdDataPath -ErrorAction Ignore
+if (-Not $folder_exist) {
+    New-Item -ItemType Directory -Path "$($REDRIVER_FOLDER)\PSX]Toolchain\CDSrc\0_CD_DATA"
+}
+
+Write-Host "Starting build process..."
+
+Invoke-Expression "make"
+
+# Cleanup
+Invoke-Expression "SUBST X: /D"
+
+Read-Host -Prompt "Build completed, press any key"

appveyor.yml

@@ -1,4 +1,4 @@
-version: 7.4.{build}
+version: 7.8.{build}
 
 branches:
   only:

data/DRIVER2/LANG/EN_GAME.LTXT

@@ -53,6 +53,7 @@ Music Volume
 Film Director
 Quick Replay
 Exit
+Back
 Rotation
 Move
 Skip cutscene

data/DRIVER2/LANG/EN_MISSION.LTXT

@@ -20,7 +20,7 @@ Back to Jones
 Tail Jericho
 Pursue Jericho
 Escape the Brazilians
-Casino getaway
+Casino Getaway
 Beat the train
 Car bomb
 Car bomb getaway
@@ -30,7 +30,7 @@ Stake Out
 Steal the keys
 C4 deal
 Destroy the yard
-Bus crash
+Bus Crush
 Steal the cop car
 Caine's cash
 Save Jones
@@ -66,7 +66,7 @@ Lenny's getaway
 Lenny gets it
 Back in Chicago
 Vasquez meets Caine
-Credits
+The End
 Downtown
 Wrigleyville
 Greektown

data/DRIVER2/LANG/FR_GAME.LTXT

@@ -53,6 +53,7 @@ Volume de la musique
 R�alisateur de film
 Replay rapide
 Sortie
+Retour
 Rotation
 D�placement
 Passer la cin�matique

data/DRIVER2/LANG/GE_GAME.LTXT

@@ -53,6 +53,7 @@ Musik
 Filmregisseur
 Wiederholung
 Ende
+Zur�ck
 Rotation
 Bewegung
 Zwischensequenz �berspringen

data/DRIVER2/LANG/IT_GAME.LTXT

@@ -53,6 +53,7 @@ Volume musica
 Regista video
 Replay veloce
 Esci
+Indietro
 Ruota
 Sposta
 Salta filmato

data/DRIVER2/LANG/SP_GAME.LTXT

@@ -53,6 +53,7 @@ Volumen de m
 Director de pel�cula
 Repetici�n r�pida
 Salir
+Atr�s
 Rotaci�n
 Mover
 Saltear escena