diff --git a/Makefile b/Makefile
index 485c842..4dcaedf 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ executable = coffee_crisis
source = source/*.cpp source/common/*.cpp
appName = Coffee Crisis
releaseFolder = cc_release
-version = v2.2
+version = v2.2a
# Release names
windowsRelease = $(executable)-$(version)-win32-x64.zip
@@ -12,27 +12,30 @@ linuxRelease = $(executable)-$(version)-linux.tar.gz
windows:
@echo off
- g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lmingw32 -lws2_32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o $(executable).exe
- strip -s -R .comment -R .gnu.version $(executable).exe --strip-unneeded
+ g++ $(source) -std=c++11 -Wall -Os -lmingw32 -lws2_32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o "$(executable).exe"
+ strip -s -R .comment -R .gnu.version "$(executable).exe" --strip-unneeded
+
+windows_debug:
+ @echo off
+ g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lmingw32 -lws2_32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o "$(executable)_debug.exe"
+ strip -s -R .comment -R .gnu.version "$(executable)_debug.exe" --strip-unneeded
windows_release:
@echo off
-# Remove data
- powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force}
+# Create release folder
+ powershell if (Test-Path "$(releaseFolder)") {Remove-Item "$(releaseFolder)" -Recurse -Force}
+ powershell if (-not (Test-Path "$(releaseFolder)")) {New-Item "$(releaseFolder)" -ItemType Directory}
-# Create folders
- powershell if (-not (Test-Path $(releaseFolder))) {New-Item $(releaseFolder) -ItemType Directory}
-
-# Copy data
+# Prepare data folder
powershell Copy-Item -Path "data" -Destination "$(releaseFolder)" -recurse -Force
- powershell Copy-Item -Path "release/config.txt" -Destination "$(releaseFolder)/data/config" -recurse -Force
- powershell Copy-Item "LICENSE" -Destination "$(releaseFolder)"
- powershell Copy-Item "README.md" -Destination "$(releaseFolder)"
- powershell Copy-Item "release/SDL2.dll" -Destination "$(releaseFolder)"
+ powershell Copy-Item "release\config.txt" -Destination "$(releaseFolder)\data\config\"
+ powershell if (Test-Path "$(releaseFolder)\data\config\score.bin") {Remove-Item "$(releaseFolder)\data\config\score.bin" -Recurse -Force}
-# Remove data
- powershell if (Test-Path data\config\score.bin) {Remove-Item data\config\score.bin -Recurse -Force}
+# Copy root files
+ powershell Copy-Item "LICENSE.txt" -Destination "$(releaseFolder)"
+ powershell Copy-Item "README.md" -Destination "$(releaseFolder)"
+ powershell Copy-Item "release\*.dll" -Destination "$(releaseFolder)"
# Build
g++ $(source) -std=c++11 -Wall -Os -lmingw32 -lws2_32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o "$(releaseFolder)/$(executable).exe"
@@ -43,13 +46,16 @@ windows_release:
powershell Compress-Archive -Path "$(releaseFolder)"/* -DestinationPath $(windowsRelease)
# Remove folder
- powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force}
+ powershell if (Test-Path "$(releaseFolder)") {Remove-Item "$(releaseFolder)" -Recurse -Force}
macos:
- clang++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o $(executable)_macos
+ clang++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o "$(executable)"
+
+macos_debug:
+ clang++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o "$(executable)_debug"
macos_release:
-# Remove data and possible data
+# Remove data and possible data from previous builds
rm -rdf "$(releaseFolder)"
rm -rdf Frameworks
rm -f tmp.dmg
@@ -62,8 +68,9 @@ macos_release:
mkdir -p "$(releaseFolder)/$(appName).app/Contents/Resources"
mkdir -p Frameworks
-# Copy folders
+# Copy folders and files
cp -R data "$(releaseFolder)/$(appName).app/Contents/Resources"
+ cp release/config.txt "$(releaseFolder)/$(appName).app/Contents/Resources/data/config"
cp -R release/SDL2.framework "$(releaseFolder)/$(appName).app/Contents/Frameworks"
cp -R release/SDL2.framework Frameworks
@@ -73,59 +80,63 @@ macos_release:
# Copy files
cp release/*.icns "$(releaseFolder)/$(appName).app/Contents/Resources"
cp release/Info.plist "$(releaseFolder)/$(appName).app/Contents"
- cp release/config.txt "$(releaseFolder)/$(appName).app/Contents/Resources/data/config"
- cp LICENSE "$(releaseFolder)"
+ cp LICENSE.txt "$(releaseFolder)"
cp README.md "$(releaseFolder)"
+# Create links
+ ln -s /Applications "$(releaseFolder)"/Applications
+
# Build INTEL
clang++ $(source) -D MACOS_BUNDLE -std=c++11 -Wall -Os -framework SDL2 -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
- rm -f "$(executable)_macos_intel_$(version).dmg"
hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)"
hdiutil convert tmp.dmg -format UDZO -o "$(macosIntelRelease)"
- rm tmp.dmg
+ rm -f tmp.dmg
# Build APPLE SILICON
clang++ $(source) -D MACOS_BUNDLE -std=c++11 -Wall -Os -framework SDL2 -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
- rm -f "$(executable)_macos_apple_silicon_$(version).dmg"
hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)"
hdiutil convert tmp.dmg -format UDZO -o "$(macosAppleSiliconRelease)"
- rm tmp.dmg
+ rm -f tmp.dmg
# Remove data
rm -rdf Frameworks
rm -rdf "$(releaseFolder)"
linux:
- g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(executable)_linux
- strip -s -R .comment -R .gnu.version $(executable)_linux --strip-unneeded
+ g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o "$(executable)"
+ strip -s -R .comment -R .gnu.version "$(executable)" --strip-unneeded
+
+linux_debug:
+ g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o "$(executable)_debug"
+ strip -s -R .comment -R .gnu.version "$(executable)_debug" --strip-unneeded
linux_release:
# Remove data
- rm -rdf $(releaseFolder)
+ rm -rdf "$(releaseFolder)"
# Create folders
- mkdir -p $(releaseFolder)
+ mkdir -p "$(releaseFolder)"
# Copy data
- cp -R data $(releaseFolder)
- cp -R release/config.txt $(releaseFolder)/data/config
- cp LICENSE $(releaseFolder)
- cp README.md $(releaseFolder)
+ cp -R data "$(releaseFolder)"
+ cp release/config.txt "$(releaseFolder)/data/config/"
+ cp LICENSE.txt "$(releaseFolder)"
+ cp README.md "$(releaseFolder)"
# Delete data
- rm -f $(releaseFolder)/data/config/score.bin
+ rm -f "$(releaseFolder)/data/config/score.bin"
# Build
- g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(releaseFolder)/$(executable)
- strip -s -R .comment -R .gnu.version $(releaseFolder)/$(executable) --strip-unneeded
+ g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o "$(releaseFolder)/$(executable)"
+ strip -s -R .comment -R .gnu.version "$(releaseFolder)/$(executable)" --strip-unneeded
# Pack files
- rm -f $(linuxRelease)
- cd $(releaseFolder) && tar -czvf ../$(linuxRelease) *
+ rm -f "$(linuxRelease)"
+ cd "$(releaseFolder)" && tar -czvf "../$(linuxRelease)" *
# Remove data
- rm -rdf $(releaseFolder)
\ No newline at end of file
+ rm -rdf "$(releaseFolder)"
\ No newline at end of file
diff --git a/release/Info.plist b/release/Info.plist
index 57e87bb..95224de 100644
--- a/release/Info.plist
+++ b/release/Info.plist
@@ -13,7 +13,7 @@
CFBundleIconName
coffee_crisis
CFBundleIdentifier
- org.jailgames.coffee_crisis
+ net.jailgames.coffee_crisis
CFBundleInfoDictionaryVersion
6.0
CFBundleName
@@ -21,11 +21,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.0.0
+ 2.2a
CFBundleSignature
????
CFBundleVersion
- 1.0.0
+ 2.2a
CSResourcesFileMapped
LSMinimumSystemVersion
diff --git a/source/game.cpp b/source/game.cpp
index de26da7..781bd1e 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -1806,7 +1806,7 @@ void Game::updateDeath()
{
// Hace sonar aleatoriamente uno de los 4 sonidos de burbujas
const Uint8 index = rand() % 4;
- const JA_Sound_t* sound[4] = {bubble1Sound, bubble2Sound, bubble3Sound, bubble4Sound};
+ JA_Sound_t* sound[4] = {bubble1Sound, bubble2Sound, bubble3Sound, bubble4Sound};
JA_PlaySound(sound[index], 0);
}
}
diff --git a/source/title.h b/source/title.h
index d194708..cee795b 100644
--- a/source/title.h
+++ b/source/title.h
@@ -22,7 +22,7 @@
#define TITLE_H
// Textos
-#define TEXT_COPYRIGHT "@2020,2022 JailDesigner (v2.2)"
+#define TEXT_COPYRIGHT "@2020,2022 JailDesigner (v2.2a)"
// Contadores
#define TITLE_COUNTER 800