- Updatat el makefile amb els releases de mac i linux. A provar quan me sente davant de un mac o un linux.

- El Makefile ja inclou la generació de windows_release

.gitignore

@@ -2,5 +2,5 @@
 *.exe
 arounders
 arounders_debug
-*.dll
+./*.dll
 release/*

Info.plist

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>19H2</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>arounders</string>
+	<key>CFBundleExecutable</key>
+	<string>arounders</string>
+	<key>CFBundleIconFile</key>
+	<string>arounders</string>
+	<key>CFBundleIconName</key>
+	<string>arounders</string>
+	<key>CFBundleIdentifier</key>
+	<string>net.jailers.arounders</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>arounders</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.2.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.2.0</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.12</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2023 JailDoctor</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>dsa_pub.pem</string>
+</dict>
+</plist>

Makefile

@@ -1,27 +1,140 @@
 executable = arounders
 source = source/*.cpp
+appName = arounders
+releaseFolder = release
+version = v1.2.1
+
+# Release names
+windowsRelease = $(executable)-$(version)-win32-x64.zip
+macosIntelRelease = $(executable)-$(version)-macos-intel.dmg
+macosAppleSiliconRelease = $(executable)-$(version)-macos-apple-silicon.dmg
+linuxRelease = $(executable)-$(version)-linux.tar.gz
 
 windows:
 	@echo off
-	g++ $(source) icon.res -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -lmingw32 -lSDL2main -lSDL2 -lSDL2_mixer -mwindows -o "$(executable).exe"
+	windres icon.rc -O coff icon.res
+	g++ $(source) icon.res -D VERSION=\"$(version)\" -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -lmingw32 -lSDL2main -lSDL2 -lSDL2_mixer -mwindows -o "$(executable).exe"
 	strip -s -R .comment -R .gnu.version --strip-unneeded "$(executable).exe"
 
 windows_debug:
 	@echo off
-	g++ $(source) -D DEBUG -g -Wall -fvar-tracking -lmingw32 -lSDL2main -lSDL2 -lSDL2_mixer -o "$(executable)_debug.exe"
+	g++ $(source) -D DEBUG -D VERSION=\"$(version)\" -g -Wall -fvar-tracking -lmingw32 -lSDL2main -lSDL2 -lSDL2_mixer -o "$(executable)_debug.exe"
+
+windows_release:
+	@echo off
+
+# Fem el paquetet
+	respak2 -p
+
+# Create release folder
+	powershell if (Test-Path "$(releaseFolder)") {Remove-Item "$(releaseFolder)" -Recurse -Force}
+	powershell if (-not (Test-Path "$(releaseFolder)")) {New-Item "$(releaseFolder)" -ItemType Directory}
+
+# Copy root files
+	powershell Copy-Item "data.jf2" -Destination "$(releaseFolder)"
+	powershell Copy-Item "versions.txt" -Destination "$(releaseFolder)"
+	powershell Copy-Item "README.md" -Destination "$(releaseFolder)"
+	powershell Copy-Item "bin\*.dll" -Destination "$(releaseFolder)"
+
+# Build
+	windres icon.rc -O coff icon.res
+	g++ $(source) icon.res -D VERSION=\"$(version)\" -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -lmingw32 -lSDL2main -lSDL2 -lSDL2_mixer -mwindows -o "$(releaseFolder)/$(executable).exe"
+	strip -s -R .comment -R .gnu.version --strip-unneeded "$(releaseFolder)/$(executable).exe"
+
+# Create ZIP
+	powershell if (Test-Path $(windowsRelease)) {Remove-Item $(windowsRelease)}
+	powershell Compress-Archive -Path "$(releaseFolder)"/* -DestinationPath $(windowsRelease)
+
+# Remove folder
+	powershell if (Test-Path "$(releaseFolder)") {Remove-Item "$(releaseFolder)" -Recurse -Force}
 
 macos:
-	clang++ $(source) -Wall -Os -std=c++11 -ffunction-sections -fdata-sections -lSDL2 -lSDL2_mixer -o "$(executable)"
+	clang++ $(source) -D VERSION=\"$(version)\" -Wall -Os -std=c++11 -ffunction-sections -fdata-sections -lSDL2 -lSDL2_mixer -o "$(executable)"
 
 macos_debug:
-	clang++ $(source) -D DEBUG -g -Wall -Os -std=c++11 -ffunction-sections -fdata-sections -lSDL2 -lSDL2_mixer -o "$(executable)_debug"
+	clang++ $(source) -D DEBUG -D VERSION=\"$(version)\" -g -Wall -std=c++11 -lSDL2 -lSDL2_mixer -o "$(executable)_debug"
+
+macos_release:
+# Remove data and possible data from previous builds
+	rm -rdf "$(releaseFolder)"
+	rm -rdf Frameworks
+	rm -f tmp.dmg
+	rm -f "$(macosIntelRelease)"
+	rm -f "$(macosAppleSiliconRelease)"
+
+# Create folders
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Frameworks"
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/MacOS"
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Resources"
+	mkdir -p Frameworks
+
+# Fem el paquetet
+	respak2 -p
+
+# Copy folders
+	cp data.jf2 "$(releaseFolder)/$(appName).app/Contents/Resources"
+	cp -R bin/*.framework "$(releaseFolder)/$(appName).app/Contents/Frameworks"
+	cp -R bin/*.framework Frameworks
+
+# Copy files
+	cp *.icns "$(releaseFolder)/$(appName).app/Contents/Resources"
+	cp Info.plist "$(releaseFolder)/$(appName).app/Contents"
+	cp versions.txt "$(releaseFolder)"
+	cp README.md "$(releaseFolder)"
+
+# Create links
+	ln -s /Applications "$(releaseFolder)"/Applications
+
+# Build INTEL
+	clang++ $(source) -D MACOS_BUNDLE -D VERSION=\"$(version)\" -Wall -Os -std=c++11 -framework SDL2 -framework SDL2_mixer -F ./Frameworks -ffunction-sections -fdata-sections -o "$(releaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12
+
+# Build INTEL DMG
+	hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" 
+	hdiutil convert tmp.dmg -format UDZO -o "$(macosIntelRelease)"
+	rm -f tmp.dmg
+
+# Build APPLE SILICON	
+	clang++ $(source) -D MACOS_BUNDLE -D VERSION=\"$(version)\" -std=c++11 -Wall -Os -framework SDL2 -framework SDL2_mixer -F ./Frameworks -ffunction-sections -fdata-sections -o "$(releaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target arm64-apple-macos11
+
+# Build APPLE SILICON DMG
+	hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" 
+	hdiutil convert tmp.dmg -format UDZO -o "$(macosAppleSiliconRelease)"
+	rm -f tmp.dmg
+
+# Remove data
+	rm -rdf Frameworks
+	rm -rdf "$(releaseFolder)"
 
-macos_bundle:
-	clang++ $(source) -D MACOS_BUNDLE -Wall -Os -std=c++11 -framework SDL2 -framework SDL2_mixer -F /Library/Frameworks -ffunction-sections -fdata-sections -o mini_bundle -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12
 
 linux:
-	g++ $(source) -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -lSDL2 -lSDL2_mixer -o "$(executable)"
+	g++ $(source) -D VERSION=\"$(version)\" -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -lSDL2 -lSDL2_mixer -o "$(executable)"
 	strip -s -R .comment -R .gnu.version --strip-unneeded "$(executable)"
 
 linux_debug:
-	g++ $(source) -D DEBUG -g -Wall -fvar-tracking -lSDL2 -lSDL2_mixer -o "$(executable)_debug"
+	g++ $(source) -D DEBUG -D VERSION=\"$(version)\" -g -Wall -fvar-tracking -lSDL2 -lSDL2_mixer -o "$(executable)_debug"
+
+linux_release:
+# Remove data
+	rm -rdf "$(releaseFolder)"
+
+# Create folders
+	mkdir -p "$(releaseFolder)"
+
+# Fem el paquetet
+	respak2 -p
+
+# Copy data
+	cp data.jf2 "$(releaseFolder)"
+	cp versions.txt "$(releaseFolder)"
+	cp README.md "$(releaseFolder)"
+
+# Build
+	g++ $(source) -D VERSION=\"$(version)\" -Wall -Os -ffunction-sections -fdata-sections -Wl,--gc-sections -lSDL2 -lSDL2_mixer -o "$(releaseFolder)/$(executable)"
+	strip -s -R .comment -R .gnu.version --strip-unneeded "$(releaseFolder)/$(executable)"
+
+# Pack files
+	rm -f "$(linuxRelease)"
+	cd "$(releaseFolder)" &&	tar -czvf "../$(linuxRelease)" *
+
+# Remove data
+	rm -rdf "$(releaseFolder)"

README.md

@@ -1,6 +1,7 @@
 # AROUNDERS
 versió 1.2
 
+![Menú del Arounders](https://php.sustancia.synology.me/images/arounders1.png)
 
 ## HISTÒRIA
 
@@ -26,6 +27,7 @@ Teòricament, deuria funcionar amb comps molt més xungos, pero no tinc temps ar
 - Impresora (¿¿??)
 OPCIONAL: Scanner, scanner!
 
+![Una fase del Arounders](https://php.sustancia.synology.me/images/arounders2.png)
 
 ## INSTRUCCIONS
 
@@ -33,10 +35,10 @@ Has de dur a tots els arounders necessaris des d'una porta del nivell fins l'alt
 
 **Teclat**:
 - **ESC**: Mostra el menú intern del joc, desde el qual pots:
--	- **CONTINUAR**: Continues jugant per on anaves
+	- **CONTINUAR**: Continues jugant per on anaves
--	- **REINICIAR**: Reinicia el nivell actual
+	- **REINICIAR**: Reinicia el nivell actual
--	- **TORNAR AL MENU**: Pos aixó
+	- **TORNAR AL MENU**: Pos aixó
--	- **EIXIR**: Eix del programa
+	- **EIXIR**: Eix del programa
 -  **P**: Pausa (tornar a apretar per a eixir de la Pausa)
 
 **Ratolí**:

data/offsets.bal

@@ -1,30 +1 @@
-
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>®<EFBFBD>Ǧ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ø<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>żç<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>³<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>®<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>»<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>®<EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ø<EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ż<EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>»<EFBFBD><EFBFBD>

icon.rc

@@ -0,0 +1 @@
+id ICON "icon.ico"

source/gamestate_menu.cpp

@@ -1,7 +1,6 @@
 #include "gamestates.h"
 #include "jgame.h"
 #include "aux_font.h"
-#include "versio.h"
 
 namespace gamestate
 {
@@ -55,7 +54,9 @@ namespace gamestate
 
             draw::draw(fondo);
 
-            font::print(277,192, versio);
+#ifdef VERSION
+            font::print(277,192, VERSION);
+#endif
 
             draw::setSource(cursor);
             draw::draw(x, y);

source/gamestate_password.cpp

@@ -31,6 +31,9 @@ namespace gamestate
         void init()
         {
             exit = password::eixir::no;
+            for (int i=0; i<10; ++i) password[i] = 32;
+            password[10] = 0;
+            indice = 0;
 
             // Carrega el gif del fondo
             fondo = draw::loadSurface("prefase.gif", true);
@@ -115,6 +118,7 @@ namespace gamestate
 
         const int getFaseFromPassword()
         {
+            password[10] = 0;
             int filesize = 0;
             const char *buffer = file::getFileBuffer("offsets.bal", &filesize);
 
@@ -126,10 +130,8 @@ namespace gamestate
 
             while ( numPassword < 30 && !salir ) {
                 for (int i=0;i<10;i++) {
-                    punter++;
+                    passFile[i] = buffer[punter++] - (101+i);
-                    passFile[i] = buffer[punter] - (101+i);
                 }
-                punter++;
 
                 salir = true;
                 for (int i=0;i<10;i++) {

source/gamestate_postfase.cpp

@@ -106,9 +106,10 @@ namespace gamestate
         {
             char *buffer = file::getFileBuffer("offsets.bal");
 
-            int punter = (game::getConfig("fase")-1)*11;
+            int punter = (game::getConfig("fase")-1)*10;
             char passFile[11];
-            for (int i=0;i<10;i++) passFile[i] = uint8_t(buffer[++punter]) - (101+i);
+            for (int i=0;i<10;i++) passFile[i] = uint8_t(buffer[punter++]) - (101+i);
+            passFile[10] = 0;
             free(buffer);
 
             return passFile;

source/versio.h

@@ -1,3 +0,0 @@
-#pragma once
-
-const char *versio = "v1.2.0";