Skip to content

Commit

Permalink
Update version from 1.6 to 1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
fleroviux committed Mar 26, 2023
1 parent 942d2d8 commit 1bcdaa3
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
30 changes: 15 additions & 15 deletions docs/ACCURACY.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@

Comparison of NBA and other emulators on the [mGBA test suite](https://github.com/mgba-emu/suite) by endrift:

Testname | Test Count | NanoBoyAdvance (dev) | NanoBoyAdvance 1.6 | mGBA 0.10.1 | VBA-M 2.1.5 | Ares v131 | SkyEmu V2 |
--------------|------------|----------------------|--------------------|-------------|----------------|-----------|------------|
Memory | 1552 | 1552 | 1552 | 1552 | 1426 | 1552 | 1552 |
IO read | 130 | 130 | 126 | 120 | 100 | 124 | 125 |
Timing | 2020 | 2020 | 2020 | 1768 | 1024 | 1570 | 2020 |
Timer | 936 | 936 | 903 | 744 | 440 | 454 | 587 |
Timer IRQ | 90 | 90 | 90 | 70 | 8 | 0 | 90 |
Shifter | 140 | 140 | 140 | 140 | 132 | 132 | 140 |
Carry | 93 | 93 | 93 | 93 | 93 | 93 | 93 |
Multiply Long | 72 | 52 | 52 | 52 | 52 | 52 | 52 |
BIOS math | 615 | 615 | 615 | 615 | 615 | 615 | 615 |
DMA tests | 1256 | 1256 | 1256 | 1232 | 1068 | 1212 | 1256 |
Misc Edge Case| 10[^1] | 9 | 8 | 4 | 7 | 1 | 3 |
Layer Toggle | 1 | pass | pass | fail | pass | fail | pass |
OAM Update | 1 | pass | pass | fail | fail | fail | pass |
Testname | Test Count | NanoBoyAdvance 1.7 | mGBA 0.10.1 | VBA-M 2.1.5 | Ares v131 | SkyEmu V2 |
--------------|------------|--------------------|-------------|----------------|-----------|------------|
Memory | 1552 | 1552 | 1552 | 1426 | 1552 | 1552 |
IO read | 130 | 130 | 120 | 100 | 124 | 125 |
Timing | 2020 | 2020 | 1768 | 1024 | 1570 | 2020 |
Timer | 936 | 936 | 744 | 440 | 454 | 587 |
Timer IRQ | 90 | 90 | 70 | 8 | 0 | 90 |
Shifter | 140 | 140 | 140 | 132 | 132 | 140 |
Carry | 93 | 93 | 93 | 93 | 93 | 93 |
Multiply Long | 72 | 52 | 52 | 52 | 52 | 52 |
BIOS math | 615 | 615 | 615 | 615 | 615 | 615 |
DMA tests | 1256 | 1256 | 1232 | 1068 | 1212 | 1256 |
Misc Edge Case| 10[^1] | 9 | 4 | 7 | 1 | 3 |
Layer Toggle | 1 | pass | fail | pass | fail | pass |
OAM Update | 1 | pass | fail | fail | fail | pass |

[^1]: Real hardware passes 9/10 tests.

Expand Down
6 changes: 3 additions & 3 deletions src/platform/qt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ if (APPLE AND MACOS_BUILD_APP_BUNDLE)
set(MACOSX_BUNDLE_ICON_FILE "NanoBoyAdvance.icns")
set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.github.nba-emu.NanoBoyAdvance")
set(MACOSX_BUNDLE_INFO_STRING "Game Boy Advance emulator")
set(MACOSX_BUNDLE_SHORT_VERSION_STRING "1.6")
set(MACOSX_BUNDLE_LONG_VERSION_STRING "1.6")
set(MACOSX_BUNDLE_BUNDLE_VERSION "1.6")
set(MACOSX_BUNDLE_SHORT_VERSION_STRING "1.7")
set(MACOSX_BUNDLE_LONG_VERSION_STRING "1.7")
set(MACOSX_BUNDLE_BUNDLE_VERSION "1.7")

list(APPEND RESOURCES rc/NanoBoyAdvance.icns)
add_executable(NanoBoyAdvance-Qt MACOSX_BUNDLE ${SOURCES} ${HEADERS} ${RESOURCES})
Expand Down
8 changes: 4 additions & 4 deletions src/platform/qt/rc/app.rc
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
IDI_ICON1 ICON DISCARDABLE "app.ico"

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,6
PRODUCTVERSION 1,6
FILEVERSION 1,7
PRODUCTVERSION 1,7
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "fleroviux"
VALUE "FileDescription", "NanoBoyAdvance"
VALUE "FileVersion", "1.6"
VALUE "FileVersion", "1.7"
VALUE "InternalName", "NanoBoyAdvance.exe"
VALUE "LegalCopyright", "(c) 2015 - 2023 fleroviux"
VALUE "OriginalFilename", "NanoBoyAdvance.exe"
VALUE "ProductName", "NanoBoyAdvance"
VALUE "ProductVersion", "1.6"
VALUE "ProductVersion", "1.7"
END
END

Expand Down
8 changes: 4 additions & 4 deletions src/platform/qt/src/widget/main_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ MainWindow::MainWindow(
QApplication* app,
QWidget* parent
) : QMainWindow(parent) {
setWindowTitle("NanoBoyAdvance 1.6");
setWindowTitle("NanoBoyAdvance 1.7");
setAcceptDrops(true);

screen = std::make_shared<Screen>(this, config);
Expand Down Expand Up @@ -61,9 +61,9 @@ MainWindow::MainWindow(
connect(this, &MainWindow::UpdateFrameRate, this, [this](int fps) {
if(config->window.show_fps) {
auto percent = fps / 59.7275 * 100;
setWindowTitle(QString::fromStdString(fmt::format("NanoBoyAdvance 1.6 [{} fps | {:.2f}%]", fps, percent)));
setWindowTitle(QString::fromStdString(fmt::format("NanoBoyAdvance 7 [{} fps | {:.2f}%]", fps, percent)));
} else {
setWindowTitle("NanoBoyAdvance 1.6");
setWindowTitle("NanoBoyAdvance 1.7");
}
}, Qt::QueuedConnection);

Expand Down Expand Up @@ -641,7 +641,7 @@ void MainWindow::Stop() {
game_loaded = false;
RenderSaveStateMenus();

setWindowTitle("NanoBoyAdvance 1.6");
setWindowTitle("NanoBoyAdvance 1.7");

UpdateMenuBarVisibility();
}
Expand Down

0 comments on commit 1bcdaa3

Please sign in to comment.