still not working

Roeegg2 · Jan 4, 2024 · 4559ed2 · 4559ed2
1 parent e565936
commit 4559ed2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/build.sh b/build.sh
@@ -12,14 +12,13 @@ fi
 
 echo "Building emulator..."
 
-g++ -g -c src/main.cpp -o main.o
-
 g++ -g -c src/cpu.cpp -o cpu.o
-# g++ -g -c src/ppu.cpp -o ppu.o
+g++ -g -c src/ppu.cpp -o ppu.o
 g++ -g -c src/operations.cpp -o operations.o
 g++ -g -c src/bus.cpp -o bus.o
 g++ -g -c src/utils.cpp -o util.o
 g++ -g -c src/mapper_n_cart.cpp -o mapper_n_cart.o
+g++ -g -c src/main.cpp -o main.o
 
 g++ -g -c src/mappers/nrom_0.cpp -o nrom_0.o
 

diff --git a/include/bus.h b/include/bus.h
@@ -3,9 +3,9 @@
 
 #include <cstdint>
 
-#include "mapper_n_cart.h"
-// #include "ppu.h"
-#include "cpu.h"
+#include "../include/mapper_n_cart.h"
+#include "../include/ppu.h"
+#include "../include/cpu.h"
 
 class Bus{
 public:

diff --git a/include/cpu.h b/include/cpu.h
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <vector>
 
-#include "bus.h"
+#include "../include/bus.h"
 
 #define IRQ_CYCLES 7
 #define NMI_CYCLES 8

diff --git a/include/ppu.h b/include/ppu.h
@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-#include "bus.h"
+#include "../include/bus.h"
 
 class PPU {
 public:

diff --git a/src/main.cpp b/src/main.cpp
@@ -4,7 +4,7 @@
 // #include <SDL2/SDL.h>
 
 #include "../include/cpu.h"
-// #include "../include/ppu.h"
+#include "../include/ppu.h"
 #include "../include/bus.h"
 #include "../include/utils.h"
 
@@ -13,7 +13,7 @@ int main(){
 
     Bus bus = Bus(Mapper::create_mapper("testr/gameroms/Donkey Kong (U) (PRG1) [!p](1).nes"));
     CPU cpu = CPU(&bus);
-    // PPU ppu = PPU(&bus);
+    PPU ppu = PPU(&bus);
 
     for (int i = 0; i < 10; i++){
         cpu.log();