From 9c1a10b74eb8ecb5dc9d85caf9609a838848539f Mon Sep 17 00:00:00 2001 From: dborth Date: Sun, 21 Mar 2010 23:49:24 +0000 Subject: [PATCH] reorg --- Makefile.gc | 9 ++++----- Makefile.wii | 11 +++++------ source/cheatmgr.cpp | 3 ++- source/fceugx.cpp | 17 ++++++++--------- source/fceugx.h | 2 +- source/fceuload.cpp | 2 +- source/fceultra/file.cpp | 2 +- source/fceustate.cpp | 2 +- source/fceusupport.cpp | 2 +- source/fceusupport.h | 26 +++++++++++++------------- source/filebrowser.cpp | 2 +- source/fileop.cpp | 2 +- source/gcunzip.cpp | 12 ++++++------ source/gcvideo.cpp | 2 +- source/gui/gui.h | 7 ++++--- source/gui/gui_text.cpp | 2 +- source/menu.cpp | 6 +++--- source/networkop.cpp | 6 +++--- source/pad.cpp | 2 +- source/preferences.cpp | 2 +- source/videofilter.cpp | 2 +- 21 files changed, 60 insertions(+), 61 deletions(-) diff --git a/Makefile.gc b/Makefile.gc index 89b3277..5d25c60 100644 --- a/Makefile.gc +++ b/Makefile.gc @@ -18,12 +18,11 @@ include $(DEVKITPPC)/gamecube_rules TARGET := fceugx-gc TARGETDIR := executables BUILD := build_gc -SOURCES := source/ngc/images source/ngc/sounds source/ngc/fonts source/ngc/lang \ - source/ngc/gui source/ngc \ +SOURCES := source source/images source/sounds source/fonts source/lang \ + source/gui source/utils source/utils/sz \ source/fceultra source/fceultra/boards source/fceultra/input \ - source/fceultra/utils source/fceultra/mappers source/fceultra/mbshare \ - source/sz source/unzip -INCLUDES := source/fceultra source/ngc source/unzip + source/fceultra/utils source/fceultra/mappers source/fceultra/mbshare +INCLUDES := source #--------------------------------------------------------------------------------- # options for code generation diff --git a/Makefile.wii b/Makefile.wii index 087f85f..6b9b145 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -18,12 +18,11 @@ include $(DEVKITPPC)/wii_rules TARGET := fceugx-wii TARGETDIR := executables BUILD := build_wii -SOURCES := source/ngc/images source/ngc/sounds source/ngc/fonts source/ngc/lang \ - source/ngc/gui source/ngc/utils source/ngc \ +SOURCES := source source/images source/sounds source/fonts source/lang \ + source/gui source/utils source/utils/sz source/utils/unzip \ source/fceultra source/fceultra/boards source/fceultra/input \ - source/fceultra/utils source/fceultra/mappers source/fceultra/mbshare \ - source/sz source/unzip -INCLUDES := source/fceultra source/ngc source/unzip + source/fceultra/utils source/fceultra/mappers source/fceultra/mbshare +INCLUDES := source #--------------------------------------------------------------------------------- # options for code generation @@ -90,7 +89,7 @@ export OFILES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \ $(TTFFILES:.ttf=.ttf.o) $(LANGFILES:.lang=.lang.o) \ $(PNGFILES:.png=.png.o) \ $(OGGFILES:.ogg=.ogg.o) $(PCMFILES:.pcm=.pcm.o) \ - $(CURDIR)/source/ngc/utils/ehcmodule.elf.o + $(CURDIR)/source/utils/ehcmodule.elf.o #--------------------------------------------------------------------------------- # build a list of include paths diff --git a/source/cheatmgr.cpp b/source/cheatmgr.cpp index 9841731..fa39d78 100644 --- a/source/cheatmgr.cpp +++ b/source/cheatmgr.cpp @@ -15,9 +15,10 @@ #include "fceusupport.h" #include "fileop.h" #include "filebrowser.h" -#include "cheat.h" #include "menu.h" +#include "fceultra/cheat.h" + int numcheats = 0; /**************************************************************************** diff --git a/source/fceugx.cpp b/source/fceugx.cpp index db72287..0701017 100644 --- a/source/fceugx.cpp +++ b/source/fceugx.cpp @@ -20,8 +20,10 @@ #include #include -#include "utils/usb2storage.h" -#include "utils/mload.h" +#ifdef HW_RVL +#include +#endif + #include "fceugx.h" #include "fceuload.h" #include "fceustate.h" @@ -37,14 +39,11 @@ #include "pad.h" #include "filelist.h" #include "gui/gui.h" +#include "utils/usb2storage.h" +#include "utils/mload.h" +#include "utils/FreeTypeGX.h" -#ifdef HW_RVL -#include -#endif - -#include "FreeTypeGX.h" - -#include "types.h" +#include "fceultra/types.h" void FCEUD_Update(uint8 *XBuf, int32 *Buffer, int Count); diff --git a/source/fceugx.h b/source/fceugx.h index 2f88e97..1e3d78c 100644 --- a/source/fceugx.h +++ b/source/fceugx.h @@ -14,7 +14,7 @@ #include -#include "driver.h" +#include "fceultra/driver.h" #define APPNAME "FCE Ultra GX" #define APPVERSION "3.1.3" diff --git a/source/fceuload.cpp b/source/fceuload.cpp index a436d54..edad515 100644 --- a/source/fceuload.cpp +++ b/source/fceuload.cpp @@ -17,7 +17,7 @@ #include #include -#include "file.h" +#include "fceultra/file.h" #include "fceugx.h" #include "gcaudio.h" diff --git a/source/fceultra/file.cpp b/source/fceultra/file.cpp index 4330982..f2cbd92 100644 --- a/source/fceultra/file.cpp +++ b/source/fceultra/file.cpp @@ -37,7 +37,7 @@ #include "utils/memory.h" #include "utils/md5.h" #ifdef GEKKO -#include "unzip.h" +#include "utils/unzip/unzip.h" #else #include "utils/unzip.h" #endif diff --git a/source/fceustate.cpp b/source/fceustate.cpp index eef0c09..4731ee9 100644 --- a/source/fceustate.cpp +++ b/source/fceustate.cpp @@ -18,7 +18,6 @@ #include #include #include -#include "pngu.h" #include "fceugx.h" #include "fceusupport.h" @@ -26,6 +25,7 @@ #include "filebrowser.h" #include "fileop.h" #include "gcvideo.h" +#include "utils/pngu.h" bool SaveState (char * filepath, bool silent) { diff --git a/source/fceusupport.cpp b/source/fceusupport.cpp index 9e89c47..c23318e 100644 --- a/source/fceusupport.cpp +++ b/source/fceusupport.cpp @@ -9,11 +9,11 @@ * FCEU Support Functions ****************************************************************************/ +#include "fceugx.h" #include "fceusupport.h" #include "pad.h" #include "gcaudio.h" #include "gcvideo.h" -#include "fceugx.h" #include "menu.h" /** diff --git a/source/fceusupport.h b/source/fceusupport.h index 9eb06d7..20e2189 100644 --- a/source/fceusupport.h +++ b/source/fceusupport.h @@ -18,19 +18,19 @@ #include #include -#include "driver.h" -#include "fceu.h" -#include "input.h" -#include "types.h" -#include "state.h" -#include "ppu.h" -#include "cart.h" -#include "x6502.h" -#include "git.h" -#include "palette.h" -#include "sound.h" -#include "file.h" -#include "cheat.h" +#include "fceultra/driver.h" +#include "fceultra/fceu.h" +#include "fceultra/input.h" +#include "fceultra/types.h" +#include "fceultra/state.h" +#include "fceultra/ppu.h" +#include "fceultra/cart.h" +#include "fceultra/x6502.h" +#include "fceultra/git.h" +#include "fceultra/palette.h" +#include "fceultra/sound.h" +#include "fceultra/file.h" +#include "fceultra/cheat.h" extern unsigned char * nesrom; diff --git a/source/filebrowser.cpp b/source/filebrowser.cpp index a72d861..3cabe49 100644 --- a/source/filebrowser.cpp +++ b/source/filebrowser.cpp @@ -19,8 +19,8 @@ #include #endif -#include "fceusupport.h" #include "fceugx.h" +#include "fceusupport.h" #include "menu.h" #include "filebrowser.h" #include "networkop.h" diff --git a/source/fileop.cpp b/source/fileop.cpp index 9e2dbab..89d13d8 100644 --- a/source/fileop.cpp +++ b/source/fileop.cpp @@ -25,8 +25,8 @@ #include #include -#include "fceusupport.h" #include "fceugx.h" +#include "fceusupport.h" #include "fileop.h" #include "networkop.h" #include "gcunzip.h" diff --git a/source/gcunzip.cpp b/source/gcunzip.cpp index cfa1f33..1f423fb 100644 --- a/source/gcunzip.cpp +++ b/source/gcunzip.cpp @@ -15,18 +15,18 @@ #include #include -extern "C" { -#include "../sz/7zCrc.h" -#include "../sz/7zIn.h" -#include "../sz/7zExtract.h" -} - #include "fceugx.h" #include "fileop.h" #include "filebrowser.h" #include "menu.h" #include "gcunzip.h" +extern "C" { +#include "utils/sz/7zCrc.h" +#include "utils/sz/7zIn.h" +#include "utils/sz/7zExtract.h" +} + #define ZIPCHUNK 2048 /* diff --git a/source/gcvideo.cpp b/source/gcvideo.cpp index cee3b44..3f7d38e 100644 --- a/source/gcvideo.cpp +++ b/source/gcvideo.cpp @@ -19,9 +19,9 @@ #include #include +#include "fceugx.h" #include "fceusupport.h" #include "gcvideo.h" -#include "fceugx.h" #include "videofilter.h" #include "menu.h" #include "pad.h" diff --git a/source/gui/gui.h b/source/gui/gui.h index fa05456..a7dcad6 100644 --- a/source/gui/gui.h +++ b/source/gui/gui.h @@ -41,14 +41,15 @@ #include #include #include -#include "pngu.h" -#include "FreeTypeGX.h" + #include "fceugx.h" #include "gcvideo.h" #include "filelist.h" #include "fileop.h" #include "pad.h" -#include "oggplayer.h" +#include "../utils/pngu.h" +#include "../utils/FreeTypeGX.h" +#include "../utils/oggplayer.h" extern FreeTypeGX *fontSystem[]; diff --git a/source/gui/gui_text.cpp b/source/gui/gui_text.cpp index 9d0c9f3..9255818 100644 --- a/source/gui/gui_text.cpp +++ b/source/gui/gui_text.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "gui.h" -#include "../gettext.h" +#include "../utils/gettext.h" static GXColor presetColor = (GXColor){255, 255, 255, 255}; static int currentSize = 0; diff --git a/source/menu.cpp b/source/menu.cpp index 1ac2d1c..0149d70 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -21,8 +21,8 @@ #include #endif -#include "fceusupport.h" #include "fceugx.h" +#include "fceusupport.h" #include "videofilter.h" #include "pad.h" #include "gcvideo.h" @@ -34,13 +34,13 @@ #include "fceustate.h" #include "preferences.h" #include "button_mapping.h" -#include "gettext.h" #include "filelist.h" -#include "gui/gui.h" #include "menu.h" #include "fceuload.h" #include "filelist.h" #include "cheatmgr.h" +#include "gui/gui.h" +#include "utils/gettext.h" #define THREAD_SLEEP 100 diff --git a/source/networkop.cpp b/source/networkop.cpp index 81bab3c..18183a0 100644 --- a/source/networkop.cpp +++ b/source/networkop.cpp @@ -24,13 +24,13 @@ ConnectShare (bool silent) #include #include -#include "unzip.h" -#include "miniunz.h" #include "fceugx.h" #include "menu.h" #include "fileop.h" -#include "http.h" #include "filebrowser.h" +#include "utils/http.h" +#include "utils/unzip/unzip.h" +#include "utils/unzip/miniunz.h" bool inNetworkInit = false; static bool networkInit = false; diff --git a/source/pad.cpp b/source/pad.cpp index a74f558..eb4afb8 100644 --- a/source/pad.cpp +++ b/source/pad.cpp @@ -20,8 +20,8 @@ #include "gcvideo.h" #include "filebrowser.h" #include "button_mapping.h" -#include "gui/gui.h" #include "fceuload.h" +#include "gui/gui.h" int rumbleRequest[4] = {0,0,0,0}; GuiTrigger userInput[4]; diff --git a/source/preferences.cpp b/source/preferences.cpp index 1c14545..fa8aa59 100644 --- a/source/preferences.cpp +++ b/source/preferences.cpp @@ -16,11 +16,11 @@ #include #include +#include "fceugx.h" #include "button_mapping.h" #include "filebrowser.h" #include "menu.h" #include "fileop.h" -#include "fceugx.h" #include "videofilter.h" #include "pad.h" diff --git a/source/videofilter.cpp b/source/videofilter.cpp index f816e34..45e7460 100644 --- a/source/videofilter.cpp +++ b/source/videofilter.cpp @@ -18,9 +18,9 @@ #include #include +#include "fceugx.h" #include "videofilter.h" #include "gcvideo.h" -#include "fceugx.h" #include "menu.h" #define NUMBITS (16)