From 4529e50280eba8c9c3c2e4639726ad3e9ca172f2 Mon Sep 17 00:00:00 2001
From: Anthony Pesch <inolen@gmail.com>
Date: Tue, 11 Apr 2017 18:21:44 -0400
Subject: [PATCH] removed emu/ subdirectory

---
 CMakeLists.txt           | 6 +++---
 src/{emu => }/emulator.c | 2 +-
 src/{emu => }/emulator.h | 0
 src/main.c               | 4 ++--
 src/{emu => }/tracer.c   | 2 +-
 src/{emu => }/tracer.h   | 0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename src/{emu => }/emulator.c (99%)
 rename src/{emu => }/emulator.h (100%)
 rename src/{emu => }/tracer.c (99%)
 rename src/{emu => }/tracer.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae6d665c..2d5685b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,8 +162,6 @@ set(REDREAM_SOURCES
   src/core/ringbuf.cc
   src/core/rb_tree.c
   src/core/string.c
-  src/emu/emulator.c
-  src/emu/tracer.c
   src/hw/aica/aica.c
   src/hw/arm7/arm7.c
   src/hw/gdrom/disc.c
@@ -219,7 +217,9 @@ set(REDREAM_SOURCES
   src/ui/keycode.c
   src/ui/nuklear.c
   src/ui/window.c
-  src/video/gl_backend.c)
+  src/video/gl_backend.c
+  src/emulator.c
+  src/tracer.c)
 
 if(PLATFORM_WINDOWS)
   list(APPEND REDREAM_DEFS PLATFORM_WINDOWS=1)
diff --git a/src/emu/emulator.c b/src/emulator.c
similarity index 99%
rename from src/emu/emulator.c
rename to src/emulator.c
index d27cb170..2203f978 100644
--- a/src/emu/emulator.c
+++ b/src/emulator.c
@@ -1,4 +1,4 @@
-#include "emu/emulator.h"
+#include "emulator.h"
 #include "audio/audio_backend.h"
 #include "core/option.h"
 #include "core/profiler.h"
diff --git a/src/emu/emulator.h b/src/emulator.h
similarity index 100%
rename from src/emu/emulator.h
rename to src/emulator.h
diff --git a/src/main.c b/src/main.c
index 306f1293..91d99a3b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,9 +1,9 @@
 #include "core/log.h"
 #include "core/option.h"
 #include "core/profiler.h"
-#include "emu/emulator.h"
-#include "emu/tracer.h"
+#include "emulator.h"
 #include "sys/filesystem.h"
+#include "tracer.h"
 #include "ui/window.h"
 
 DEFINE_OPTION_INT(help, 0, "Show help");
diff --git a/src/emu/tracer.c b/src/tracer.c
similarity index 99%
rename from src/emu/tracer.c
rename to src/tracer.c
index 191bf63c..2355a01b 100644
--- a/src/emu/tracer.c
+++ b/src/tracer.c
@@ -1,4 +1,4 @@
-#include "emu/tracer.h"
+#include "tracer.h"
 #include "core/math.h"
 #include "hw/pvr/ta.h"
 #include "hw/pvr/tr.h"
diff --git a/src/emu/tracer.h b/src/tracer.h
similarity index 100%
rename from src/emu/tracer.h
rename to src/tracer.h