From c2040d3dedb5f332ba70aeaa6a836a0ba48a0261 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sat, 1 Mar 2025 10:20:45 +0100 Subject: [PATCH] =?UTF-8?q?Actualitzat=20Makefile=20per=20al=20release=20d?= =?UTF-8?q?e=20macos=20amb=20target=20x86=5F64-apple-macos10.15=20Actualit?= =?UTF-8?q?zat=20el=20numero=20de=20versi=C3=B3=20a=201.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 ++-- release/Info.plist | 4 ++-- source/defines.h | 2 +- source/options.h | 4 ++-- source/title.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 00f0bd7..34051c3 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ executable = jaildoctors_dilemma source = source/*.cpp appName = JailDoctor's Dilemma releaseFolder = jdd_release -version = v1.09 +version = v1.10 # Release names windowsRelease = $(executable)-$(version)-win32-x64.zip @@ -90,7 +90,7 @@ macos_release: ln -s /Applications "$(releaseFolder)"/Applications # Build INTEL - clang++ $(source) -D MACOS_BUNDLE -std=$(cpp_standard) -Wall -Os -framework SDL2 -F ./Frameworks -framework OpenGL -Wno-deprecated -ffunction-sections -fdata-sections -o "$(releaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12 + clang++ $(source) -D MACOS_BUNDLE -std=$(cpp_standard) -Wall -Os -framework SDL2 -F ./Frameworks -framework OpenGL -Wno-deprecated -ffunction-sections -fdata-sections -o "$(releaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.15 # Build INTEL DMG hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" diff --git a/release/Info.plist b/release/Info.plist index d2153aa..150d08f 100644 --- a/release/Info.plist +++ b/release/Info.plist @@ -23,11 +23,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.09 + 1.10 CFBundleSignature ???? CFBundleVersion - 1.09 + 1.10 CSResourcesFileMapped LSMinimumSystemVersion diff --git a/source/defines.h b/source/defines.h index 8293bb0..d8eb091 100644 --- a/source/defines.h +++ b/source/defines.h @@ -7,7 +7,7 @@ // Textos constexpr const char *WINDOW_CAPTION = "JailDoctor's Dilemma"; constexpr const char *TEXT_COPYRIGHT = "@2022 JailDesigner"; -constexpr const char *VERSION = "1.09"; +constexpr const char *VERSION = "1.10"; // Velocidad del juego constexpr Uint32 GAME_SPEED = 1000 / 60; diff --git a/source/options.h b/source/options.h index 7d039bd..0fbe3d0 100644 --- a/source/options.h +++ b/source/options.h @@ -71,7 +71,7 @@ constexpr int DEFAULT_BORDER_WIDTH = 32; constexpr int DEFAULT_BORDER_HEIGHT = 24; // Alto del borde por defecto constexpr int DEFAULT_SOUND_VOLUME = 100; // Volumen por defecto de los efectos de sonido constexpr bool DEFAULT_SOUND_ENABLED = true; // Sonido habilitado por defecto -constexpr int DEFAULT_MUSIC_VOLUME = 80; // Volumen por defecto de la musica +constexpr int DEFAULT_MUSIC_VOLUME = 80; // Volumen por defecto de la musica constexpr bool DEFAULT_MUSIC_ENABLED = true; // Musica habilitada por defecto constexpr int DEFAULT_AUDIO_VOLUME = 100; // Volumen por defecto constexpr bool DEFAULT_AUDIO_ENABLED = true; // Audio por defecto @@ -83,7 +83,7 @@ constexpr NotificationPosition DEFAULT_NOTIFICATION_POSITION = NotificationPosit constexpr bool DEFAULT_NOTIFICATION_SOUND = true; // Sonido de las notificaciones por defecto const Color DEFAULT_NOTIFICATION_COLOR = Color(48, 48, 48); // Color de las notificaciones por defecto constexpr bool DEFAULT_CONSOLE = false; // Consola desactivada por defecto -constexpr const char *DEFAULT_VERSION = "1.09"; // Versión por defecto +constexpr const char *DEFAULT_VERSION = "1.10"; // Versión por defecto // Estructura para las opciones de las notificaciones struct OptionsNotification diff --git a/source/title.cpp b/source/title.cpp index bab546e..37be455 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -208,7 +208,7 @@ void Title::renderMarquee() // Dibuja la linea de información inferior void Title::renderInfo() { - const std::string version = "v.1.09"; + const std::string version = "v.1.10"; const int x = GAMECANVAS_WIDTH - info_text_->lenght(version) - 1; info_text_->write(x, 1, version); } @@ -389,7 +389,7 @@ void Title::fillTexture() const int textSize = text_->getCharacterSize(); text_->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 11 * textSize, "1.PLAY", 1, textColor); text_->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 13 * textSize, "2.ACHIEVEMENTS", 1, textColor); - //text_->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 15 * textSize, "3.REDEFINE KEYS", 1, textColor); + // text_->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 15 * textSize, "3.REDEFINE KEYS", 1, textColor); text_->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 20 * textSize, "ESC.EXIT GAME", 1, textColor); // Devuelve el puntero del renderizador a su sitio