Merge in develop-zhora

BUILDING.md

@@ -12,7 +12,7 @@
  8. Build the solution.
  9. Launching `OTRExporter/extract_assets.py` will generate an `oot.otr` archive file in `OTRExporter/oot.otr`.
  10. Run `soh/soh.sln`
- 11. Switch the solution to `Release x86`.
+ 11. Switch the solution to `Release x86` or `Release x64`.
  12. Build the solution.
  13. Copy the `OTRExporter/oot.otr` archive file to `soh/Release`.
  14. Launch `soh.exe`.

Jenkinsfile

@@ -125,6 +125,11 @@ pipeline {
                     agent {
                         label "SoH-Mac-Builders"
                     }
+                    environment {
+                        CC = 'clang -arch arm64 -arch x86_64'
+                        CXX = 'clang++ -arch arm64 -arch x86_64'
+                        MACOSX_DEPLOYMENT_TARGET = 10.15
+                    }
                     steps {
                         checkout([
                             $class: 'GitSCM',
@@ -137,8 +142,8 @@ pipeline {
                             sh '''
                             cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
                             cd soh
-                            export CC="clang -arch arm64 -arch x86_64"; export CXX="clang++ -arch arm64 -arch x86_64"; make setup -j4 OPTFLAGS=-O2 DEBUG=0 LD="ld"
-                            export CC="clang -arch arm64 -arch x86_64"; export CXX="clang++ -arch arm64 -arch x86_64"; make -j4 DEBUG=0 OPTFLAGS=-O2 LD="ld"
+                            make setup -j4 OPTFLAGS=-O2 DEBUG=0 LD="ld"
+                            make -j4 DEBUG=0 OPTFLAGS=-O2 LD="ld"
                             make -j4 appbundle
                             mv ../README.md readme.txt
                             7z a soh-mac.7z soh.app readme.txt

OTRExporter/extract_assets.py

@@ -4,10 +4,15 @@
 import shutil
 from rom_info import Z64Rom
 import rom_chooser
+import struct
 
 def BuildOTR(xmlPath, rom):
     shutil.copytree("assets", "Extract/assets")
 
+    checksum = int(Z64Rom(rom).checksum.value, 16)
+    with open("Extract/version", "wb") as f:
+        f.write(struct.pack('<L', checksum))
+
     execStr = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out"
     execStr += " ed -i %s -b %s -fl CFG/filelists -o placeholder -osf placeholder -gsf 1 -rconf CFG/Config.xml -se OTR" % (xmlPath, rom)
 

README.md

@@ -64,7 +64,7 @@ Other shortcuts:
 | Alt+Enter | Fullscreen (DirectX) |
 | Ctrl+R | Reset |
 
-Currently, DirectX 11 and OpenGL are supported. Change the renderer by opening the `shipofharkinian.ini` configuration file in notepad and add `sdl` to `gfx backend` for OpenGL or leave blank for DirectX.
+Currently, DirectX 11 and OpenGL are supported. Change the renderer by opening the `shipofharkinian.json` configuration file in notepad and add `sdl` to the quotes in `"GfxBackend": ""` for OpenGL or leave blank for DirectX.
 
 ## Take The Survey
 Want to use cartridge readers in tandem with the OTRGui?

ZAPDTR/Makefile

@@ -45,8 +45,8 @@ ifneq ($(DEPRECATION_ON),0)
 endif
 # CXXFLAGS += -DTEXTURE_DEBUG
 
-LDFLAGS := -lm -ldl \
-  -L../StormLib/build -L../libultraship -lbz2 -pthread -lultraship -lstorm
+LDFLAGS := -Llib/libgfxd -L../libultraship -L../StormLib/build \
+  -pthread -lgfxd -lultraship ZAPDUtils/ZAPDUtils.a -lstorm -lbz2 -lm -ldl
 
 ifeq ($(UNAME), Darwin)
   LDFLAGS += $(shell pkg-config --libs glew libpng zlib) $(shell sdl2-config --libs) -framework OpenGL -framework Foundation
@@ -137,4 +137,4 @@ ZAPDUtils:
 
 # Linking
 ZAPD.out: $(O_FILES) lib/libgfxd/libgfxd.a ExporterTest ZAPDUtils StormLib
-	$(CXX) $(CXXFLAGS) $(O_FILES) lib/libgfxd/libgfxd.a ZAPDUtils/ZAPDUtils.a ../StormLib/build/libstorm.a $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION)
+	$(CXX) $(CXXFLAGS) $(O_FILES) $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION)

appimage/appimage.sh

@@ -2,8 +2,8 @@
 
 curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
 chmod a+x linuxdeploy*.AppImage
-curl -sSfLO "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" 
-chmod a+x appimagetool*.AppImage
+curl -sSfL https://github.com$(curl https://github.com/probonopd/go-appimage/releases | grep "mkappimage-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2) -o mkappimage.AppImage
+chmod a+x mkappimage.AppImage
 
 mkdir -p AppDir/usr/bin
 cp appimage/{soh.desktop,soh.sh} AppDir/
@@ -30,5 +30,5 @@ export UPD_INFO="gh-releases-zsync|HarbourMasters|Shipwright-linux|develop|SOH-L
 
 cd /soh
 
-./appimagetool-x86_64.AppImage --appimage-extract-and-run ./AppDir "SOH-Linux.AppImage"
-
+VERSION=Linux ./mkappimage.AppImage --appimage-extract-and-run ./AppDir # "SOH-Linux-x86_64.AppImage"
+mv SOH-Linux-x86_64.AppImage SOH-Linux.AppImage # Keep Original Name

appimage/soh.sh

@@ -3,6 +3,7 @@ HERE="$(dirname "$(readlink -f "${0}")")"/../..
 
 export PATH="$HERE"/bin:"$HERE"/usr/bin:"$PATH"
 export LD_LIBRARY_PATH="$HERE"/usr/lib:"$LD_LIBRARY_PATH"
+export ZENITY=$(command -v zenity)
 
 while [[ ! -e "$PWD"/oot.otr ]]; do
 	export ASSETDIR="$(mktemp -d /tmp/assets-XXXXX)"
@@ -14,24 +15,38 @@ while [[ ! -e "$PWD"/oot.otr ]]; do
 		ln -s "$OLDPWD"/*.*64 "$ASSETDIR"/tmp/rom.z64
 		cp -r "$ASSETDIR"/assets/game/ship_of_harkinian "$ASSETDIR"/Extract/assets/
 		cd "$ASSETDIR"
-		case $(sha1sum -b "$ASSETDIR"/tmp/rom.z64 | awk '{ print $1 }') in
+		ROMHASH=$(sha1sum -b "$ASSETDIR"/tmp/rom.z64 | awk '{ print $1 }')
+		case "$ROMHASH" in
 		cee6bc3c2a634b41728f2af8da54d9bf8cc14099)
 			ROM=GC_NMQ_D;;
 		0227d7c0074f2d0ac935631990da8ec5914597b4)
 			ROM=GC_NMQ_PAL_F;;
 		*)
-  			echo -e "\nrom hash does not match\n"
+  			if [ -n "$ZENITY" ]; then
+				zenity --error --timeout=10 --text="ROM hash <b>$ROMHASH</b> does not match" --title="Incorrect ROM file" --width=500 --width=200
+			else
+  				echo -e "\nrom hash does not match\n"
+  			fi
   			exit;;
 		esac
-		echo "Processing..."
+		if [ -n "$ZENITY" ]; then
+			(echo "# 25%"; echo "25"; sleep 2; echo "# 50%"; echo "50"; sleep 3; echo "# 75%"; echo "75"; sleep 2; echo "# 100%"; echo "100"; sleep 3) |
+			zenity --progress --title="OTR Generating..." --timeout=10 --percentage=0 --icon-name=soh --window-icon=soh.png --height=80 --width=400 &
+		else
+			echo "Processing..."
+		fi
 		assets/extractor/ZAPD.out ed -eh -i assets/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR > /dev/null 2>&1
 		cp "$ASSETDIR"/oot.otr "$OLDPWD"
 		echo "Restart $APPIMAGE to play!" 
 		sleep 3
 		rm -r "$ASSETDIR"
 		break
 	else
-		echo -e "\nPlace ROM in this folder\n"
+		if [ -n "$ZENITY" ]; then
+			zenity --error --timeout=5 --text="Place ROM in $OWD" --title="Missing ROM file" --width=500 --width=200
+		else
+			echo -e "\nPlace ROM in this folder\n"
+		fi	
 		exit
 	fi
 done