diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml new file mode 100644 index 0000000..ae1043a --- /dev/null +++ b/.github/workflows/cmake.yml @@ -0,0 +1,38 @@ +name: CMake + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +env: + BUILD_TYPE: Release + +jobs: + build: + runs-on: ${{ matrix.os }} + continue-on-error: ${{ matrix.allow_failure }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-latest ] + allow_failure: [ false ] + # include: + # - os: macos-latest + # allow_failure: true + + steps: + - uses: actions/checkout@v2 + with: + submodules: true + + - name: Install needed dependencies + run: sudo apt update && sudo apt install xorg-dev libglu1-mesa-dev + + - name: Configure CMake + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Build + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 0000000..b21a6ab --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,62 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ master ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ master ] + schedule: + - cron: '43 19 * * 5' + +env: + BUILD_TYPE: Debug + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'cpp' ] + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + with: + submodules: true + + - name: Install needed dependencies + run: sudo apt update && sudo apt install xorg-dev libglu1-mesa-dev + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + + - name: Running Cmake + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Building + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 diff --git a/README.md b/README.md index f310e94..9421ae6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ NewOswan *(name likely to change)* ================================== -![TravisBadge](https://travis-ci.org/Godzil/NewOswan.svg?branch=master) +[![CMake](https://github.com/Godzil/NewOswan/actions/workflows/cmake.yml/badge.svg)](https://github.com/Godzil/NewOswan/actions/workflows/cmake.yml) ### What is this project? NewOswan is a WonderSwan emulator originally based on oswan-unix and heavily modified to be more accurate and better diff --git a/source/includes/rom.h b/source/includes/rom.h index ae01973..dc92d27 100644 --- a/source/includes/rom.h +++ b/source/includes/rom.h @@ -50,10 +50,10 @@ typedef struct ws_romHeaderStruct { /* Miss "Fixed Data" (F5h) */ - uint8_t developperId; /* Maker Code L */ + uint8_t developperId; /* Maker Code L */ uint8_t minimumSupportSystem; /* Maker Code H */ uint8_t cartId; /* Title code */ - uint8_t gameVertion; /* Version */ + uint8_t gameVersion; /* Version */ uint8_t romSize; /* ROM Size */ uint8_t saveSize; /* XROM/XEROM Size */ uint8_t cartFlags; /* Boot loader */