zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-05-26 15:59:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge and fx cmake

Browse Source
This commit is contained in:
Clément Le Bihan
2020-02-13 19:13:07 +01:00
parent e662c4829a
commit c396c0b0e6
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+9 -2
View File
@@ -60,7 +60,10 @@ add_executable(unit_tests
tests/CPU/Math/testADC.cpp
tests/CPU/testStore.cpp
sources/CPU/Instructions/InternalInstruction.cpp
tests/CPU/testInternal.cpp)
tests/CPU/testInternal.cpp
sources/Ram/ExtendedRam.cpp
sources/Ram/ExtendedRam.hpp
)
# include criterion & coverage
target_link_libraries(unit_tests criterion -lgcov)
@@ -112,7 +115,11 @@ add_executable(ComSquare
sources/Exceptions/InvalidOpcode.hpp
sources/CPU/Instructions/Interrupts.cpp
sources/CPU/Instructions/MathematicalOperations.cpp
sources/CPU/Instructions/MemoryInstructions.cpp sources/CPU/Instructions/InternalInstruction.cpp sources/Ram/ExtendedRam.cpp sources/Ram/ExtendedRam.hpp)
sources/CPU/Instructions/MemoryInstructions.cpp
sources/CPU/Instructions/InternalInstruction.cpp
sources/Ram/ExtendedRam.cpp
sources/Ram/ExtendedRam.hpp
)
target_link_libraries(ComSquare
sfml-graphics
sources/PPU/PPU.cpp
-2
View File
@@ -203,8 +203,6 @@ namespace ComSquare::PPU
_vram(64000),
_oamram(544),
_cgram(512)
_renderer(renderer),
_bus(std::move(bus))
{
this->_isLowByte = true;
//_vram = new uint16_t[32000];