Skip to content

Commit b3e5044

Browse files
committed
This is vAmiga 4.1.2
1 parent 20e312c commit b3e5044

File tree

7 files changed

+20
-16
lines changed

7 files changed

+20
-16
lines changed

Emulator/VAmiga/Misc/Recorder/RecorderTypes.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@ enum class RecState : long
2525
FINALIZE,
2626
ABORT
2727
};
28-
// typedef REC_STATE RecorderState;
2928

3029
struct RecStateEnum : Reflection<RecStateEnum, RecState>
3130
{
32-
static constexpr RecState minVal = RecState(0);
33-
static constexpr RecState maxVal = RecState::ABORT;
31+
static constexpr long minVal = 0;
32+
static constexpr long maxVal = long(RecState::ABORT);
3433

3534
static const char *_key(RecState value)
3635
{

Emulator/VAmiga/Utilities/Parser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ template <typename Enum> long parsePartialEnum(const string& key, std::function<
6969
for (auto c : key) { upper += (char)std::toupper(c); }
7070

7171
// Search all keys
72-
// for (isize i = Enum::minVal; i <= Enum::maxVal; i++) {
7372
for (const auto &i : Enum::elements()) {
7473

7574
if (!accept(long(i))) continue;

Emulator/VAmigaCheckScripts.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ static const char *smokeTestScript[] = {
6565
"amiga set VIDEO_FORMAT NTSC",
6666
"amiga set WARP_BOOT 0",
6767
"amiga set WARP_BOOT 10",
68-
68+
"amiga set WARP_MODE ALWAYS",
69+
"amiga set WARP_MODE AUTO",
70+
"amiga set WARP_MODE NEVER",
71+
6972
"amiga init A1000_OCS_1MB",
7073
"amiga init A500_OCS_1MB",
7174
"amiga init A500_ECS_1MB",

Emulator/VAmigaConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Version number
1717
static constexpr int VER_MAJOR = 4;
1818
static constexpr int VER_MINOR = 1;
19-
static constexpr int VER_SUBMINOR = 1;
19+
static constexpr int VER_SUBMINOR = 2;
2020
static constexpr int VER_BETA = 0;
2121

2222
// Snapshot version number

GUI/Metal/Layers/Console.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ class Console: Layer {
110110

111111
scrollView.setFrameSize(newSize)
112112
scrollView.frame.origin = CGPoint(x: origin.x, y: origin.y)
113+
114+
let drawableSize = controller.metal.drawableSize
115+
amiga.set(.HOST_FRAMEBUF_WIDTH, value: Int(drawableSize.width))
116+
amiga.set(.HOST_FRAMEBUF_HEIGHT, value: Int(drawableSize.height))
113117
}
114118

115119
func keyDown(with event: NSEvent) {

GUI/Metal/Renderer.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,6 @@ class Renderer: NSObject, MTKViewDelegate {
248248

249249
func mtkView(_ view: MTKView, drawableSizeWillChange size: CGSize) {
250250

251-
amiga.set(.HOST_FRAMEBUF_WIDTH, value: Int(size.width))
252-
amiga.set(.HOST_FRAMEBUF_HEIGHT, value: Int(size.height))
253251
reshape(withSize: size)
254252
}
255253

vAmiga.xcodeproj/project.pbxproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3147,7 +3147,7 @@
31473147
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
31483148
CODE_SIGN_STYLE = Manual;
31493149
COMBINE_HIDPI_IMAGES = YES;
3150-
CURRENT_PROJECT_VERSION = 250513;
3150+
CURRENT_PROJECT_VERSION = 250521;
31513151
DEAD_CODE_STRIPPING = YES;
31523152
DEVELOPMENT_TEAM = "";
31533153
ENABLE_APP_SANDBOX = NO;
@@ -3172,7 +3172,7 @@
31723172
"@executable_path/../Frameworks",
31733173
);
31743174
MACOSX_DEPLOYMENT_TARGET = 13.5;
3175-
MARKETING_VERSION = 4.1.1;
3175+
MARKETING_VERSION = 4.1.2;
31763176
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
31773177
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
31783178
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3202,8 +3202,9 @@
32023202
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
32033203
CODE_SIGN_STYLE = Manual;
32043204
COMBINE_HIDPI_IMAGES = YES;
3205-
CURRENT_PROJECT_VERSION = 250513;
3205+
CURRENT_PROJECT_VERSION = 250521;
32063206
DEAD_CODE_STRIPPING = YES;
3207+
DEBUG_INFORMATION_FORMAT = dwarf;
32073208
DEVELOPMENT_TEAM = "";
32083209
ENABLE_APP_SANDBOX = NO;
32093210
ENABLE_HARDENED_RUNTIME = YES;
@@ -3226,7 +3227,7 @@
32263227
);
32273228
LLVM_LTO = YES_THIN;
32283229
MACOSX_DEPLOYMENT_TARGET = 13.5;
3229-
MARKETING_VERSION = 4.1.1;
3230+
MARKETING_VERSION = 4.1.2;
32303231
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
32313232
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
32323233
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3250,7 +3251,7 @@
32503251
CODE_SIGN_IDENTITY = "Apple Development";
32513252
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
32523253
CODE_SIGN_STYLE = Automatic;
3253-
CURRENT_PROJECT_VERSION = 250513;
3254+
CURRENT_PROJECT_VERSION = 250521;
32543255
DEVELOPMENT_TEAM = "";
32553256
ENABLE_HARDENED_RUNTIME = YES;
32563257
GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -3266,7 +3267,7 @@
32663267
);
32673268
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
32683269
MACOSX_DEPLOYMENT_TARGET = 15.1;
3269-
MARKETING_VERSION = 4.1.1;
3270+
MARKETING_VERSION = 4.1.2;
32703271
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga.QuickLookPlugIn;
32713272
PRODUCT_NAME = "$(TARGET_NAME)";
32723273
SKIP_INSTALL = YES;
@@ -3284,7 +3285,7 @@
32843285
CODE_SIGN_IDENTITY = "Apple Development";
32853286
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
32863287
CODE_SIGN_STYLE = Automatic;
3287-
CURRENT_PROJECT_VERSION = 250513;
3288+
CURRENT_PROJECT_VERSION = 250521;
32883289
DEVELOPMENT_TEAM = "";
32893290
ENABLE_HARDENED_RUNTIME = YES;
32903291
GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -3300,7 +3301,7 @@
33003301
);
33013302
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
33023303
MACOSX_DEPLOYMENT_TARGET = 15.1;
3303-
MARKETING_VERSION = 4.1.1;
3304+
MARKETING_VERSION = 4.1.2;
33043305
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga.QuickLookPlugIn;
33053306
PRODUCT_NAME = "$(TARGET_NAME)";
33063307
SKIP_INSTALL = YES;

0 commit comments

Comments
 (0)