From 2237172204fc5ac8ef9c00591314ecf6c4c547c1 Mon Sep 17 00:00:00 2001 From: AnonymusRaccoon Date: Thu, 6 Feb 2020 09:51:10 +0100 Subject: [PATCH] Starting to create the CI for windows --- .github/workflows/buildwin.yml | 31 +++++++++++++++++++++++++++++++ sources/Memory/MemoryBus.cpp | 3 +-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/buildwin.yml diff --git a/.github/workflows/buildwin.yml b/.github/workflows/buildwin.yml new file mode 100644 index 0000000..7b6f676 --- /dev/null +++ b/.github/workflows/buildwin.yml @@ -0,0 +1,31 @@ +name: Build commit artifact + +on: + push: + branches: + - master + +jobs: + Building: + runs-on: [windows-latest] + + steps: + - uses: actions/checkout@v1 + - name: Install the SFML. + run: | + Invoke-WebRequest -Uri https://www.sfml-dev.org/files/SFML-2.5.1-windows-gcc-7.3.0-mingw-64-bit.zip -OutFile sfml.zip + Expand-Archive sfml.zip -DestinationPath . -Force + Move-Item -Path SFML-2.5.1 -Destination build + - name: Build Makefile with CMake + run: | + Set-Location build + cmake .. -G "MinGW Makefiles" -DCMAKE_SH="CMAKE_SH-NOTFOUND" + - name: Build with Makefile + run: mingw32-make -C build ComSquare + - name: Copy shared libs + run: Copy-Item -Path 'C:\Program Files\Git\mingw64\bin\*.dll' -Destination build + - name: Archive production artifact + uses: actions/upload-artifact@v1 + with: + name: ComSquare-Windows + path: build/ \ No newline at end of file diff --git a/sources/Memory/MemoryBus.cpp b/sources/Memory/MemoryBus.cpp index 30f0c0b..253aed3 100644 --- a/sources/Memory/MemoryBus.cpp +++ b/sources/Memory/MemoryBus.cpp @@ -80,8 +80,6 @@ namespace ComSquare::Memory for (uint24_t i = 0x800000; i < 0xC00000; i += 0x10000) this->_mirrorComponents(console, i); - // TODO should map SRam, cartridge etc via the mapping mode of the cartridge. - if (console.cartridge->header.mappingMode & Cartridge::LoRom) { console.cartridge->setMemoryRegion(0x80, 0xFF, 0x8000, 0xFFFF); this->_memoryAccessors.push_back(console.cartridge); @@ -94,5 +92,6 @@ namespace ComSquare::Memory this->_memoryAccessors.push_back(console.sram); this->_memoryAccessors.emplace_back(new Memory::RectangleShadow(console.sram, 0xFE, 0xFF, 0x0000, 0x7FFF)); } + // TODO should implement HiRom. } } \ No newline at end of file