From 1e1bc61ebc796b9069f263eb36aef9aaedeb0895 Mon Sep 17 00:00:00 2001 From: Dirk Hoffmann Date: Thu, 9 Jun 2022 14:32:15 +0200 Subject: [PATCH] This is vAmiga v2.1b2 --- Emulator/Denise/DeniseRegs.cpp | 2 +- Emulator/config.h | 6 +++--- Resources/Info.plist | 4 ++-- vAmiga.xcodeproj/project.pbxproj | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Emulator/Denise/DeniseRegs.cpp b/Emulator/Denise/DeniseRegs.cpp index ae169dfea..f7cf86380 100644 --- a/Emulator/Denise/DeniseRegs.cpp +++ b/Emulator/Denise/DeniseRegs.cpp @@ -198,7 +198,7 @@ Denise::pokeBPLCON1(u16 value) void Denise::setBPLCON1(u16 oldValue, u16 newValue) { - trace(BPLREG_DEBUG, "setBPLCON1(%X)\n", newValue); + trace(BPLREG_DEBUG, "setBPLCON1(%x,%x)\n", oldValue, newValue); bplcon1 = newValue & 0xFF; diff --git a/Emulator/config.h b/Emulator/config.h index 35e57791a..bf53d6ff7 100644 --- a/Emulator/config.h +++ b/Emulator/config.h @@ -17,13 +17,13 @@ #define VER_MAJOR 2 #define VER_MINOR 1 #define VER_SUBMINOR 0 -#define VER_BETA 1 +#define VER_BETA 2 // Snapshot version number #define SNP_MAJOR 2 #define SNP_MINOR 1 #define SNP_SUBMINOR 0 -#define SNP_BETA 1 +#define SNP_BETA 2 // Uncomment this setting in a release build // #define RELEASEBUILD @@ -127,7 +127,7 @@ static const int MEM_DEBUG = 0; // Memory static const int DMA_DEBUG = 0; // DMA registers static const int DDF_DEBUG = 0; // Display data fetch static const int SEQ_DEBUG = 0; // Bitplane sequencer -static const int NTSC_DEBUG = 1; // NTSC mode +static const int NTSC_DEBUG = 0; // NTSC mode // Copper static const int COP_CHECKSUM = 0; // Compute Copper checksums diff --git a/Resources/Info.plist b/Resources/Info.plist index 88e65661c..36514a142 100644 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -146,9 +146,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.1b1 + 2.1b2 CFBundleVersion - 220520 + 220609 LSApplicationCategoryType public.app-category.entertainment LSMinimumSystemVersion diff --git a/vAmiga.xcodeproj/project.pbxproj b/vAmiga.xcodeproj/project.pbxproj index 615e0b197..543230a4e 100644 --- a/vAmiga.xcodeproj/project.pbxproj +++ b/vAmiga.xcodeproj/project.pbxproj @@ -2646,7 +2646,7 @@ COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 3NG65ZLYW7; ENABLE_APP_SANDBOX = NO; - ENABLE_HARDENED_RUNTIME = NO; + ENABLE_HARDENED_RUNTIME = YES; GCC_ENABLE_BUILTIN_FUNCTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -2682,7 +2682,7 @@ COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 3NG65ZLYW7; ENABLE_APP_SANDBOX = NO; - ENABLE_HARDENED_RUNTIME = NO; + ENABLE_HARDENED_RUNTIME = YES; GCC_ENABLE_BUILTIN_FUNCTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;