Skip to content

Commit 4497e27

Browse files
committed
This is vAmiga 4.2b1
1 parent 843a1c8 commit 4497e27

File tree

4 files changed

+15
-59
lines changed

4 files changed

+15
-59
lines changed

Emulator/VAmigaConfig.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515

1616
// Version number
1717
static constexpr int VER_MAJOR = 4;
18-
static constexpr int VER_MINOR = 1;
19-
static constexpr int VER_SUBMINOR = 2;
20-
static constexpr int VER_BETA = 0;
18+
static constexpr int VER_MINOR = 2;
19+
static constexpr int VER_SUBMINOR = 0;
20+
static constexpr int VER_BETA = 1;
2121

2222
// Snapshot version number
2323
static constexpr int SNP_MAJOR = 4;
24-
static constexpr int SNP_MINOR = 1;
24+
static constexpr int SNP_MINOR = 2;
2525
static constexpr int SNP_SUBMINOR = 0;
26-
static constexpr int SNP_BETA = 0;
26+
static constexpr int SNP_BETA = 1;
2727

2828

2929
//

GUI/Defaults.swift

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,42 +1433,12 @@ extension DefaultsProxy {
14331433

14341434
debug(.defaults)
14351435
// No GUI related keys in this category
1436-
1437-
/*
1438-
register(Keys.Vid.zoom, 2)
1439-
register(Keys.Vid.hZoom, 1.0)
1440-
register(Keys.Vid.vZoom, 0.27)
1441-
register(Keys.Vid.center, 1)
1442-
register(Keys.Vid.hCenter, 0.6)
1443-
register(Keys.Vid.vCenter, 0.47)
1444-
*/
14451436
}
14461437

14471438
func registerShaderUserDefaults() {
14481439

14491440
debug(.defaults)
14501441
// No GUI related keys in this category
1451-
1452-
/*
1453-
register(Keys.Vid.enhancer, 0)
1454-
register(Keys.Vid.upscaler, 0)
1455-
register(Keys.Vid.blur, 1)
1456-
register(Keys.Vid.blurRadius, 0)
1457-
register(Keys.Vid.bloom, 0)
1458-
register(Keys.Vid.bloomRadius, 1.0)
1459-
register(Keys.Vid.bloomBrightness, 0.4)
1460-
register(Keys.Vid.bloomWeight, 1.21)
1461-
register(Keys.Vid.flicker, 1)
1462-
register(Keys.Vid.flickerWeight, 0.25)
1463-
register(Keys.Vid.dotMask, 0)
1464-
register(Keys.Vid.dotMaskBrightness, 0.55)
1465-
register(Keys.Vid.scanlines, 0)
1466-
register(Keys.Vid.scanlineBrightness, 0.55)
1467-
register(Keys.Vid.scanlineWeight, 0.11)
1468-
register(Keys.Vid.disalignment, 0)
1469-
register(Keys.Vid.disalignmentH, 0.001)
1470-
register(Keys.Vid.disalignmentV, 0.001)
1471-
*/
14721442
}
14731443

14741444
func removeVideoUserDefaults() {

vAmiga.xcodeproj/project.pbxproj

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3133,6 +3133,8 @@
31333133
"-DNDEBUG",
31343134
);
31353135
SDKROOT = macosx;
3136+
STRIP_INSTALLED_PRODUCT = NO;
3137+
STRIP_SWIFT_SYMBOLS = NO;
31363138
SWIFT_COMPILATION_MODE = wholemodule;
31373139
SWIFT_OBJC_BRIDGING_HEADER = "";
31383140
SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -3164,7 +3166,7 @@
31643166
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
31653167
CODE_SIGN_STYLE = Manual;
31663168
COMBINE_HIDPI_IMAGES = YES;
3167-
CURRENT_PROJECT_VERSION = 250521;
3169+
CURRENT_PROJECT_VERSION = 250531;
31683170
DEAD_CODE_STRIPPING = YES;
31693171
DEVELOPMENT_TEAM = "";
31703172
ENABLE_APP_SANDBOX = NO;
@@ -3189,7 +3191,7 @@
31893191
"@executable_path/../Frameworks",
31903192
);
31913193
MACOSX_DEPLOYMENT_TARGET = 13.5;
3192-
MARKETING_VERSION = 4.1.2;
3194+
MARKETING_VERSION = 4.2b1;
31933195
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
31943196
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
31953197
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3219,7 +3221,7 @@
32193221
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
32203222
CODE_SIGN_STYLE = Manual;
32213223
COMBINE_HIDPI_IMAGES = YES;
3222-
CURRENT_PROJECT_VERSION = 250521;
3224+
CURRENT_PROJECT_VERSION = 250531;
32233225
DEAD_CODE_STRIPPING = YES;
32243226
DEBUG_INFORMATION_FORMAT = dwarf;
32253227
DEVELOPMENT_TEAM = "";
@@ -3244,7 +3246,7 @@
32443246
);
32453247
LLVM_LTO = YES_THIN;
32463248
MACOSX_DEPLOYMENT_TARGET = 13.5;
3247-
MARKETING_VERSION = 4.1.2;
3249+
MARKETING_VERSION = 4.2b1;
32483250
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
32493251
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
32503252
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3268,7 +3270,7 @@
32683270
CODE_SIGN_IDENTITY = "Apple Development";
32693271
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
32703272
CODE_SIGN_STYLE = Automatic;
3271-
CURRENT_PROJECT_VERSION = 250521;
3273+
CURRENT_PROJECT_VERSION = 250531;
32723274
DEVELOPMENT_TEAM = "";
32733275
ENABLE_HARDENED_RUNTIME = YES;
32743276
GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -3284,7 +3286,7 @@
32843286
);
32853287
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
32863288
MACOSX_DEPLOYMENT_TARGET = 15.1;
3287-
MARKETING_VERSION = 4.1.2;
3289+
MARKETING_VERSION = 4.2b1;
32883290
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga.QuickLookPlugIn;
32893291
PRODUCT_NAME = "$(TARGET_NAME)";
32903292
SKIP_INSTALL = YES;
@@ -3302,7 +3304,7 @@
33023304
CODE_SIGN_IDENTITY = "Apple Development";
33033305
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
33043306
CODE_SIGN_STYLE = Automatic;
3305-
CURRENT_PROJECT_VERSION = 250521;
3307+
CURRENT_PROJECT_VERSION = 250531;
33063308
DEVELOPMENT_TEAM = "";
33073309
ENABLE_HARDENED_RUNTIME = YES;
33083310
GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -3318,7 +3320,7 @@
33183320
);
33193321
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
33203322
MACOSX_DEPLOYMENT_TARGET = 15.1;
3321-
MARKETING_VERSION = 4.1.2;
3323+
MARKETING_VERSION = 4.2b1;
33223324
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga.QuickLookPlugIn;
33233325
PRODUCT_NAME = "$(TARGET_NAME)";
33243326
SKIP_INSTALL = YES;

vAmiga.xcodeproj/xcuserdata/hoff.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -309,21 +309,5 @@
309309
landmarkType = "7">
310310
</BreakpointContent>
311311
</BreakpointProxy>
312-
<BreakpointProxy
313-
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
314-
<BreakpointContent
315-
uuid = "03ECEFC2-8E8E-452F-A525-038083CA7679"
316-
shouldBeEnabled = "Yes"
317-
ignoreCount = "0"
318-
continueAfterRunningActions = "No"
319-
filePath = "Emulator/VACore/Peripherals/Monitor/Monitor.cpp"
320-
startingColumnNumber = "9223372036854775807"
321-
endingColumnNumber = "9223372036854775807"
322-
startingLineNumber = "139"
323-
endingLineNumber = "139"
324-
landmarkName = "Monitor::checkOption(opt, value)"
325-
landmarkType = "7">
326-
</BreakpointContent>
327-
</BreakpointProxy>
328312
</Breakpoints>
329313
</Bucket>

0 commit comments

Comments
 (0)