From c396c0b0e6128cefda8de9991e9b097bd0d8e701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= <clement.le-bihan@epitech.eu>
Date: Thu, 13 Feb 2020 19:13:07 +0100
Subject: [PATCH] merge and fx cmake

---
 CMakeLists.txt      | 11 +++++++++--
 sources/PPU/PPU.cpp |  2 --
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f57a054..09d4aca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
diff --git a/sources/PPU/PPU.cpp b/sources/PPU/PPU.cpp
index 4afa46f..ab655f8 100644
--- a/sources/PPU/PPU.cpp
+++ b/sources/PPU/PPU.cpp
@@ -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];