Skip to content

Commit c88baec

Browse files
committed
This is vAmiga 2.5b1
1 parent e7cd59f commit c88baec

File tree

5 files changed

+12
-23
lines changed

5 files changed

+12
-23
lines changed

Emulator/Misc/RegressionTester/RegressionTester.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ namespace vamiga {
1717

1818
class RegressionTester : public SubComponent {
1919

20-
// Pixel area ritten to the test image
2120
static constexpr isize X1 = 4 * 0x31;
2221
static constexpr isize Y1 = VBLANK_MAX + 1;
2322
static constexpr isize X2 = HPIXELS;
@@ -28,7 +27,7 @@ class RegressionTester : public SubComponent {
2827
// Filename of the test image
2928
string dumpTexturePath = "texture";
3029

31-
// Pixel ares observed by this regression test
30+
// Pixel area which is written to the test image
3231
isize x1 = X1;
3332
isize y1 = Y1;
3433
isize x2 = X2;

Emulator/config.h

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

1616
// Version number
1717
#define VER_MAJOR 2
18-
#define VER_MINOR 4
18+
#define VER_MINOR 5
1919
#define VER_SUBMINOR 0
20-
#define VER_BETA 0
20+
#define VER_BETA 1
2121

2222
// Snapshot version number
2323
#define SNP_MAJOR 2
24-
#define SNP_MINOR 4
24+
#define SNP_MINOR 5
2525
#define SNP_SUBMINOR 0
26-
#define SNP_BETA 0
26+
#define SNP_BETA 1
2727

2828
// Uncomment this setting in a release build
2929
// #define RELEASEBUILD

Resources/Credits.rtf

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{\rtf1\ansi\ansicpg1252\cocoartf2580
1+
{\rtf1\ansi\ansicpg1252\cocoartf2759
22
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\froman\fcharset0 Times-Roman;\f1\froman\fcharset0 Times-Bold;}
33
{\colortbl;\red255\green255\blue255;\red128\green128\blue128;}
44
{\*\expandedcolortbl;;\csgenericrgb\c50196\c50196\c50196;}
@@ -22,18 +22,8 @@
2222
\f0\b0 \cf2 \
2323
WWW: {\field{\*\fldinst{HYPERLINK "https://dirkwhoffmann.github.io/vAmiga"}}{\fldrslt dirkwhoffmann.github.io/vAmiga}}
2424
\f1\b \cf0 \
25+
\pard\tqr\tx2040\tx2235\pardirnatural\partightenfactor0
2526
2627
\f0\b0 \cf2 \
27-
\pard\tqr\tx880\tx1135\pardirnatural\partightenfactor0
28-
\cf2 \
29-
\pard\tqr\tx2040\tx2235\pardirnatural\partightenfactor0
30-
\cf2 License for the vAmiga base code:\
31-
\
32-
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.\
33-
\
34-
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\
35-
\
36-
Only our own original work is licensed under the terms of the GNU General Public License. The licenses of some libraries might impose different redistribution or general licensing terms than those stated in the GNU General Public License. Users and redistributors are hereby requested to verify these conditions and agree upon them.\
37-
\
3828
\
3929
}

Resources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
<key>NSAppleEventsUsageDescription</key>
157157
<string></string>
158158
<key>NSHumanReadableCopyright</key>
159-
<string>Copyright © 2023 Dirk Hoffmann. All rights reserved.</string>
159+
<string>Copyright © 2024 Dirk Hoffmann. All rights reserved.</string>
160160
<key>NSMainNibFile</key>
161161
<string>MainMenu</string>
162162
<key>NSPrincipalClass</key>

vAmiga.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2689,7 +2689,7 @@
26892689
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
26902690
CODE_SIGN_STYLE = Manual;
26912691
COMBINE_HIDPI_IMAGES = YES;
2692-
CURRENT_PROJECT_VERSION = 230425;
2692+
CURRENT_PROJECT_VERSION = 240119;
26932693
DEAD_CODE_STRIPPING = YES;
26942694
DEVELOPMENT_TEAM = "";
26952695
ENABLE_APP_SANDBOX = NO;
@@ -2709,7 +2709,7 @@
27092709
"@executable_path/../Frameworks",
27102710
);
27112711
MACOSX_DEPLOYMENT_TARGET = 11.0;
2712-
MARKETING_VERSION = 2.4;
2712+
MARKETING_VERSION = 2.5b1;
27132713
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
27142714
PRODUCT_NAME = "$(TARGET_NAME)";
27152715
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2736,7 +2736,7 @@
27362736
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
27372737
CODE_SIGN_STYLE = Manual;
27382738
COMBINE_HIDPI_IMAGES = YES;
2739-
CURRENT_PROJECT_VERSION = 230425;
2739+
CURRENT_PROJECT_VERSION = 240119;
27402740
DEAD_CODE_STRIPPING = YES;
27412741
DEVELOPMENT_TEAM = "";
27422742
ENABLE_APP_SANDBOX = NO;
@@ -2754,7 +2754,7 @@
27542754
);
27552755
LLVM_LTO = YES_THIN;
27562756
MACOSX_DEPLOYMENT_TARGET = 11.0;
2757-
MARKETING_VERSION = 2.4;
2757+
MARKETING_VERSION = 2.5b1;
27582758
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
27592759
PRODUCT_NAME = "$(TARGET_NAME)";
27602760
PROVISIONING_PROFILE_SPECIFIER = "";

0 commit comments

Comments
 (0)