diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..8251730f --- /dev/null +++ b/.clang-format @@ -0,0 +1,14 @@ +BasedOnStyle: Google +IndentWidth: 4 +ColumnLimit: 120 +AccessModifierOffset: -2 +TabWidth: 4 +NamespaceIndentation: All +UseTab: ForContinuationAndIndentation +AllowShortEnumsOnASingleLine: true +AllowShortCaseLabelsOnASingleLine: true +AllowShortFunctionsOnASingleLine: true +AllowShortIfStatementsOnASingleLine: true +Cpp11BracedListStyle: true +PackConstructorInitializers: BinPack +AlignAfterOpenBracket: BlockIndent diff --git a/.github/workflows/Windows_Build.yml b/.github/workflows/Windows_Build.yml new file mode 100644 index 00000000..0a4abe41 --- /dev/null +++ b/.github/workflows/Windows_Build.yml @@ -0,0 +1,39 @@ +name: Windows 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' 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, diff --git a/readme.md b/readme.md index 8631d18f..6047f19b 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,13 @@ # Panda3DS +[](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/Windows_Build.yml) [](https://github.com/wheremyfoodat/Panda3DS/actions/workflows/MacOS_Build.yml) [](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! +# Discussion +Join our Discord server by pressing on the banner below! + +[](https://discord.gg/ZYbugsEmsw) +    # Compatibility