Move the SFML emulator files to thier own folder

JustDoom · Mar 31, 2024 · dd8c779 · dd8c779
1 parent 933d56d
commit dd8c779
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 18 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,9 +1,4 @@
-add_executable(8ChocChip
-        sfml/SfmlSpeaker.h
-        sfml/SfmlRenderer.cpp
-        sfml/SfmlRenderer.h
-        sfml/SfmlKeyboard.cpp
-        sfml/SfmlKeyboard.h)
+add_executable(8ChocChip)
 
 add_subdirectory(sfml)
 add_subdirectory(util)

diff --git a/src/emulator/CMakeLists.txt b/src/emulator/CMakeLists.txt
@@ -4,5 +4,5 @@ target_sources(8ChocChip PRIVATE Cpu.cpp
         Keyboard.h
         Renderer.cpp
         Renderer.h
-        ../sfml/SfmlSpeaker.cpp
+        ../sfml/emulator/SfmlSpeaker.cpp
         Speaker.h)
diff --git a/src/main.cpp b/src/main.cpp
@@ -4,10 +4,10 @@
 #include <iostream>
 
 #include "emulator/Cpu.h"
-#include "sfml/SfmlKeyboard.h"
-#include "sfml/SfmlRenderer.h"
-#include "sfml/SfmlSpeaker.h"
 #include "fstream"
+#include "sfml/emulator/SfmlKeyboard.h"
+#include "sfml/emulator/SfmlRenderer.h"
+#include "sfml/emulator/SfmlSpeaker.h"
 
 #include "sfml/ui/TextButton.h"
 #include "util/MiscUtil.h"

diff --git a/src/sfml/CMakeLists.txt b/src/sfml/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(8ChocChip PRIVATE SfmlSpeaker.cpp
-        SfmlSpeaker.h)
+#target_sources(8ChocChip PRIVATE)
 
-add_subdirectory(ui)
+add_subdirectory(ui)
+add_subdirectory(emulator)
diff --git a/src/sfml/emulator/CMakeLists.txt b/src/sfml/emulator/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(8ChocChip PRIVATE
+        SfmlSpeaker.cpp
+        SfmlSpeaker.h
+        SfmlRenderer.cpp
+        SfmlRenderer.h
+        SfmlKeyboard.cpp
+        SfmlKeyboard.h)
diff --git a/src/sfml/SfmlKeyboard.cpp → src/sfml/emulator/SfmlKeyboard.cpp b/src/sfml/SfmlKeyboard.cpp → src/sfml/emulator/SfmlKeyboard.cpp
diff --git a/src/sfml/SfmlKeyboard.h → src/sfml/emulator/SfmlKeyboard.h b/src/sfml/SfmlKeyboard.h → src/sfml/emulator/SfmlKeyboard.h
@@ -1,7 +1,7 @@
 #ifndef INC_8CHOCCHIP_SFMLKEYBOARD_H
 #define INC_8CHOCCHIP_SFMLKEYBOARD_H
 
-#include "../emulator/Keyboard.h"
+#include "../../emulator/Keyboard.h"
 
 class SfmlKeyboard : public Keyboard {
 public:

diff --git a/src/sfml/SfmlRenderer.cpp → src/sfml/emulator/SfmlRenderer.cpp b/src/sfml/SfmlRenderer.cpp → src/sfml/emulator/SfmlRenderer.cpp
diff --git a/src/sfml/SfmlRenderer.h → src/sfml/emulator/SfmlRenderer.h b/src/sfml/SfmlRenderer.h → src/sfml/emulator/SfmlRenderer.h
@@ -1,9 +1,9 @@
 #ifndef INC_8CHOCCHIP_SFMLRENDERER_H
 #define INC_8CHOCCHIP_SFMLRENDERER_H
 
-#include <SFML/Graphics.hpp>
+#include "SFML/Graphics.hpp"
 
-#include "../emulator/Renderer.h"
+#include "../../emulator/Renderer.h"
 
 class SfmlRenderer : public Renderer {
 private:

diff --git a/src/sfml/SfmlSpeaker.cpp → src/sfml/emulator/SfmlSpeaker.cpp b/src/sfml/SfmlSpeaker.cpp → src/sfml/emulator/SfmlSpeaker.cpp
diff --git a/src/sfml/SfmlSpeaker.h → src/sfml/emulator/SfmlSpeaker.h b/src/sfml/SfmlSpeaker.h → src/sfml/emulator/SfmlSpeaker.h
@@ -1,8 +1,8 @@
 #ifndef INC_8CHOCCHIP_SFMLSPEAKER_H
 #define INC_8CHOCCHIP_SFMLSPEAKER_H
 
-#include <SFML/Audio.hpp>
-#include "../emulator/Speaker.h"
+#include "../../emulator/Speaker.h"
+#include "SFML/Audio.hpp"
 
 class SfmlSpeaker : public Speaker {
 private: