From fea1bbf3ace17271d61b4061f2404b8ecfe180c2 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 14 Jun 2023 12:12:39 +0300 Subject: [PATCH 1/9] Create Windows_Build.yml --- .github/workflows/Windows_Build.yml | 39 +++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/Windows_Build.yml diff --git a/.github/workflows/Windows_Build.yml b/.github/workflows/Windows_Build.yml new file mode 100644 index 00000000..95abf2b6 --- /dev/null +++ b/.github/workflows/Windows_Build.yml @@ -0,0 +1,39 @@ +name: Linux Build + +on: + push: + branches: + - master + pull_request: + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +jobs: + build: + # The CMake configure and build commands are platform agnostic and should work equally + # well on Windows or Mac. You can convert this to a matrix build if you need + # cross-platform coverage. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + - name: Fetch submodules + run: git submodule update --init --recursive + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + + - name: Upload executable + uses: actions/upload-artifact@v2 + with: + name: Windows executable + path: './build/Release/Alber.exe' From bef2593ed26b33f4d571fbf57a75e61bee0c6209 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 14 Jun 2023 12:13:24 +0300 Subject: [PATCH 2/9] Update Windows_Build.yml --- .github/workflows/Windows_Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Windows_Build.yml b/.github/workflows/Windows_Build.yml index 95abf2b6..0a4abe41 100644 --- a/.github/workflows/Windows_Build.yml +++ b/.github/workflows/Windows_Build.yml @@ -1,4 +1,4 @@ -name: Linux Build +name: Windows Build on: push: From 1aa59f5e5149c22034e46ceb17af40319df4aa41 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 14 Jun 2023 12:38:30 +0300 Subject: [PATCH 3/9] Add CI stickers --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 8631d18f..46b57e0d 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,5 @@ # Panda3DS +[![Windows Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Windows_Build.yml/badge.svg?branch=master)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Windows_Build.yml) [![MacOS Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/MacOS_Build.yml/badge.svg?branch=master)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/MacOS_Build.yml) [![Linux Build](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Linux_Build.yml/badge.svg?branch=master)](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Linux_Build.yml) Panda3DS is an HLE, red-panda-themed Nintendo 3DS emulator written in C++ which started out as a fun project out of curiosity, but evolved into something that can sort of play games! From e55a4ab04b29e3140547c7938f9bc4f3a37e77b1 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 15 Jun 2023 03:55:33 +0300 Subject: [PATCH 4/9] Add discord badge in readme --- readme.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/readme.md b/readme.md index 46b57e0d..2e776f68 100644 --- a/readme.md +++ b/readme.md @@ -3,6 +3,11 @@ Panda3DS is an HLE, red-panda-themed Nintendo 3DS emulator written in C++ which started out as a fun project out of curiosity, but evolved into something that can sort of play games! +# Discussion +Join our Discord server by pressing on the banner below! + +[![Discord Banner 2](https://discordapp.com/api/guilds/[1118695732958994532]/widget.png?style=banner2)](https://discord.gg/TNhR4hQS) + ![screenshot1](docs/img/MK7_Car_Select.png) ![screenshot2](docs/img/OoT_Title.png) ![screenshot3](docs/img/Mayro.png) # Compatibility From 2e4ae1328ae0c7d336688157eee2891eb0ba2345 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 15 Jun 2023 04:02:44 +0300 Subject: [PATCH 5/9] Add Discord badge for real --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 2e776f68..23d8d3a0 100644 --- a/readme.md +++ b/readme.md @@ -6,7 +6,7 @@ Panda3DS is an HLE, red-panda-themed Nintendo 3DS emulator written in C++ which # Discussion Join our Discord server by pressing on the banner below! -[![Discord Banner 2](https://discordapp.com/api/guilds/[1118695732958994532]/widget.png?style=banner2)](https://discord.gg/TNhR4hQS) +![Discord Banner 2](https://discord.com/api/guilds/1118695732958994532/widget.png?style=banner2) ![screenshot1](docs/img/MK7_Car_Select.png) ![screenshot2](docs/img/OoT_Title.png) ![screenshot3](docs/img/Mayro.png) From dd0831361db84de2543a762a90022deb396e7e54 Mon Sep 17 00:00:00 2001 From: Wunkolo Date: Wed, 14 Jun 2023 21:36:30 -0700 Subject: [PATCH 6/9] Add `.clang-format` Use the command `clang-format -i tests/**/*.c src/**/*.cpp include/**/*.hpp` to process all of the project's files. Using the one from [pcsx-redux](https://github.com/grumpycoders/pcsx-redux/blob/main/src/.clang-format) as a basis and then made additional edits to be the _least_ disruptive to the pre-existing formatting patterns. --- .clang-format | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..9049d7a0 --- /dev/null +++ b/.clang-format @@ -0,0 +1,14 @@ +BasedOnStyle: Google +IndentWidth: 4 +ColumnLimit: 120 +AccessModifierOffset: -2 +TabWidth: 4 +NamespaceIndentation: All +UseTab: ForContinuationAndIndentation +AllowShortEnumsOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: true +AllowShortFunctionsOnASingleLine: false +AllowShortIfStatementsOnASingleLine: false +Cpp11BracedListStyle: true +PackConstructorInitializers: BinPack +AlignAfterOpenBracket: BlockIndent From 9095bf4445494f0b63020ce950663598ede58411 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 15 Jun 2023 11:44:49 +0300 Subject: [PATCH 7/9] Update .clang-format --- .clang-format | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.clang-format b/.clang-format index 9049d7a0..8251730f 100644 --- a/.clang-format +++ b/.clang-format @@ -5,10 +5,10 @@ AccessModifierOffset: -2 TabWidth: 4 NamespaceIndentation: All UseTab: ForContinuationAndIndentation -AllowShortEnumsOnASingleLine: false +AllowShortEnumsOnASingleLine: true AllowShortCaseLabelsOnASingleLine: true -AllowShortFunctionsOnASingleLine: false -AllowShortIfStatementsOnASingleLine: false +AllowShortFunctionsOnASingleLine: true +AllowShortIfStatementsOnASingleLine: true Cpp11BracedListStyle: true PackConstructorInitializers: BinPack AlignAfterOpenBracket: BlockIndent From d4e2e785569a4d315fc91e58283bc7d9f1049efe Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Thu, 15 Jun 2023 19:42:20 +0300 Subject: [PATCH 8/9] Fix Discord link --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 23d8d3a0..6047f19b 100644 --- a/readme.md +++ b/readme.md @@ -6,7 +6,7 @@ Panda3DS is an HLE, red-panda-themed Nintendo 3DS emulator written in C++ which # Discussion Join our Discord server by pressing on the banner below! -![Discord Banner 2](https://discord.com/api/guilds/1118695732958994532/widget.png?style=banner2) +[![Discord Banner 2](https://discord.com/api/guilds/1118695732958994532/widget.png?style=banner2)](https://discord.gg/ZYbugsEmsw) ![screenshot1](docs/img/MK7_Car_Select.png) ![screenshot2](docs/img/OoT_Title.png) ![screenshot3](docs/img/Mayro.png) From 0199918cd25d2f9988ed323d54d3bf09d1e41a01 Mon Sep 17 00:00:00 2001 From: Wunkolo Date: Fri, 16 Jun 2023 05:48:33 -0700 Subject: [PATCH 9/9] Add missing header for regs.hpp This enum was using the `u32` type without including `helpers.hpp`, causing weird intermediate compiler errors when making incremental builds. --- include/PICA/regs.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/PICA/regs.hpp b/include/PICA/regs.hpp index 8ef46e67..0b3246db 100644 --- a/include/PICA/regs.hpp +++ b/include/PICA/regs.hpp @@ -1,4 +1,5 @@ #pragma once +#include "helpers.hpp" namespace PICAInternalRegs { enum : u32 { @@ -71,7 +72,7 @@ namespace PICAInternalRegs { FixedAttribData0 = 0x233, FixedAttribData1 = 0x234, FixedAttribData2 = 0x235, - + // Command processor registers CmdBufSize0 = 0x238, CmdBufSize1 = 0x239,