From 716d9feab095ca84fe0738655eea92cc8a3d2099 Mon Sep 17 00:00:00 2001 From: bgk Date: Thu, 1 Jan 2009 14:52:03 +0000 Subject: [PATCH] No need to use cryptic names --- CMakeLists.txt | 22 +++++++++++----------- src/{dmg => gb}/GB.cpp | 0 src/{dmg => gb}/gb.h | 0 src/{dmg => gb}/gbCheats.cpp | 0 src/{dmg => gb}/gbCheats.h | 0 src/{dmg => gb}/gbCodes.h | 0 src/{dmg => gb}/gbCodesCB.h | 0 src/{dmg => gb}/gbDis.cpp | 0 src/{dmg => gb}/gbGfx.cpp | 0 src/{dmg => gb}/gbGlobals.cpp | 0 src/{dmg => gb}/gbGlobals.h | 0 src/{dmg => gb}/gbMemory.cpp | 0 src/{dmg => gb}/gbMemory.h | 0 src/{dmg => gb}/gbPrinter.cpp | 0 src/{dmg => gb}/gbPrinter.h | 0 src/{dmg => gb}/gbSGB.cpp | 0 src/{dmg => gb}/gbSGB.h | 0 src/{dmg => gb}/gbSound.cpp | 0 src/{dmg => gb}/gbSound.h | 0 src/gtk/system.cpp | 2 -- src/gtk/window.cpp | 7 +++---- src/gtk/windowcallbacks.cpp | 7 +++---- src/sdl/SDL.cpp | 8 ++++---- 23 files changed, 21 insertions(+), 25 deletions(-) rename src/{dmg => gb}/GB.cpp (100%) rename src/{dmg => gb}/gb.h (100%) rename src/{dmg => gb}/gbCheats.cpp (100%) rename src/{dmg => gb}/gbCheats.h (100%) rename src/{dmg => gb}/gbCodes.h (100%) rename src/{dmg => gb}/gbCodesCB.h (100%) rename src/{dmg => gb}/gbDis.cpp (100%) rename src/{dmg => gb}/gbGfx.cpp (100%) rename src/{dmg => gb}/gbGlobals.cpp (100%) rename src/{dmg => gb}/gbGlobals.h (100%) rename src/{dmg => gb}/gbMemory.cpp (100%) rename src/{dmg => gb}/gbMemory.h (100%) rename src/{dmg => gb}/gbPrinter.cpp (100%) rename src/{dmg => gb}/gbPrinter.h (100%) rename src/{dmg => gb}/gbSGB.cpp (100%) rename src/{dmg => gb}/gbSGB.h (100%) rename src/{dmg => gb}/gbSound.cpp (100%) rename src/{dmg => gb}/gbSound.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12c4fb46..10497b7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,16 +146,16 @@ SET(SRC_AGB src/agb/GBA-arm.cpp ) -SET(SRC_DMG - src/dmg/GB.cpp - src/dmg/gbCheats.cpp - src/dmg/gbDis.cpp - src/dmg/gbGfx.cpp - src/dmg/gbGlobals.cpp - src/dmg/gbMemory.cpp - src/dmg/gbPrinter.cpp - src/dmg/gbSGB.cpp - src/dmg/gbSound.cpp +SET(SRC_GB + src/gb/GB.cpp + src/gb/gbCheats.cpp + src/gb/gbDis.cpp + src/gb/gbGfx.cpp + src/gb/gbGlobals.cpp + src/gb/gbMemory.cpp + src/gb/gbPrinter.cpp + src/gb/gbSGB.cpp + src/gb/gbSound.cpp ) SET(SRC_APU @@ -269,7 +269,7 @@ ADD_LIBRARY ( ${PROJECT_SRCS} ${SRC_MAIN} ${SRC_AGB} - ${SRC_DMG} + ${SRC_GB} ${SRC_APU} ${SRC_FEX_MINI} ${SRC_FILTERS} diff --git a/src/dmg/GB.cpp b/src/gb/GB.cpp similarity index 100% rename from src/dmg/GB.cpp rename to src/gb/GB.cpp diff --git a/src/dmg/gb.h b/src/gb/gb.h similarity index 100% rename from src/dmg/gb.h rename to src/gb/gb.h diff --git a/src/dmg/gbCheats.cpp b/src/gb/gbCheats.cpp similarity index 100% rename from src/dmg/gbCheats.cpp rename to src/gb/gbCheats.cpp diff --git a/src/dmg/gbCheats.h b/src/gb/gbCheats.h similarity index 100% rename from src/dmg/gbCheats.h rename to src/gb/gbCheats.h diff --git a/src/dmg/gbCodes.h b/src/gb/gbCodes.h similarity index 100% rename from src/dmg/gbCodes.h rename to src/gb/gbCodes.h diff --git a/src/dmg/gbCodesCB.h b/src/gb/gbCodesCB.h similarity index 100% rename from src/dmg/gbCodesCB.h rename to src/gb/gbCodesCB.h diff --git a/src/dmg/gbDis.cpp b/src/gb/gbDis.cpp similarity index 100% rename from src/dmg/gbDis.cpp rename to src/gb/gbDis.cpp diff --git a/src/dmg/gbGfx.cpp b/src/gb/gbGfx.cpp similarity index 100% rename from src/dmg/gbGfx.cpp rename to src/gb/gbGfx.cpp diff --git a/src/dmg/gbGlobals.cpp b/src/gb/gbGlobals.cpp similarity index 100% rename from src/dmg/gbGlobals.cpp rename to src/gb/gbGlobals.cpp diff --git a/src/dmg/gbGlobals.h b/src/gb/gbGlobals.h similarity index 100% rename from src/dmg/gbGlobals.h rename to src/gb/gbGlobals.h diff --git a/src/dmg/gbMemory.cpp b/src/gb/gbMemory.cpp similarity index 100% rename from src/dmg/gbMemory.cpp rename to src/gb/gbMemory.cpp diff --git a/src/dmg/gbMemory.h b/src/gb/gbMemory.h similarity index 100% rename from src/dmg/gbMemory.h rename to src/gb/gbMemory.h diff --git a/src/dmg/gbPrinter.cpp b/src/gb/gbPrinter.cpp similarity index 100% rename from src/dmg/gbPrinter.cpp rename to src/gb/gbPrinter.cpp diff --git a/src/dmg/gbPrinter.h b/src/gb/gbPrinter.h similarity index 100% rename from src/dmg/gbPrinter.h rename to src/gb/gbPrinter.h diff --git a/src/dmg/gbSGB.cpp b/src/gb/gbSGB.cpp similarity index 100% rename from src/dmg/gbSGB.cpp rename to src/gb/gbSGB.cpp diff --git a/src/dmg/gbSGB.h b/src/gb/gbSGB.h similarity index 100% rename from src/dmg/gbSGB.h rename to src/gb/gbSGB.h diff --git a/src/dmg/gbSound.cpp b/src/gb/gbSound.cpp similarity index 100% rename from src/dmg/gbSound.cpp rename to src/gb/gbSound.cpp diff --git a/src/dmg/gbSound.h b/src/gb/gbSound.h similarity index 100% rename from src/dmg/gbSound.h rename to src/gb/gbSound.h diff --git a/src/gtk/system.cpp b/src/gtk/system.cpp index 2f1583c9..1c9b1558 100644 --- a/src/gtk/system.cpp +++ b/src/gtk/system.cpp @@ -17,8 +17,6 @@ // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../agb/GBA.h" -#include "../dmg/gb.h" -#include "../dmg/gbGlobals.h" #include "../Util.h" #include "../sdl/inputSDL.h" #include "../Sound.h" diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 3097be93..faa0d58e 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -27,10 +27,9 @@ #include #include "../agb/GBA.h" -#include "../dmg/gb.h" -#include "../dmg/gbGlobals.h" -#include "../dmg/gbPrinter.h" -#include "../dmg/gbSound.h" +#include "../gb/gb.h" +#include "../gb/gbGlobals.h" +#include "../gb/gbSound.h" #include "../Sound.h" #include "../Util.h" diff --git a/src/gtk/windowcallbacks.cpp b/src/gtk/windowcallbacks.cpp index 4e6c5f49..0fd07f34 100644 --- a/src/gtk/windowcallbacks.cpp +++ b/src/gtk/windowcallbacks.cpp @@ -26,10 +26,9 @@ #include #include "../agb/GBA.h" -#include "../dmg/gb.h" -#include "../dmg/gbGlobals.h" -#include "../dmg/gbPrinter.h" -#include "../dmg/gbSound.h" +#include "../gb/gb.h" +#include "../gb/gbGlobals.h" +#include "../gb/gbPrinter.h" #include "../Sound.h" #include "../Util.h" #include "../sdl/inputSDL.h" diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp index fbd56e38..e210debe 100644 --- a/src/sdl/SDL.cpp +++ b/src/sdl/SDL.cpp @@ -44,10 +44,10 @@ #include "../RTC.h" #include "../Sound.h" #include "../Util.h" -#include "../dmg/gb.h" -#include "../dmg/gbGlobals.h" -#include "../dmg/gbCheats.h" -#include "../dmg/gbSound.h" +#include "../gb/gb.h" +#include "../gb/gbGlobals.h" +#include "../gb/gbCheats.h" +#include "../gb/gbSound.h" #include "../Cheats.h" #include "debugger.h"