diff --git a/.gitignore b/.gitignore index f5a1b931e..e50409763 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ -/desmume/src/windows/.libs -/desmume/src/windows/.obj -/desmume/src/windows/__bins -/desmume/src/windows/*.tlog -/desmume/src/windows/*.aps +/desmume/src/frontend/windows/.libs +/desmume/src/frontend/windows/.obj +/desmume/src/frontend/windows/__bins +/desmume/src/frontend/windows/*.tlog +/desmume/src/frontend/windows/*.aps *.user *.suo *.o diff --git a/desmume/src/debug.cpp b/desmume/src/debug.cpp index f090eb51d..e0f909ecb 100644 --- a/desmume/src/debug.cpp +++ b/desmume/src/debug.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2006 Guillaume Duhamel - Copyright (C) 2006-2011 DeSmuME team + Copyright (C) 2006-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desmume/src/windows/7z.dll b/desmume/src/frontend/windows/7z.dll similarity index 100% rename from desmume/src/windows/7z.dll rename to desmume/src/frontend/windows/7z.dll diff --git a/desmume/src/windows/7z.exe b/desmume/src/frontend/windows/7z.exe similarity index 100% rename from desmume/src/windows/7z.exe rename to desmume/src/frontend/windows/7z.exe diff --git a/desmume/src/windows/AboutBox.cpp b/desmume/src/frontend/windows/AboutBox.cpp similarity index 98% rename from desmume/src/windows/AboutBox.cpp rename to desmume/src/frontend/windows/AboutBox.cpp index 1e459f239..08f8fa2e0 100644 --- a/desmume/src/windows/AboutBox.cpp +++ b/desmume/src/frontend/windows/AboutBox.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2008 shash - Copyright (C) 2008-2015 DeSmuME team + Copyright (C) 2008-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ #include "AboutBox.h" -#include "../version.h" +#include "version.h" #include "resource.h" diff --git a/desmume/src/windows/AboutBox.h b/desmume/src/frontend/windows/AboutBox.h similarity index 100% rename from desmume/src/windows/AboutBox.h rename to desmume/src/frontend/windows/AboutBox.h diff --git a/desmume/src/windows/CWindow.cpp b/desmume/src/frontend/windows/CWindow.cpp similarity index 99% rename from desmume/src/windows/CWindow.cpp rename to desmume/src/frontend/windows/CWindow.cpp index d6af59235..0e3a9d9dc 100644 --- a/desmume/src/windows/CWindow.cpp +++ b/desmume/src/frontend/windows/CWindow.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2006 yopyop - Copyright (C) 2006-2010 DeSmuME team + Copyright (C) 2006-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ #include #include -#include "../debug.h" +#include "debug.h" #include "resource.h" #include "main.h" diff --git a/desmume/src/windows/CWindow.h b/desmume/src/frontend/windows/CWindow.h similarity index 95% rename from desmume/src/windows/CWindow.h rename to desmume/src/frontend/windows/CWindow.h index 25dbe0fc0..221a4a515 100644 --- a/desmume/src/windows/CWindow.h +++ b/desmume/src/frontend/windows/CWindow.h @@ -1,6 +1,6 @@ /* Copyright (C) 2006 yopyop - Copyright (C) 2006-2015 DeSmuME team + Copyright (C) 2006-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ #include #include -#include "../types.h" +#include "types.h" using namespace std; diff --git a/desmume/src/windows/DeSmuME-user.props.template b/desmume/src/frontend/windows/DeSmuME-user.props.template similarity index 100% rename from desmume/src/windows/DeSmuME-user.props.template rename to desmume/src/frontend/windows/DeSmuME-user.props.template diff --git a/desmume/src/windows/DeSmuME.ico b/desmume/src/frontend/windows/DeSmuME.ico similarity index 100% rename from desmume/src/windows/DeSmuME.ico rename to desmume/src/frontend/windows/DeSmuME.ico diff --git a/desmume/src/windows/DeSmuME.sln b/desmume/src/frontend/windows/DeSmuME.sln similarity index 100% rename from desmume/src/windows/DeSmuME.sln rename to desmume/src/frontend/windows/DeSmuME.sln diff --git a/desmume/src/windows/DeSmuME.vcxproj b/desmume/src/frontend/windows/DeSmuME.vcxproj similarity index 54% rename from desmume/src/windows/DeSmuME.vcxproj rename to desmume/src/frontend/windows/DeSmuME.vcxproj index aa17d4ed8..a3956a7c1 100644 --- a/desmume/src/windows/DeSmuME.vcxproj +++ b/desmume/src/frontend/windows/DeSmuME.vcxproj @@ -56,174 +56,174 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -341,158 +341,158 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -600,10 +600,10 @@ - - - - + + + + diff --git a/desmume/src/windows/DeSmuME.vcxproj.filters b/desmume/src/frontend/windows/DeSmuME.vcxproj.filters similarity index 72% rename from desmume/src/windows/DeSmuME.vcxproj.filters rename to desmume/src/frontend/windows/DeSmuME.vcxproj.filters index 84e45ad65..f551f4dc0 100644 --- a/desmume/src/windows/DeSmuME.vcxproj.filters +++ b/desmume/src/frontend/windows/DeSmuME.vcxproj.filters @@ -126,202 +126,202 @@ - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core\addons - + Core\addons - + Core\addons - + Core\addons - + Core\addons - + Core\gdbstub - + Core\utils - + Core\utils - + Core\utils - + Core\utils - + Core\utils - + Core\utils\decrypt - + Core\utils\decrypt - + Core\utils\decrypt - + Core\metaspu - + Core\metaspu - + Core\metaspu - + Core\metaspu\win32 - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch @@ -426,241 +426,241 @@ Windows\tools - + Core\addons - + Core\utils - + Core\addons - + Core\addons - + Core\addons - + Core\utils - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core - + Core\addons - + Core\utils - + Core\utils - + Core\addons - + Core\utils\tinyxml - + Core\utils\tinyxml - + Core\utils\tinyxml - + Core\utils\tinyxml - + Core\filter - + Core\filter - + Core\filter - + Core\filter - + Core\filter - + Core\filter - + Core\filter Windows - + Core Windows - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core Windows - + Core - + Core\addons - + Core\addons - + Core\addons - + Core\addons - + Core\utils - + Core\addons - + Core\addons - + Core\utils Windows\tools - + Core\addons - + Core\addons - + Core\filter @@ -891,85 +891,85 @@ Windows\File_Extractor\unrar - + Core\libretro-common\rthreads - + Core\frontend\modules - + Core\libretro-common\formats\png - + Core\libretro-common\formats\png - + Core\libretro-common\formats\bmp - + Core\libretro-common\file\nbio - + Core\libretro-common\compat - + Core\libretro-common\compat - + Core\libretro-common\compat - + Core\libretro-common\compat - + Core\libretro-common\compat - + Core\libretro-common\file - + Core\libretro-common\file - + Core\libretro-common\file - + Core\libretro-common\hash - + Core\libretro-common\rthreads - + Core\libretro-common\compat - + Core\libretro-common\include\streams - + Core\libretro-common\include\streams - + Core\libretro-common\file - + Core\libretro-common\lists - + Core\libretro-common\lists - + Core\libretro-common\lists - + Core\libretro-common\file - + Core\utils\libfat - + Core\libretro-common\features - + Core @@ -977,193 +977,190 @@ - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - + Core - - Core - - + Core\gdbstub - + Core\utils - + Core\utils - + Core\utils - + Core\utils - + Core\utils - + Core\utils\decrypt - + Core\utils\decrypt - + Core\utils\decrypt - + Core\metaspu - + Core\metaspu - + Core\metaspu\win32 - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch - + Core\metaspu\SoundTouch @@ -1268,247 +1265,247 @@ Windows\tools - + Core\utils - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils\libfat - + Core\utils - + Core\utils - + Core\utils - + Core\utils\tinyxml - + Core\utils\tinyxml - + Core\filter - + Core\filter - + Core\filter - + Core\filter Windows - + Core - + Core - + Core Windows - + Core\utils\AsmJit - + Core\utils\AsmJit - + Core\utils\AsmJit - + Core\utils\AsmJit - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\core - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core\utils\AsmJit\x86 - + Core Windows - + Core - + Core\addons - + Core\addons - + Core\utils - + Core\addons - + Core\utils Windows\tools - + Core - + Core\filter @@ -1712,48 +1709,51 @@ Windows\File_Extractor\unrar - + Core\libretro-common\include\rthreads - + Core\libretro-common\include - + Core\libretro-common\include - + Core\libretro-common\include - + Core\frontend\modules - + Core\libretro-common\include\formats - + Core\libretro-common\include\formats - + Core\libretro-common\include\formats - + Core\libretro-common\include\compat - + Core\libretro-common\include\compat - + Core - + + Core\utils + + Core\utils - + Core - + Core @@ -1762,10 +1762,10 @@ Windows\resources - + Core\filter - + Core\utils\AsmJit diff --git a/desmume/src/windows/DeSmuME_2010.bat b/desmume/src/frontend/windows/DeSmuME_2010.bat similarity index 100% rename from desmume/src/windows/DeSmuME_2010.bat rename to desmume/src/frontend/windows/DeSmuME_2010.bat diff --git a/desmume/src/windows/DeSmuME_Win32.manifest b/desmume/src/frontend/windows/DeSmuME_Win32.manifest similarity index 100% rename from desmume/src/windows/DeSmuME_Win32.manifest rename to desmume/src/frontend/windows/DeSmuME_Win32.manifest diff --git a/desmume/src/windows/DeSmuME_x64.manifest b/desmume/src/frontend/windows/DeSmuME_x64.manifest similarity index 100% rename from desmume/src/windows/DeSmuME_x64.manifest rename to desmume/src/frontend/windows/DeSmuME_x64.manifest diff --git a/desmume/src/windows/FEX_Interface.cpp b/desmume/src/frontend/windows/FEX_Interface.cpp similarity index 100% rename from desmume/src/windows/FEX_Interface.cpp rename to desmume/src/frontend/windows/FEX_Interface.cpp diff --git a/desmume/src/windows/FEX_Interface.h b/desmume/src/frontend/windows/FEX_Interface.h similarity index 95% rename from desmume/src/windows/FEX_Interface.h rename to desmume/src/frontend/windows/FEX_Interface.h index bf7b6cafc..e87851957 100644 --- a/desmume/src/windows/FEX_Interface.h +++ b/desmume/src/frontend/windows/FEX_Interface.h @@ -18,7 +18,7 @@ #ifndef _FEX_DEC_HEADER #define _FEX_DEC_HEADER -#include "../types.h" +#include "types.h" // File_Extractor interface // NOTE: if you want to add support for opening files within archives to some part of DeSmuME, diff --git a/desmume/src/windows/File_Extractor/7z_C/7z.h b/desmume/src/frontend/windows/File_Extractor/7z_C/7z.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7z.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/7z.h diff --git a/desmume/src/windows/File_Extractor/7z_C/7zAlloc.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zAlloc.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zAlloc.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zAlloc.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zAlloc.h b/desmume/src/frontend/windows/File_Extractor/7z_C/7zAlloc.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zAlloc.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zAlloc.h diff --git a/desmume/src/windows/File_Extractor/7z_C/7zBuf.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zBuf.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zBuf.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zBuf.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zBuf.h b/desmume/src/frontend/windows/File_Extractor/7z_C/7zBuf.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zBuf.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zBuf.h diff --git a/desmume/src/windows/File_Extractor/7z_C/7zBuf2.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zBuf2.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zBuf2.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zBuf2.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zC.txt b/desmume/src/frontend/windows/File_Extractor/7z_C/7zC.txt similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zC.txt rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zC.txt diff --git a/desmume/src/windows/File_Extractor/7z_C/7zCrc.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zCrc.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zCrc.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zCrc.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zCrc.h b/desmume/src/frontend/windows/File_Extractor/7z_C/7zCrc.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zCrc.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zCrc.h diff --git a/desmume/src/windows/File_Extractor/7z_C/7zCrcOpt.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zCrcOpt.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zCrcOpt.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zCrcOpt.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zDec.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zDec.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zDec.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zDec.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zDecode.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zDecode.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zDecode.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zDecode.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zDecode.h b/desmume/src/frontend/windows/File_Extractor/7z_C/7zDecode.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zDecode.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zDecode.h diff --git a/desmume/src/windows/File_Extractor/7z_C/7zExtract.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zExtract.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zExtract.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zExtract.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zExtract.h b/desmume/src/frontend/windows/File_Extractor/7z_C/7zExtract.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zExtract.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zExtract.h diff --git a/desmume/src/windows/File_Extractor/7z_C/7zFile.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zFile.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zFile.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zFile.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zFile.h b/desmume/src/frontend/windows/File_Extractor/7z_C/7zFile.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zFile.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zFile.h diff --git a/desmume/src/windows/File_Extractor/7z_C/7zHeader.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zHeader.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zHeader.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zHeader.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zHeader.h b/desmume/src/frontend/windows/File_Extractor/7z_C/7zHeader.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zHeader.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zHeader.h diff --git a/desmume/src/windows/File_Extractor/7z_C/7zIn.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zIn.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zIn.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zIn.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zIn.h b/desmume/src/frontend/windows/File_Extractor/7z_C/7zIn.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zIn.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zIn.h diff --git a/desmume/src/windows/File_Extractor/7z_C/7zItem.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zItem.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zItem.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zItem.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zItem.h b/desmume/src/frontend/windows/File_Extractor/7z_C/7zItem.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zItem.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zItem.h diff --git a/desmume/src/windows/File_Extractor/7z_C/7zStream.c b/desmume/src/frontend/windows/File_Extractor/7z_C/7zStream.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zStream.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zStream.c diff --git a/desmume/src/windows/File_Extractor/7z_C/7zTypes.h b/desmume/src/frontend/windows/File_Extractor/7z_C/7zTypes.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zTypes.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zTypes.h diff --git a/desmume/src/windows/File_Extractor/7z_C/7zVersion.h b/desmume/src/frontend/windows/File_Extractor/7z_C/7zVersion.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/7zVersion.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/7zVersion.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Alloc.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Alloc.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Alloc.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Alloc.c diff --git a/desmume/src/windows/File_Extractor/7z_C/Alloc.h b/desmume/src/frontend/windows/File_Extractor/7z_C/Alloc.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Alloc.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/Alloc.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Bcj2.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Bcj2.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Bcj2.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Bcj2.c diff --git a/desmume/src/windows/File_Extractor/7z_C/Bcj2.h b/desmume/src/frontend/windows/File_Extractor/7z_C/Bcj2.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Bcj2.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/Bcj2.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Bra.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Bra.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Bra.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Bra.c diff --git a/desmume/src/windows/File_Extractor/7z_C/Bra.h b/desmume/src/frontend/windows/File_Extractor/7z_C/Bra.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Bra.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/Bra.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Bra86.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Bra86.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Bra86.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Bra86.c diff --git a/desmume/src/windows/File_Extractor/7z_C/BraIA64.c b/desmume/src/frontend/windows/File_Extractor/7z_C/BraIA64.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/BraIA64.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/BraIA64.c diff --git a/desmume/src/windows/File_Extractor/7z_C/CpuArch.c b/desmume/src/frontend/windows/File_Extractor/7z_C/CpuArch.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/CpuArch.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/CpuArch.c diff --git a/desmume/src/windows/File_Extractor/7z_C/CpuArch.h b/desmume/src/frontend/windows/File_Extractor/7z_C/CpuArch.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/CpuArch.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/CpuArch.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Delta.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Delta.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Delta.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Delta.c diff --git a/desmume/src/windows/File_Extractor/7z_C/Delta.h b/desmume/src/frontend/windows/File_Extractor/7z_C/Delta.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Delta.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/Delta.h diff --git a/desmume/src/windows/File_Extractor/7z_C/LzFind.c b/desmume/src/frontend/windows/File_Extractor/7z_C/LzFind.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/LzFind.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/LzFind.c diff --git a/desmume/src/windows/File_Extractor/7z_C/LzFind.h b/desmume/src/frontend/windows/File_Extractor/7z_C/LzFind.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/LzFind.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/LzFind.h diff --git a/desmume/src/windows/File_Extractor/7z_C/LzFindMt.c b/desmume/src/frontend/windows/File_Extractor/7z_C/LzFindMt.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/LzFindMt.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/LzFindMt.c diff --git a/desmume/src/windows/File_Extractor/7z_C/LzFindMt.h b/desmume/src/frontend/windows/File_Extractor/7z_C/LzFindMt.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/LzFindMt.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/LzFindMt.h diff --git a/desmume/src/windows/File_Extractor/7z_C/LzHash.h b/desmume/src/frontend/windows/File_Extractor/7z_C/LzHash.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/LzHash.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/LzHash.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Lzma2Dec.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Lzma2Dec.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Lzma2Dec.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Lzma2Dec.c diff --git a/desmume/src/windows/File_Extractor/7z_C/Lzma2Dec.h b/desmume/src/frontend/windows/File_Extractor/7z_C/Lzma2Dec.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Lzma2Dec.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/Lzma2Dec.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Lzma2Enc.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Lzma2Enc.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Lzma2Enc.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Lzma2Enc.c diff --git a/desmume/src/windows/File_Extractor/7z_C/Lzma2Enc.h b/desmume/src/frontend/windows/File_Extractor/7z_C/Lzma2Enc.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Lzma2Enc.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/Lzma2Enc.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Lzma86.h b/desmume/src/frontend/windows/File_Extractor/7z_C/Lzma86.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Lzma86.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/Lzma86.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Lzma86Dec.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Lzma86Dec.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Lzma86Dec.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Lzma86Dec.c diff --git a/desmume/src/windows/File_Extractor/7z_C/Lzma86Enc.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Lzma86Enc.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Lzma86Enc.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Lzma86Enc.c diff --git a/desmume/src/windows/File_Extractor/7z_C/LzmaDec.c b/desmume/src/frontend/windows/File_Extractor/7z_C/LzmaDec.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/LzmaDec.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/LzmaDec.c diff --git a/desmume/src/windows/File_Extractor/7z_C/LzmaDec.h b/desmume/src/frontend/windows/File_Extractor/7z_C/LzmaDec.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/LzmaDec.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/LzmaDec.h diff --git a/desmume/src/windows/File_Extractor/7z_C/LzmaEnc.c b/desmume/src/frontend/windows/File_Extractor/7z_C/LzmaEnc.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/LzmaEnc.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/LzmaEnc.c diff --git a/desmume/src/windows/File_Extractor/7z_C/LzmaEnc.h b/desmume/src/frontend/windows/File_Extractor/7z_C/LzmaEnc.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/LzmaEnc.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/LzmaEnc.h diff --git a/desmume/src/windows/File_Extractor/7z_C/LzmaLib.c b/desmume/src/frontend/windows/File_Extractor/7z_C/LzmaLib.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/LzmaLib.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/LzmaLib.c diff --git a/desmume/src/windows/File_Extractor/7z_C/LzmaLib.h b/desmume/src/frontend/windows/File_Extractor/7z_C/LzmaLib.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/LzmaLib.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/LzmaLib.h diff --git a/desmume/src/windows/File_Extractor/7z_C/LzmaTypes.h b/desmume/src/frontend/windows/File_Extractor/7z_C/LzmaTypes.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/LzmaTypes.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/LzmaTypes.h diff --git a/desmume/src/windows/File_Extractor/7z_C/MtCoder.c b/desmume/src/frontend/windows/File_Extractor/7z_C/MtCoder.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/MtCoder.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/MtCoder.c diff --git a/desmume/src/windows/File_Extractor/7z_C/MtCoder.h b/desmume/src/frontend/windows/File_Extractor/7z_C/MtCoder.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/MtCoder.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/MtCoder.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Ppmd.h b/desmume/src/frontend/windows/File_Extractor/7z_C/Ppmd.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Ppmd.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/Ppmd.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Ppmd7.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Ppmd7.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Ppmd7.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Ppmd7.c diff --git a/desmume/src/windows/File_Extractor/7z_C/Ppmd7.h b/desmume/src/frontend/windows/File_Extractor/7z_C/Ppmd7.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Ppmd7.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/Ppmd7.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Ppmd7Dec.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Ppmd7Dec.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Ppmd7Dec.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Ppmd7Dec.c diff --git a/desmume/src/windows/File_Extractor/7z_C/Ppmd7Enc.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Ppmd7Enc.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Ppmd7Enc.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Ppmd7Enc.c diff --git a/desmume/src/windows/File_Extractor/7z_C/RotateDefs.h b/desmume/src/frontend/windows/File_Extractor/7z_C/RotateDefs.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/RotateDefs.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/RotateDefs.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Threads.c b/desmume/src/frontend/windows/File_Extractor/7z_C/Threads.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Threads.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/Threads.c diff --git a/desmume/src/windows/File_Extractor/7z_C/Threads.h b/desmume/src/frontend/windows/File_Extractor/7z_C/Threads.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Threads.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/Threads.h diff --git a/desmume/src/windows/File_Extractor/7z_C/Types.h b/desmume/src/frontend/windows/File_Extractor/7z_C/Types.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/Types.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/Types.h diff --git a/desmume/src/windows/File_Extractor/7z_C/changes.txt b/desmume/src/frontend/windows/File_Extractor/7z_C/changes.txt similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/changes.txt rename to desmume/src/frontend/windows/File_Extractor/7z_C/changes.txt diff --git a/desmume/src/windows/File_Extractor/7z_C/lzma.txt b/desmume/src/frontend/windows/File_Extractor/7z_C/lzma.txt similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/lzma.txt rename to desmume/src/frontend/windows/File_Extractor/7z_C/lzma.txt diff --git a/desmume/src/windows/File_Extractor/7z_C/readme.txt b/desmume/src/frontend/windows/File_Extractor/7z_C/readme.txt similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/readme.txt rename to desmume/src/frontend/windows/File_Extractor/7z_C/readme.txt diff --git a/desmume/src/windows/File_Extractor/7z_C/win32/Threads.c b/desmume/src/frontend/windows/File_Extractor/7z_C/win32/Threads.c similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/win32/Threads.c rename to desmume/src/frontend/windows/File_Extractor/7z_C/win32/Threads.c diff --git a/desmume/src/windows/File_Extractor/7z_C/win32/Threads.h b/desmume/src/frontend/windows/File_Extractor/7z_C/win32/Threads.h similarity index 100% rename from desmume/src/windows/File_Extractor/7z_C/win32/Threads.h rename to desmume/src/frontend/windows/File_Extractor/7z_C/win32/Threads.h diff --git a/desmume/src/windows/File_Extractor/fex/Binary_Extractor.cpp b/desmume/src/frontend/windows/File_Extractor/fex/Binary_Extractor.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Binary_Extractor.cpp rename to desmume/src/frontend/windows/File_Extractor/fex/Binary_Extractor.cpp diff --git a/desmume/src/windows/File_Extractor/fex/Binary_Extractor.h b/desmume/src/frontend/windows/File_Extractor/fex/Binary_Extractor.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Binary_Extractor.h rename to desmume/src/frontend/windows/File_Extractor/fex/Binary_Extractor.h diff --git a/desmume/src/windows/File_Extractor/fex/Data_Reader.cpp b/desmume/src/frontend/windows/File_Extractor/fex/Data_Reader.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Data_Reader.cpp rename to desmume/src/frontend/windows/File_Extractor/fex/Data_Reader.cpp diff --git a/desmume/src/windows/File_Extractor/fex/Data_Reader.h b/desmume/src/frontend/windows/File_Extractor/fex/Data_Reader.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Data_Reader.h rename to desmume/src/frontend/windows/File_Extractor/fex/Data_Reader.h diff --git a/desmume/src/windows/File_Extractor/fex/File_Extractor.cpp b/desmume/src/frontend/windows/File_Extractor/fex/File_Extractor.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/fex/File_Extractor.cpp rename to desmume/src/frontend/windows/File_Extractor/fex/File_Extractor.cpp diff --git a/desmume/src/windows/File_Extractor/fex/File_Extractor.h b/desmume/src/frontend/windows/File_Extractor/fex/File_Extractor.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/File_Extractor.h rename to desmume/src/frontend/windows/File_Extractor/fex/File_Extractor.h diff --git a/desmume/src/windows/File_Extractor/fex/Gzip_Extractor.cpp b/desmume/src/frontend/windows/File_Extractor/fex/Gzip_Extractor.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Gzip_Extractor.cpp rename to desmume/src/frontend/windows/File_Extractor/fex/Gzip_Extractor.cpp diff --git a/desmume/src/windows/File_Extractor/fex/Gzip_Extractor.h b/desmume/src/frontend/windows/File_Extractor/fex/Gzip_Extractor.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Gzip_Extractor.h rename to desmume/src/frontend/windows/File_Extractor/fex/Gzip_Extractor.h diff --git a/desmume/src/windows/File_Extractor/fex/Gzip_Reader.cpp b/desmume/src/frontend/windows/File_Extractor/fex/Gzip_Reader.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Gzip_Reader.cpp rename to desmume/src/frontend/windows/File_Extractor/fex/Gzip_Reader.cpp diff --git a/desmume/src/windows/File_Extractor/fex/Gzip_Reader.h b/desmume/src/frontend/windows/File_Extractor/fex/Gzip_Reader.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Gzip_Reader.h rename to desmume/src/frontend/windows/File_Extractor/fex/Gzip_Reader.h diff --git a/desmume/src/windows/File_Extractor/fex/Rar_Extractor.cpp b/desmume/src/frontend/windows/File_Extractor/fex/Rar_Extractor.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Rar_Extractor.cpp rename to desmume/src/frontend/windows/File_Extractor/fex/Rar_Extractor.cpp diff --git a/desmume/src/windows/File_Extractor/fex/Rar_Extractor.h b/desmume/src/frontend/windows/File_Extractor/fex/Rar_Extractor.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Rar_Extractor.h rename to desmume/src/frontend/windows/File_Extractor/fex/Rar_Extractor.h diff --git a/desmume/src/windows/File_Extractor/fex/Zip7_Extractor.cpp b/desmume/src/frontend/windows/File_Extractor/fex/Zip7_Extractor.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Zip7_Extractor.cpp rename to desmume/src/frontend/windows/File_Extractor/fex/Zip7_Extractor.cpp diff --git a/desmume/src/windows/File_Extractor/fex/Zip7_Extractor.h b/desmume/src/frontend/windows/File_Extractor/fex/Zip7_Extractor.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Zip7_Extractor.h rename to desmume/src/frontend/windows/File_Extractor/fex/Zip7_Extractor.h diff --git a/desmume/src/windows/File_Extractor/fex/Zip_Extractor.cpp b/desmume/src/frontend/windows/File_Extractor/fex/Zip_Extractor.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Zip_Extractor.cpp rename to desmume/src/frontend/windows/File_Extractor/fex/Zip_Extractor.cpp diff --git a/desmume/src/windows/File_Extractor/fex/Zip_Extractor.h b/desmume/src/frontend/windows/File_Extractor/fex/Zip_Extractor.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Zip_Extractor.h rename to desmume/src/frontend/windows/File_Extractor/fex/Zip_Extractor.h diff --git a/desmume/src/windows/File_Extractor/fex/Zlib_Inflater.cpp b/desmume/src/frontend/windows/File_Extractor/fex/Zlib_Inflater.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Zlib_Inflater.cpp rename to desmume/src/frontend/windows/File_Extractor/fex/Zlib_Inflater.cpp diff --git a/desmume/src/windows/File_Extractor/fex/Zlib_Inflater.h b/desmume/src/frontend/windows/File_Extractor/fex/Zlib_Inflater.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/Zlib_Inflater.h rename to desmume/src/frontend/windows/File_Extractor/fex/Zlib_Inflater.h diff --git a/desmume/src/windows/File_Extractor/fex/blargg_common.cpp b/desmume/src/frontend/windows/File_Extractor/fex/blargg_common.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/fex/blargg_common.cpp rename to desmume/src/frontend/windows/File_Extractor/fex/blargg_common.cpp diff --git a/desmume/src/windows/File_Extractor/fex/blargg_common.h b/desmume/src/frontend/windows/File_Extractor/fex/blargg_common.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/blargg_common.h rename to desmume/src/frontend/windows/File_Extractor/fex/blargg_common.h diff --git a/desmume/src/windows/File_Extractor/fex/blargg_config.h b/desmume/src/frontend/windows/File_Extractor/fex/blargg_config.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/blargg_config.h rename to desmume/src/frontend/windows/File_Extractor/fex/blargg_config.h diff --git a/desmume/src/windows/File_Extractor/fex/blargg_endian.h b/desmume/src/frontend/windows/File_Extractor/fex/blargg_endian.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/blargg_endian.h rename to desmume/src/frontend/windows/File_Extractor/fex/blargg_endian.h diff --git a/desmume/src/windows/File_Extractor/fex/blargg_errors.cpp b/desmume/src/frontend/windows/File_Extractor/fex/blargg_errors.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/fex/blargg_errors.cpp rename to desmume/src/frontend/windows/File_Extractor/fex/blargg_errors.cpp diff --git a/desmume/src/windows/File_Extractor/fex/blargg_errors.h b/desmume/src/frontend/windows/File_Extractor/fex/blargg_errors.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/blargg_errors.h rename to desmume/src/frontend/windows/File_Extractor/fex/blargg_errors.h diff --git a/desmume/src/windows/File_Extractor/fex/blargg_source.h b/desmume/src/frontend/windows/File_Extractor/fex/blargg_source.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/blargg_source.h rename to desmume/src/frontend/windows/File_Extractor/fex/blargg_source.h diff --git a/desmume/src/windows/File_Extractor/fex/fex.cpp b/desmume/src/frontend/windows/File_Extractor/fex/fex.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/fex/fex.cpp rename to desmume/src/frontend/windows/File_Extractor/fex/fex.cpp diff --git a/desmume/src/windows/File_Extractor/fex/fex.h b/desmume/src/frontend/windows/File_Extractor/fex/fex.h similarity index 100% rename from desmume/src/windows/File_Extractor/fex/fex.h rename to desmume/src/frontend/windows/File_Extractor/fex/fex.h diff --git a/desmume/src/windows/File_Extractor/unrar/acknow.txt b/desmume/src/frontend/windows/File_Extractor/unrar/acknow.txt similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/acknow.txt rename to desmume/src/frontend/windows/File_Extractor/unrar/acknow.txt diff --git a/desmume/src/windows/File_Extractor/unrar/archive.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/archive.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/archive.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/archive.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/archive.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/archive.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/archive.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/archive.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/arcread.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/arcread.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/arcread.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/arcread.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/array.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/array.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/array.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/array.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/blake2s.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/blake2s.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/blake2s.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/blake2s.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/blake2s.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/blake2s.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/blake2s.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/blake2s.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/blake2s_sse.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/blake2s_sse.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/blake2s_sse.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/blake2s_sse.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/blake2sp.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/blake2sp.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/blake2sp.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/blake2sp.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/changes.txt b/desmume/src/frontend/windows/File_Extractor/unrar/changes.txt similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/changes.txt rename to desmume/src/frontend/windows/File_Extractor/unrar/changes.txt diff --git a/desmume/src/windows/File_Extractor/unrar/coder.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/coder.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/coder.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/coder.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/coder.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/coder.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/coder.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/coder.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/compress.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/compress.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/compress.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/compress.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/crc.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/crc.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/crc.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/crc.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/encname.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/encname.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/encname.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/encname.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/encname.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/encname.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/encname.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/encname.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/extract.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/extract.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/extract.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/extract.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/getbits.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/getbits.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/getbits.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/getbits.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/getbits.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/getbits.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/getbits.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/getbits.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/hash.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/hash.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/hash.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/hash.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/hash.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/hash.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/hash.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/hash.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/headers.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/headers.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/headers.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/headers.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/headers.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/headers.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/headers.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/headers.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/headers5.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/headers5.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/headers5.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/headers5.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/license.txt b/desmume/src/frontend/windows/File_Extractor/unrar/license.txt similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/license.txt rename to desmume/src/frontend/windows/File_Extractor/unrar/license.txt diff --git a/desmume/src/windows/File_Extractor/unrar/model.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/model.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/model.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/model.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/model.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/model.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/model.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/model.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/pathfn.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/pathfn.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/pathfn.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/pathfn.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/rar.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/rar.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/rar.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/rar.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/rarvm.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/rarvm.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/rarvm.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/rarvm.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/rarvm.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/rarvm.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/rarvm.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/rarvm.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/rarvmtbl.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/rarvmtbl.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/rarvmtbl.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/rarvmtbl.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/rawread.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/rawread.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/rawread.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/rawread.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/rawread.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/rawread.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/rawread.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/rawread.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/readme.txt b/desmume/src/frontend/windows/File_Extractor/unrar/readme.txt similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/readme.txt rename to desmume/src/frontend/windows/File_Extractor/unrar/readme.txt diff --git a/desmume/src/windows/File_Extractor/unrar/secpassword.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/secpassword.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/secpassword.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/secpassword.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/strfn.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/strfn.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/strfn.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/strfn.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/strfn.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/strfn.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/strfn.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/strfn.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/suballoc.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/suballoc.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/suballoc.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/suballoc.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/suballoc.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/suballoc.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/suballoc.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/suballoc.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/technote.txt b/desmume/src/frontend/windows/File_Extractor/unrar/technote.txt similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/technote.txt rename to desmume/src/frontend/windows/File_Extractor/unrar/technote.txt diff --git a/desmume/src/windows/File_Extractor/unrar/timefn.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/timefn.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/timefn.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/timefn.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/timefn.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/timefn.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/timefn.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/timefn.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/unicode.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/unicode.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unicode.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unicode.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/unicode.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/unicode.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unicode.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unicode.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/unpack.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/unpack.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unpack.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unpack.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/unpack.hpp b/desmume/src/frontend/windows/File_Extractor/unrar/unpack.hpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unpack.hpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unpack.hpp diff --git a/desmume/src/windows/File_Extractor/unrar/unpack15.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/unpack15.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unpack15.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unpack15.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/unpack20.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/unpack20.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unpack20.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unpack20.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/unpack30.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/unpack30.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unpack30.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unpack30.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/unpack50.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/unpack50.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unpack50.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unpack50.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/unpack50frag.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/unpack50frag.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unpack50frag.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unpack50frag.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/unpackinline.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/unpackinline.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unpackinline.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unpackinline.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/unrar.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/unrar.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unrar.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unrar.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/unrar.h b/desmume/src/frontend/windows/File_Extractor/unrar/unrar.h similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unrar.h rename to desmume/src/frontend/windows/File_Extractor/unrar/unrar.h diff --git a/desmume/src/windows/File_Extractor/unrar/unrar_misc.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/unrar_misc.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unrar_misc.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unrar_misc.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/unrar_open.cpp b/desmume/src/frontend/windows/File_Extractor/unrar/unrar_open.cpp similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/unrar_open.cpp rename to desmume/src/frontend/windows/File_Extractor/unrar/unrar_open.cpp diff --git a/desmume/src/windows/File_Extractor/unrar/whatsnew.txt b/desmume/src/frontend/windows/File_Extractor/unrar/whatsnew.txt similarity index 100% rename from desmume/src/windows/File_Extractor/unrar/whatsnew.txt rename to desmume/src/frontend/windows/File_Extractor/unrar/whatsnew.txt diff --git a/desmume/src/windows/FirmConfig.cpp b/desmume/src/frontend/windows/FirmConfig.cpp similarity index 99% rename from desmume/src/windows/FirmConfig.cpp rename to desmume/src/frontend/windows/FirmConfig.cpp index 8c00794dc..4a6e80c6c 100644 --- a/desmume/src/windows/FirmConfig.cpp +++ b/desmume/src/frontend/windows/FirmConfig.cpp @@ -22,8 +22,8 @@ #include #include -#include "../NDSSystem.h" -#include "../firmware.h" +#include "NDSSystem.h" +#include "firmware.h" #include "resource.h" #include "CWindow.h" diff --git a/desmume/src/windows/FirmConfig.h b/desmume/src/frontend/windows/FirmConfig.h similarity index 100% rename from desmume/src/windows/FirmConfig.h rename to desmume/src/frontend/windows/FirmConfig.h diff --git a/desmume/src/windows/GL/glcorearb.h b/desmume/src/frontend/windows/GL/glcorearb.h similarity index 100% rename from desmume/src/windows/GL/glcorearb.h rename to desmume/src/frontend/windows/GL/glcorearb.h diff --git a/desmume/src/windows/GL/glext.h b/desmume/src/frontend/windows/GL/glext.h similarity index 100% rename from desmume/src/windows/GL/glext.h rename to desmume/src/frontend/windows/GL/glext.h diff --git a/desmume/src/windows/GL/wglext.h b/desmume/src/frontend/windows/GL/wglext.h similarity index 100% rename from desmume/src/windows/GL/wglext.h rename to desmume/src/frontend/windows/GL/wglext.h diff --git a/desmume/src/windows/IORegView.cpp b/desmume/src/frontend/windows/IORegView.cpp similarity index 99% rename from desmume/src/windows/IORegView.cpp rename to desmume/src/frontend/windows/IORegView.cpp index 22feecdeb..02495891e 100644 --- a/desmume/src/windows/IORegView.cpp +++ b/desmume/src/frontend/windows/IORegView.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2006 yopyop - Copyright (C) 2006-2015 DeSmuME team + Copyright (C) 2006-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,10 +20,10 @@ #include -#include "../debug.h" -#include "../MMU.h" -#include "../registers.h" -#include "../armcpu.h" +#include "debug.h" +#include "MMU.h" +#include "registers.h" +#include "armcpu.h" #include "resource.h" #include "main.h" diff --git a/desmume/src/windows/IORegView.h b/desmume/src/frontend/windows/IORegView.h similarity index 100% rename from desmume/src/windows/IORegView.h rename to desmume/src/frontend/windows/IORegView.h diff --git a/desmume/src/windows/OpenArchive.cpp b/desmume/src/frontend/windows/OpenArchive.cpp similarity index 96% rename from desmume/src/windows/OpenArchive.cpp rename to desmume/src/frontend/windows/OpenArchive.cpp index 46ed23fa8..788ed07b8 100644 --- a/desmume/src/windows/OpenArchive.cpp +++ b/desmume/src/frontend/windows/OpenArchive.cpp @@ -27,7 +27,7 @@ #include #include -#include "../driver.h" +#include "driver.h" #include "resource.h" #include "main.h" diff --git a/desmume/src/windows/OpenArchive.h b/desmume/src/frontend/windows/OpenArchive.h similarity index 100% rename from desmume/src/windows/OpenArchive.h rename to desmume/src/frontend/windows/OpenArchive.h diff --git a/desmume/src/windows/afxres.h b/desmume/src/frontend/windows/afxres.h similarity index 100% rename from desmume/src/windows/afxres.h rename to desmume/src/frontend/windows/afxres.h diff --git a/desmume/src/windows/agg/agg-2.5-x64.lib b/desmume/src/frontend/windows/agg/agg-2.5-x64.lib similarity index 100% rename from desmume/src/windows/agg/agg-2.5-x64.lib rename to desmume/src/frontend/windows/agg/agg-2.5-x64.lib diff --git a/desmume/src/windows/agg/agg-2.5.lib b/desmume/src/frontend/windows/agg/agg-2.5.lib similarity index 100% rename from desmume/src/windows/agg/agg-2.5.lib rename to desmume/src/frontend/windows/agg/agg-2.5.lib diff --git a/desmume/src/windows/agg/agg-2.5.sln b/desmume/src/frontend/windows/agg/agg-2.5.sln similarity index 100% rename from desmume/src/windows/agg/agg-2.5.sln rename to desmume/src/frontend/windows/agg/agg-2.5.sln diff --git a/desmume/src/windows/agg/agg-2.5.vcproj b/desmume/src/frontend/windows/agg/agg-2.5.vcproj similarity index 100% rename from desmume/src/windows/agg/agg-2.5.vcproj rename to desmume/src/frontend/windows/agg/agg-2.5.vcproj diff --git a/desmume/src/windows/agg/examples/pixel_formats.h b/desmume/src/frontend/windows/agg/examples/pixel_formats.h similarity index 100% rename from desmume/src/windows/agg/examples/pixel_formats.h rename to desmume/src/frontend/windows/agg/examples/pixel_formats.h diff --git a/desmume/src/windows/agg/font_freetype/agg_font_freetype.cpp b/desmume/src/frontend/windows/agg/font_freetype/agg_font_freetype.cpp similarity index 100% rename from desmume/src/windows/agg/font_freetype/agg_font_freetype.cpp rename to desmume/src/frontend/windows/agg/font_freetype/agg_font_freetype.cpp diff --git a/desmume/src/windows/agg/font_freetype/agg_font_freetype.h b/desmume/src/frontend/windows/agg/font_freetype/agg_font_freetype.h similarity index 100% rename from desmume/src/windows/agg/font_freetype/agg_font_freetype.h rename to desmume/src/frontend/windows/agg/font_freetype/agg_font_freetype.h diff --git a/desmume/src/windows/agg/font_win32_tt/agg_font_win32_tt.cpp b/desmume/src/frontend/windows/agg/font_win32_tt/agg_font_win32_tt.cpp similarity index 100% rename from desmume/src/windows/agg/font_win32_tt/agg_font_win32_tt.cpp rename to desmume/src/frontend/windows/agg/font_win32_tt/agg_font_win32_tt.cpp diff --git a/desmume/src/windows/agg/font_win32_tt/agg_font_win32_tt.h b/desmume/src/frontend/windows/agg/font_win32_tt/agg_font_win32_tt.h similarity index 100% rename from desmume/src/windows/agg/font_win32_tt/agg_font_win32_tt.h rename to desmume/src/frontend/windows/agg/font_win32_tt/agg_font_win32_tt.h diff --git a/desmume/src/windows/agg/include/agg_alpha_mask_u8.h b/desmume/src/frontend/windows/agg/include/agg_alpha_mask_u8.h similarity index 100% rename from desmume/src/windows/agg/include/agg_alpha_mask_u8.h rename to desmume/src/frontend/windows/agg/include/agg_alpha_mask_u8.h diff --git a/desmume/src/windows/agg/include/agg_arc.h b/desmume/src/frontend/windows/agg/include/agg_arc.h similarity index 100% rename from desmume/src/windows/agg/include/agg_arc.h rename to desmume/src/frontend/windows/agg/include/agg_arc.h diff --git a/desmume/src/windows/agg/include/agg_array.h b/desmume/src/frontend/windows/agg/include/agg_array.h similarity index 100% rename from desmume/src/windows/agg/include/agg_array.h rename to desmume/src/frontend/windows/agg/include/agg_array.h diff --git a/desmume/src/windows/agg/include/agg_arrowhead.h b/desmume/src/frontend/windows/agg/include/agg_arrowhead.h similarity index 100% rename from desmume/src/windows/agg/include/agg_arrowhead.h rename to desmume/src/frontend/windows/agg/include/agg_arrowhead.h diff --git a/desmume/src/windows/agg/include/agg_basics.h b/desmume/src/frontend/windows/agg/include/agg_basics.h similarity index 100% rename from desmume/src/windows/agg/include/agg_basics.h rename to desmume/src/frontend/windows/agg/include/agg_basics.h diff --git a/desmume/src/windows/agg/include/agg_bezier_arc.h b/desmume/src/frontend/windows/agg/include/agg_bezier_arc.h similarity index 100% rename from desmume/src/windows/agg/include/agg_bezier_arc.h rename to desmume/src/frontend/windows/agg/include/agg_bezier_arc.h diff --git a/desmume/src/windows/agg/include/agg_bitset_iterator.h b/desmume/src/frontend/windows/agg/include/agg_bitset_iterator.h similarity index 100% rename from desmume/src/windows/agg/include/agg_bitset_iterator.h rename to desmume/src/frontend/windows/agg/include/agg_bitset_iterator.h diff --git a/desmume/src/windows/agg/include/agg_blur.h b/desmume/src/frontend/windows/agg/include/agg_blur.h similarity index 100% rename from desmume/src/windows/agg/include/agg_blur.h rename to desmume/src/frontend/windows/agg/include/agg_blur.h diff --git a/desmume/src/windows/agg/include/agg_bounding_rect.h b/desmume/src/frontend/windows/agg/include/agg_bounding_rect.h similarity index 100% rename from desmume/src/windows/agg/include/agg_bounding_rect.h rename to desmume/src/frontend/windows/agg/include/agg_bounding_rect.h diff --git a/desmume/src/windows/agg/include/agg_bspline.h b/desmume/src/frontend/windows/agg/include/agg_bspline.h similarity index 100% rename from desmume/src/windows/agg/include/agg_bspline.h rename to desmume/src/frontend/windows/agg/include/agg_bspline.h diff --git a/desmume/src/windows/agg/include/agg_clip_liang_barsky.h b/desmume/src/frontend/windows/agg/include/agg_clip_liang_barsky.h similarity index 100% rename from desmume/src/windows/agg/include/agg_clip_liang_barsky.h rename to desmume/src/frontend/windows/agg/include/agg_clip_liang_barsky.h diff --git a/desmume/src/windows/agg/include/agg_color_gray.h b/desmume/src/frontend/windows/agg/include/agg_color_gray.h similarity index 100% rename from desmume/src/windows/agg/include/agg_color_gray.h rename to desmume/src/frontend/windows/agg/include/agg_color_gray.h diff --git a/desmume/src/windows/agg/include/agg_color_rgba.h b/desmume/src/frontend/windows/agg/include/agg_color_rgba.h similarity index 100% rename from desmume/src/windows/agg/include/agg_color_rgba.h rename to desmume/src/frontend/windows/agg/include/agg_color_rgba.h diff --git a/desmume/src/windows/agg/include/agg_config.h b/desmume/src/frontend/windows/agg/include/agg_config.h similarity index 100% rename from desmume/src/windows/agg/include/agg_config.h rename to desmume/src/frontend/windows/agg/include/agg_config.h diff --git a/desmume/src/windows/agg/include/agg_conv_adaptor_vcgen.h b/desmume/src/frontend/windows/agg/include/agg_conv_adaptor_vcgen.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_adaptor_vcgen.h rename to desmume/src/frontend/windows/agg/include/agg_conv_adaptor_vcgen.h diff --git a/desmume/src/windows/agg/include/agg_conv_adaptor_vpgen.h b/desmume/src/frontend/windows/agg/include/agg_conv_adaptor_vpgen.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_adaptor_vpgen.h rename to desmume/src/frontend/windows/agg/include/agg_conv_adaptor_vpgen.h diff --git a/desmume/src/windows/agg/include/agg_conv_bspline.h b/desmume/src/frontend/windows/agg/include/agg_conv_bspline.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_bspline.h rename to desmume/src/frontend/windows/agg/include/agg_conv_bspline.h diff --git a/desmume/src/windows/agg/include/agg_conv_clip_polygon.h b/desmume/src/frontend/windows/agg/include/agg_conv_clip_polygon.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_clip_polygon.h rename to desmume/src/frontend/windows/agg/include/agg_conv_clip_polygon.h diff --git a/desmume/src/windows/agg/include/agg_conv_clip_polyline.h b/desmume/src/frontend/windows/agg/include/agg_conv_clip_polyline.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_clip_polyline.h rename to desmume/src/frontend/windows/agg/include/agg_conv_clip_polyline.h diff --git a/desmume/src/windows/agg/include/agg_conv_close_polygon.h b/desmume/src/frontend/windows/agg/include/agg_conv_close_polygon.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_close_polygon.h rename to desmume/src/frontend/windows/agg/include/agg_conv_close_polygon.h diff --git a/desmume/src/windows/agg/include/agg_conv_concat.h b/desmume/src/frontend/windows/agg/include/agg_conv_concat.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_concat.h rename to desmume/src/frontend/windows/agg/include/agg_conv_concat.h diff --git a/desmume/src/windows/agg/include/agg_conv_contour.h b/desmume/src/frontend/windows/agg/include/agg_conv_contour.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_contour.h rename to desmume/src/frontend/windows/agg/include/agg_conv_contour.h diff --git a/desmume/src/windows/agg/include/agg_conv_curve.h b/desmume/src/frontend/windows/agg/include/agg_conv_curve.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_curve.h rename to desmume/src/frontend/windows/agg/include/agg_conv_curve.h diff --git a/desmume/src/windows/agg/include/agg_conv_dash.h b/desmume/src/frontend/windows/agg/include/agg_conv_dash.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_dash.h rename to desmume/src/frontend/windows/agg/include/agg_conv_dash.h diff --git a/desmume/src/windows/agg/include/agg_conv_gpc.h b/desmume/src/frontend/windows/agg/include/agg_conv_gpc.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_gpc.h rename to desmume/src/frontend/windows/agg/include/agg_conv_gpc.h diff --git a/desmume/src/windows/agg/include/agg_conv_marker.h b/desmume/src/frontend/windows/agg/include/agg_conv_marker.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_marker.h rename to desmume/src/frontend/windows/agg/include/agg_conv_marker.h diff --git a/desmume/src/windows/agg/include/agg_conv_marker_adaptor.h b/desmume/src/frontend/windows/agg/include/agg_conv_marker_adaptor.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_marker_adaptor.h rename to desmume/src/frontend/windows/agg/include/agg_conv_marker_adaptor.h diff --git a/desmume/src/windows/agg/include/agg_conv_segmentator.h b/desmume/src/frontend/windows/agg/include/agg_conv_segmentator.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_segmentator.h rename to desmume/src/frontend/windows/agg/include/agg_conv_segmentator.h diff --git a/desmume/src/windows/agg/include/agg_conv_shorten_path.h b/desmume/src/frontend/windows/agg/include/agg_conv_shorten_path.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_shorten_path.h rename to desmume/src/frontend/windows/agg/include/agg_conv_shorten_path.h diff --git a/desmume/src/windows/agg/include/agg_conv_smooth_poly1.h b/desmume/src/frontend/windows/agg/include/agg_conv_smooth_poly1.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_smooth_poly1.h rename to desmume/src/frontend/windows/agg/include/agg_conv_smooth_poly1.h diff --git a/desmume/src/windows/agg/include/agg_conv_stroke.h b/desmume/src/frontend/windows/agg/include/agg_conv_stroke.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_stroke.h rename to desmume/src/frontend/windows/agg/include/agg_conv_stroke.h diff --git a/desmume/src/windows/agg/include/agg_conv_transform.h b/desmume/src/frontend/windows/agg/include/agg_conv_transform.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_transform.h rename to desmume/src/frontend/windows/agg/include/agg_conv_transform.h diff --git a/desmume/src/windows/agg/include/agg_conv_unclose_polygon.h b/desmume/src/frontend/windows/agg/include/agg_conv_unclose_polygon.h similarity index 100% rename from desmume/src/windows/agg/include/agg_conv_unclose_polygon.h rename to desmume/src/frontend/windows/agg/include/agg_conv_unclose_polygon.h diff --git a/desmume/src/windows/agg/include/agg_curves.h b/desmume/src/frontend/windows/agg/include/agg_curves.h similarity index 100% rename from desmume/src/windows/agg/include/agg_curves.h rename to desmume/src/frontend/windows/agg/include/agg_curves.h diff --git a/desmume/src/windows/agg/include/agg_dda_line.h b/desmume/src/frontend/windows/agg/include/agg_dda_line.h similarity index 100% rename from desmume/src/windows/agg/include/agg_dda_line.h rename to desmume/src/frontend/windows/agg/include/agg_dda_line.h diff --git a/desmume/src/windows/agg/include/agg_ellipse.h b/desmume/src/frontend/windows/agg/include/agg_ellipse.h similarity index 100% rename from desmume/src/windows/agg/include/agg_ellipse.h rename to desmume/src/frontend/windows/agg/include/agg_ellipse.h diff --git a/desmume/src/windows/agg/include/agg_ellipse_bresenham.h b/desmume/src/frontend/windows/agg/include/agg_ellipse_bresenham.h similarity index 100% rename from desmume/src/windows/agg/include/agg_ellipse_bresenham.h rename to desmume/src/frontend/windows/agg/include/agg_ellipse_bresenham.h diff --git a/desmume/src/windows/agg/include/agg_embedded_raster_fonts.h b/desmume/src/frontend/windows/agg/include/agg_embedded_raster_fonts.h similarity index 100% rename from desmume/src/windows/agg/include/agg_embedded_raster_fonts.h rename to desmume/src/frontend/windows/agg/include/agg_embedded_raster_fonts.h diff --git a/desmume/src/windows/agg/include/agg_font_cache_manager.h b/desmume/src/frontend/windows/agg/include/agg_font_cache_manager.h similarity index 100% rename from desmume/src/windows/agg/include/agg_font_cache_manager.h rename to desmume/src/frontend/windows/agg/include/agg_font_cache_manager.h diff --git a/desmume/src/windows/agg/include/agg_gamma_functions.h b/desmume/src/frontend/windows/agg/include/agg_gamma_functions.h similarity index 100% rename from desmume/src/windows/agg/include/agg_gamma_functions.h rename to desmume/src/frontend/windows/agg/include/agg_gamma_functions.h diff --git a/desmume/src/windows/agg/include/agg_gamma_lut.h b/desmume/src/frontend/windows/agg/include/agg_gamma_lut.h similarity index 100% rename from desmume/src/windows/agg/include/agg_gamma_lut.h rename to desmume/src/frontend/windows/agg/include/agg_gamma_lut.h diff --git a/desmume/src/windows/agg/include/agg_glyph_raster_bin.h b/desmume/src/frontend/windows/agg/include/agg_glyph_raster_bin.h similarity index 100% rename from desmume/src/windows/agg/include/agg_glyph_raster_bin.h rename to desmume/src/frontend/windows/agg/include/agg_glyph_raster_bin.h diff --git a/desmume/src/windows/agg/include/agg_gradient_lut.h b/desmume/src/frontend/windows/agg/include/agg_gradient_lut.h similarity index 100% rename from desmume/src/windows/agg/include/agg_gradient_lut.h rename to desmume/src/frontend/windows/agg/include/agg_gradient_lut.h diff --git a/desmume/src/windows/agg/include/agg_gsv_text.h b/desmume/src/frontend/windows/agg/include/agg_gsv_text.h similarity index 100% rename from desmume/src/windows/agg/include/agg_gsv_text.h rename to desmume/src/frontend/windows/agg/include/agg_gsv_text.h diff --git a/desmume/src/windows/agg/include/agg_image_accessors.h b/desmume/src/frontend/windows/agg/include/agg_image_accessors.h similarity index 100% rename from desmume/src/windows/agg/include/agg_image_accessors.h rename to desmume/src/frontend/windows/agg/include/agg_image_accessors.h diff --git a/desmume/src/windows/agg/include/agg_image_filters.h b/desmume/src/frontend/windows/agg/include/agg_image_filters.h similarity index 100% rename from desmume/src/windows/agg/include/agg_image_filters.h rename to desmume/src/frontend/windows/agg/include/agg_image_filters.h diff --git a/desmume/src/windows/agg/include/agg_line_aa_basics.h b/desmume/src/frontend/windows/agg/include/agg_line_aa_basics.h similarity index 100% rename from desmume/src/windows/agg/include/agg_line_aa_basics.h rename to desmume/src/frontend/windows/agg/include/agg_line_aa_basics.h diff --git a/desmume/src/windows/agg/include/agg_math.h b/desmume/src/frontend/windows/agg/include/agg_math.h similarity index 100% rename from desmume/src/windows/agg/include/agg_math.h rename to desmume/src/frontend/windows/agg/include/agg_math.h diff --git a/desmume/src/windows/agg/include/agg_math_stroke.h b/desmume/src/frontend/windows/agg/include/agg_math_stroke.h similarity index 100% rename from desmume/src/windows/agg/include/agg_math_stroke.h rename to desmume/src/frontend/windows/agg/include/agg_math_stroke.h diff --git a/desmume/src/windows/agg/include/agg_path_length.h b/desmume/src/frontend/windows/agg/include/agg_path_length.h similarity index 100% rename from desmume/src/windows/agg/include/agg_path_length.h rename to desmume/src/frontend/windows/agg/include/agg_path_length.h diff --git a/desmume/src/windows/agg/include/agg_path_storage.h b/desmume/src/frontend/windows/agg/include/agg_path_storage.h similarity index 100% rename from desmume/src/windows/agg/include/agg_path_storage.h rename to desmume/src/frontend/windows/agg/include/agg_path_storage.h diff --git a/desmume/src/windows/agg/include/agg_path_storage_integer.h b/desmume/src/frontend/windows/agg/include/agg_path_storage_integer.h similarity index 100% rename from desmume/src/windows/agg/include/agg_path_storage_integer.h rename to desmume/src/frontend/windows/agg/include/agg_path_storage_integer.h diff --git a/desmume/src/windows/agg/include/agg_pattern_filters_rgba.h b/desmume/src/frontend/windows/agg/include/agg_pattern_filters_rgba.h similarity index 100% rename from desmume/src/windows/agg/include/agg_pattern_filters_rgba.h rename to desmume/src/frontend/windows/agg/include/agg_pattern_filters_rgba.h diff --git a/desmume/src/windows/agg/include/agg_pixfmt_amask_adaptor.h b/desmume/src/frontend/windows/agg/include/agg_pixfmt_amask_adaptor.h similarity index 100% rename from desmume/src/windows/agg/include/agg_pixfmt_amask_adaptor.h rename to desmume/src/frontend/windows/agg/include/agg_pixfmt_amask_adaptor.h diff --git a/desmume/src/windows/agg/include/agg_pixfmt_gray.h b/desmume/src/frontend/windows/agg/include/agg_pixfmt_gray.h similarity index 100% rename from desmume/src/windows/agg/include/agg_pixfmt_gray.h rename to desmume/src/frontend/windows/agg/include/agg_pixfmt_gray.h diff --git a/desmume/src/windows/agg/include/agg_pixfmt_rgb.h b/desmume/src/frontend/windows/agg/include/agg_pixfmt_rgb.h similarity index 100% rename from desmume/src/windows/agg/include/agg_pixfmt_rgb.h rename to desmume/src/frontend/windows/agg/include/agg_pixfmt_rgb.h diff --git a/desmume/src/windows/agg/include/agg_pixfmt_rgb_packed.h b/desmume/src/frontend/windows/agg/include/agg_pixfmt_rgb_packed.h similarity index 100% rename from desmume/src/windows/agg/include/agg_pixfmt_rgb_packed.h rename to desmume/src/frontend/windows/agg/include/agg_pixfmt_rgb_packed.h diff --git a/desmume/src/windows/agg/include/agg_pixfmt_rgba.h b/desmume/src/frontend/windows/agg/include/agg_pixfmt_rgba.h similarity index 100% rename from desmume/src/windows/agg/include/agg_pixfmt_rgba.h rename to desmume/src/frontend/windows/agg/include/agg_pixfmt_rgba.h diff --git a/desmume/src/windows/agg/include/agg_pixfmt_transposer.h b/desmume/src/frontend/windows/agg/include/agg_pixfmt_transposer.h similarity index 100% rename from desmume/src/windows/agg/include/agg_pixfmt_transposer.h rename to desmume/src/frontend/windows/agg/include/agg_pixfmt_transposer.h diff --git a/desmume/src/windows/agg/include/agg_rasterizer_cells_aa.h b/desmume/src/frontend/windows/agg/include/agg_rasterizer_cells_aa.h similarity index 100% rename from desmume/src/windows/agg/include/agg_rasterizer_cells_aa.h rename to desmume/src/frontend/windows/agg/include/agg_rasterizer_cells_aa.h diff --git a/desmume/src/windows/agg/include/agg_rasterizer_compound_aa.h b/desmume/src/frontend/windows/agg/include/agg_rasterizer_compound_aa.h similarity index 100% rename from desmume/src/windows/agg/include/agg_rasterizer_compound_aa.h rename to desmume/src/frontend/windows/agg/include/agg_rasterizer_compound_aa.h diff --git a/desmume/src/windows/agg/include/agg_rasterizer_outline.h b/desmume/src/frontend/windows/agg/include/agg_rasterizer_outline.h similarity index 100% rename from desmume/src/windows/agg/include/agg_rasterizer_outline.h rename to desmume/src/frontend/windows/agg/include/agg_rasterizer_outline.h diff --git a/desmume/src/windows/agg/include/agg_rasterizer_outline_aa.h b/desmume/src/frontend/windows/agg/include/agg_rasterizer_outline_aa.h similarity index 100% rename from desmume/src/windows/agg/include/agg_rasterizer_outline_aa.h rename to desmume/src/frontend/windows/agg/include/agg_rasterizer_outline_aa.h diff --git a/desmume/src/windows/agg/include/agg_rasterizer_scanline_aa.h b/desmume/src/frontend/windows/agg/include/agg_rasterizer_scanline_aa.h similarity index 100% rename from desmume/src/windows/agg/include/agg_rasterizer_scanline_aa.h rename to desmume/src/frontend/windows/agg/include/agg_rasterizer_scanline_aa.h diff --git a/desmume/src/windows/agg/include/agg_rasterizer_sl_clip.h b/desmume/src/frontend/windows/agg/include/agg_rasterizer_sl_clip.h similarity index 100% rename from desmume/src/windows/agg/include/agg_rasterizer_sl_clip.h rename to desmume/src/frontend/windows/agg/include/agg_rasterizer_sl_clip.h diff --git a/desmume/src/windows/agg/include/agg_renderer_base.h b/desmume/src/frontend/windows/agg/include/agg_renderer_base.h similarity index 100% rename from desmume/src/windows/agg/include/agg_renderer_base.h rename to desmume/src/frontend/windows/agg/include/agg_renderer_base.h diff --git a/desmume/src/windows/agg/include/agg_renderer_markers.h b/desmume/src/frontend/windows/agg/include/agg_renderer_markers.h similarity index 100% rename from desmume/src/windows/agg/include/agg_renderer_markers.h rename to desmume/src/frontend/windows/agg/include/agg_renderer_markers.h diff --git a/desmume/src/windows/agg/include/agg_renderer_mclip.h b/desmume/src/frontend/windows/agg/include/agg_renderer_mclip.h similarity index 100% rename from desmume/src/windows/agg/include/agg_renderer_mclip.h rename to desmume/src/frontend/windows/agg/include/agg_renderer_mclip.h diff --git a/desmume/src/windows/agg/include/agg_renderer_outline_aa.h b/desmume/src/frontend/windows/agg/include/agg_renderer_outline_aa.h similarity index 100% rename from desmume/src/windows/agg/include/agg_renderer_outline_aa.h rename to desmume/src/frontend/windows/agg/include/agg_renderer_outline_aa.h diff --git a/desmume/src/windows/agg/include/agg_renderer_outline_image.h b/desmume/src/frontend/windows/agg/include/agg_renderer_outline_image.h similarity index 100% rename from desmume/src/windows/agg/include/agg_renderer_outline_image.h rename to desmume/src/frontend/windows/agg/include/agg_renderer_outline_image.h diff --git a/desmume/src/windows/agg/include/agg_renderer_primitives.h b/desmume/src/frontend/windows/agg/include/agg_renderer_primitives.h similarity index 100% rename from desmume/src/windows/agg/include/agg_renderer_primitives.h rename to desmume/src/frontend/windows/agg/include/agg_renderer_primitives.h diff --git a/desmume/src/windows/agg/include/agg_renderer_raster_text.h b/desmume/src/frontend/windows/agg/include/agg_renderer_raster_text.h similarity index 100% rename from desmume/src/windows/agg/include/agg_renderer_raster_text.h rename to desmume/src/frontend/windows/agg/include/agg_renderer_raster_text.h diff --git a/desmume/src/windows/agg/include/agg_renderer_scanline.h b/desmume/src/frontend/windows/agg/include/agg_renderer_scanline.h similarity index 100% rename from desmume/src/windows/agg/include/agg_renderer_scanline.h rename to desmume/src/frontend/windows/agg/include/agg_renderer_scanline.h diff --git a/desmume/src/windows/agg/include/agg_rendering_buffer.h b/desmume/src/frontend/windows/agg/include/agg_rendering_buffer.h similarity index 100% rename from desmume/src/windows/agg/include/agg_rendering_buffer.h rename to desmume/src/frontend/windows/agg/include/agg_rendering_buffer.h diff --git a/desmume/src/windows/agg/include/agg_rendering_buffer_dynarow.h b/desmume/src/frontend/windows/agg/include/agg_rendering_buffer_dynarow.h similarity index 100% rename from desmume/src/windows/agg/include/agg_rendering_buffer_dynarow.h rename to desmume/src/frontend/windows/agg/include/agg_rendering_buffer_dynarow.h diff --git a/desmume/src/windows/agg/include/agg_rounded_rect.h b/desmume/src/frontend/windows/agg/include/agg_rounded_rect.h similarity index 100% rename from desmume/src/windows/agg/include/agg_rounded_rect.h rename to desmume/src/frontend/windows/agg/include/agg_rounded_rect.h diff --git a/desmume/src/windows/agg/include/agg_scanline_bin.h b/desmume/src/frontend/windows/agg/include/agg_scanline_bin.h similarity index 100% rename from desmume/src/windows/agg/include/agg_scanline_bin.h rename to desmume/src/frontend/windows/agg/include/agg_scanline_bin.h diff --git a/desmume/src/windows/agg/include/agg_scanline_boolean_algebra.h b/desmume/src/frontend/windows/agg/include/agg_scanline_boolean_algebra.h similarity index 100% rename from desmume/src/windows/agg/include/agg_scanline_boolean_algebra.h rename to desmume/src/frontend/windows/agg/include/agg_scanline_boolean_algebra.h diff --git a/desmume/src/windows/agg/include/agg_scanline_p.h b/desmume/src/frontend/windows/agg/include/agg_scanline_p.h similarity index 100% rename from desmume/src/windows/agg/include/agg_scanline_p.h rename to desmume/src/frontend/windows/agg/include/agg_scanline_p.h diff --git a/desmume/src/windows/agg/include/agg_scanline_storage_aa.h b/desmume/src/frontend/windows/agg/include/agg_scanline_storage_aa.h similarity index 100% rename from desmume/src/windows/agg/include/agg_scanline_storage_aa.h rename to desmume/src/frontend/windows/agg/include/agg_scanline_storage_aa.h diff --git a/desmume/src/windows/agg/include/agg_scanline_storage_bin.h b/desmume/src/frontend/windows/agg/include/agg_scanline_storage_bin.h similarity index 100% rename from desmume/src/windows/agg/include/agg_scanline_storage_bin.h rename to desmume/src/frontend/windows/agg/include/agg_scanline_storage_bin.h diff --git a/desmume/src/windows/agg/include/agg_scanline_u.h b/desmume/src/frontend/windows/agg/include/agg_scanline_u.h similarity index 100% rename from desmume/src/windows/agg/include/agg_scanline_u.h rename to desmume/src/frontend/windows/agg/include/agg_scanline_u.h diff --git a/desmume/src/windows/agg/include/agg_shorten_path.h b/desmume/src/frontend/windows/agg/include/agg_shorten_path.h similarity index 100% rename from desmume/src/windows/agg/include/agg_shorten_path.h rename to desmume/src/frontend/windows/agg/include/agg_shorten_path.h diff --git a/desmume/src/windows/agg/include/agg_simul_eq.h b/desmume/src/frontend/windows/agg/include/agg_simul_eq.h similarity index 100% rename from desmume/src/windows/agg/include/agg_simul_eq.h rename to desmume/src/frontend/windows/agg/include/agg_simul_eq.h diff --git a/desmume/src/windows/agg/include/agg_span_allocator.h b/desmume/src/frontend/windows/agg/include/agg_span_allocator.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_allocator.h rename to desmume/src/frontend/windows/agg/include/agg_span_allocator.h diff --git a/desmume/src/windows/agg/include/agg_span_converter.h b/desmume/src/frontend/windows/agg/include/agg_span_converter.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_converter.h rename to desmume/src/frontend/windows/agg/include/agg_span_converter.h diff --git a/desmume/src/windows/agg/include/agg_span_gouraud.h b/desmume/src/frontend/windows/agg/include/agg_span_gouraud.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_gouraud.h rename to desmume/src/frontend/windows/agg/include/agg_span_gouraud.h diff --git a/desmume/src/windows/agg/include/agg_span_gouraud_gray.h b/desmume/src/frontend/windows/agg/include/agg_span_gouraud_gray.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_gouraud_gray.h rename to desmume/src/frontend/windows/agg/include/agg_span_gouraud_gray.h diff --git a/desmume/src/windows/agg/include/agg_span_gouraud_rgba.h b/desmume/src/frontend/windows/agg/include/agg_span_gouraud_rgba.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_gouraud_rgba.h rename to desmume/src/frontend/windows/agg/include/agg_span_gouraud_rgba.h diff --git a/desmume/src/windows/agg/include/agg_span_gradient.h b/desmume/src/frontend/windows/agg/include/agg_span_gradient.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_gradient.h rename to desmume/src/frontend/windows/agg/include/agg_span_gradient.h diff --git a/desmume/src/windows/agg/include/agg_span_gradient_alpha.h b/desmume/src/frontend/windows/agg/include/agg_span_gradient_alpha.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_gradient_alpha.h rename to desmume/src/frontend/windows/agg/include/agg_span_gradient_alpha.h diff --git a/desmume/src/windows/agg/include/agg_span_image_filter.h b/desmume/src/frontend/windows/agg/include/agg_span_image_filter.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_image_filter.h rename to desmume/src/frontend/windows/agg/include/agg_span_image_filter.h diff --git a/desmume/src/windows/agg/include/agg_span_image_filter_gray.h b/desmume/src/frontend/windows/agg/include/agg_span_image_filter_gray.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_image_filter_gray.h rename to desmume/src/frontend/windows/agg/include/agg_span_image_filter_gray.h diff --git a/desmume/src/windows/agg/include/agg_span_image_filter_rgb.h b/desmume/src/frontend/windows/agg/include/agg_span_image_filter_rgb.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_image_filter_rgb.h rename to desmume/src/frontend/windows/agg/include/agg_span_image_filter_rgb.h diff --git a/desmume/src/windows/agg/include/agg_span_image_filter_rgba.h b/desmume/src/frontend/windows/agg/include/agg_span_image_filter_rgba.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_image_filter_rgba.h rename to desmume/src/frontend/windows/agg/include/agg_span_image_filter_rgba.h diff --git a/desmume/src/windows/agg/include/agg_span_interpolator_adaptor.h b/desmume/src/frontend/windows/agg/include/agg_span_interpolator_adaptor.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_interpolator_adaptor.h rename to desmume/src/frontend/windows/agg/include/agg_span_interpolator_adaptor.h diff --git a/desmume/src/windows/agg/include/agg_span_interpolator_linear.h b/desmume/src/frontend/windows/agg/include/agg_span_interpolator_linear.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_interpolator_linear.h rename to desmume/src/frontend/windows/agg/include/agg_span_interpolator_linear.h diff --git a/desmume/src/windows/agg/include/agg_span_interpolator_persp.h b/desmume/src/frontend/windows/agg/include/agg_span_interpolator_persp.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_interpolator_persp.h rename to desmume/src/frontend/windows/agg/include/agg_span_interpolator_persp.h diff --git a/desmume/src/windows/agg/include/agg_span_interpolator_trans.h b/desmume/src/frontend/windows/agg/include/agg_span_interpolator_trans.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_interpolator_trans.h rename to desmume/src/frontend/windows/agg/include/agg_span_interpolator_trans.h diff --git a/desmume/src/windows/agg/include/agg_span_pattern_gray.h b/desmume/src/frontend/windows/agg/include/agg_span_pattern_gray.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_pattern_gray.h rename to desmume/src/frontend/windows/agg/include/agg_span_pattern_gray.h diff --git a/desmume/src/windows/agg/include/agg_span_pattern_rgb.h b/desmume/src/frontend/windows/agg/include/agg_span_pattern_rgb.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_pattern_rgb.h rename to desmume/src/frontend/windows/agg/include/agg_span_pattern_rgb.h diff --git a/desmume/src/windows/agg/include/agg_span_pattern_rgba.h b/desmume/src/frontend/windows/agg/include/agg_span_pattern_rgba.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_pattern_rgba.h rename to desmume/src/frontend/windows/agg/include/agg_span_pattern_rgba.h diff --git a/desmume/src/windows/agg/include/agg_span_solid.h b/desmume/src/frontend/windows/agg/include/agg_span_solid.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_solid.h rename to desmume/src/frontend/windows/agg/include/agg_span_solid.h diff --git a/desmume/src/windows/agg/include/agg_span_subdiv_adaptor.h b/desmume/src/frontend/windows/agg/include/agg_span_subdiv_adaptor.h similarity index 100% rename from desmume/src/windows/agg/include/agg_span_subdiv_adaptor.h rename to desmume/src/frontend/windows/agg/include/agg_span_subdiv_adaptor.h diff --git a/desmume/src/windows/agg/include/agg_trans_affine.h b/desmume/src/frontend/windows/agg/include/agg_trans_affine.h similarity index 100% rename from desmume/src/windows/agg/include/agg_trans_affine.h rename to desmume/src/frontend/windows/agg/include/agg_trans_affine.h diff --git a/desmume/src/windows/agg/include/agg_trans_bilinear.h b/desmume/src/frontend/windows/agg/include/agg_trans_bilinear.h similarity index 100% rename from desmume/src/windows/agg/include/agg_trans_bilinear.h rename to desmume/src/frontend/windows/agg/include/agg_trans_bilinear.h diff --git a/desmume/src/windows/agg/include/agg_trans_double_path.h b/desmume/src/frontend/windows/agg/include/agg_trans_double_path.h similarity index 100% rename from desmume/src/windows/agg/include/agg_trans_double_path.h rename to desmume/src/frontend/windows/agg/include/agg_trans_double_path.h diff --git a/desmume/src/windows/agg/include/agg_trans_perspective.h b/desmume/src/frontend/windows/agg/include/agg_trans_perspective.h similarity index 100% rename from desmume/src/windows/agg/include/agg_trans_perspective.h rename to desmume/src/frontend/windows/agg/include/agg_trans_perspective.h diff --git a/desmume/src/windows/agg/include/agg_trans_single_path.h b/desmume/src/frontend/windows/agg/include/agg_trans_single_path.h similarity index 100% rename from desmume/src/windows/agg/include/agg_trans_single_path.h rename to desmume/src/frontend/windows/agg/include/agg_trans_single_path.h diff --git a/desmume/src/windows/agg/include/agg_trans_viewport.h b/desmume/src/frontend/windows/agg/include/agg_trans_viewport.h similarity index 100% rename from desmume/src/windows/agg/include/agg_trans_viewport.h rename to desmume/src/frontend/windows/agg/include/agg_trans_viewport.h diff --git a/desmume/src/windows/agg/include/agg_trans_warp_magnifier.h b/desmume/src/frontend/windows/agg/include/agg_trans_warp_magnifier.h similarity index 100% rename from desmume/src/windows/agg/include/agg_trans_warp_magnifier.h rename to desmume/src/frontend/windows/agg/include/agg_trans_warp_magnifier.h diff --git a/desmume/src/windows/agg/include/agg_vcgen_bspline.h b/desmume/src/frontend/windows/agg/include/agg_vcgen_bspline.h similarity index 100% rename from desmume/src/windows/agg/include/agg_vcgen_bspline.h rename to desmume/src/frontend/windows/agg/include/agg_vcgen_bspline.h diff --git a/desmume/src/windows/agg/include/agg_vcgen_contour.h b/desmume/src/frontend/windows/agg/include/agg_vcgen_contour.h similarity index 100% rename from desmume/src/windows/agg/include/agg_vcgen_contour.h rename to desmume/src/frontend/windows/agg/include/agg_vcgen_contour.h diff --git a/desmume/src/windows/agg/include/agg_vcgen_dash.h b/desmume/src/frontend/windows/agg/include/agg_vcgen_dash.h similarity index 100% rename from desmume/src/windows/agg/include/agg_vcgen_dash.h rename to desmume/src/frontend/windows/agg/include/agg_vcgen_dash.h diff --git a/desmume/src/windows/agg/include/agg_vcgen_markers_term.h b/desmume/src/frontend/windows/agg/include/agg_vcgen_markers_term.h similarity index 100% rename from desmume/src/windows/agg/include/agg_vcgen_markers_term.h rename to desmume/src/frontend/windows/agg/include/agg_vcgen_markers_term.h diff --git a/desmume/src/windows/agg/include/agg_vcgen_smooth_poly1.h b/desmume/src/frontend/windows/agg/include/agg_vcgen_smooth_poly1.h similarity index 100% rename from desmume/src/windows/agg/include/agg_vcgen_smooth_poly1.h rename to desmume/src/frontend/windows/agg/include/agg_vcgen_smooth_poly1.h diff --git a/desmume/src/windows/agg/include/agg_vcgen_stroke.h b/desmume/src/frontend/windows/agg/include/agg_vcgen_stroke.h similarity index 100% rename from desmume/src/windows/agg/include/agg_vcgen_stroke.h rename to desmume/src/frontend/windows/agg/include/agg_vcgen_stroke.h diff --git a/desmume/src/windows/agg/include/agg_vcgen_vertex_sequence.h b/desmume/src/frontend/windows/agg/include/agg_vcgen_vertex_sequence.h similarity index 100% rename from desmume/src/windows/agg/include/agg_vcgen_vertex_sequence.h rename to desmume/src/frontend/windows/agg/include/agg_vcgen_vertex_sequence.h diff --git a/desmume/src/windows/agg/include/agg_vertex_sequence.h b/desmume/src/frontend/windows/agg/include/agg_vertex_sequence.h similarity index 100% rename from desmume/src/windows/agg/include/agg_vertex_sequence.h rename to desmume/src/frontend/windows/agg/include/agg_vertex_sequence.h diff --git a/desmume/src/windows/agg/include/agg_vpgen_clip_polygon.h b/desmume/src/frontend/windows/agg/include/agg_vpgen_clip_polygon.h similarity index 100% rename from desmume/src/windows/agg/include/agg_vpgen_clip_polygon.h rename to desmume/src/frontend/windows/agg/include/agg_vpgen_clip_polygon.h diff --git a/desmume/src/windows/agg/include/agg_vpgen_clip_polyline.h b/desmume/src/frontend/windows/agg/include/agg_vpgen_clip_polyline.h similarity index 100% rename from desmume/src/windows/agg/include/agg_vpgen_clip_polyline.h rename to desmume/src/frontend/windows/agg/include/agg_vpgen_clip_polyline.h diff --git a/desmume/src/windows/agg/include/agg_vpgen_segmentator.h b/desmume/src/frontend/windows/agg/include/agg_vpgen_segmentator.h similarity index 100% rename from desmume/src/windows/agg/include/agg_vpgen_segmentator.h rename to desmume/src/frontend/windows/agg/include/agg_vpgen_segmentator.h diff --git a/desmume/src/windows/agg/include/ctrl/agg_bezier_ctrl.h b/desmume/src/frontend/windows/agg/include/ctrl/agg_bezier_ctrl.h similarity index 100% rename from desmume/src/windows/agg/include/ctrl/agg_bezier_ctrl.h rename to desmume/src/frontend/windows/agg/include/ctrl/agg_bezier_ctrl.h diff --git a/desmume/src/windows/agg/include/ctrl/agg_cbox_ctrl.h b/desmume/src/frontend/windows/agg/include/ctrl/agg_cbox_ctrl.h similarity index 100% rename from desmume/src/windows/agg/include/ctrl/agg_cbox_ctrl.h rename to desmume/src/frontend/windows/agg/include/ctrl/agg_cbox_ctrl.h diff --git a/desmume/src/windows/agg/include/ctrl/agg_ctrl.h b/desmume/src/frontend/windows/agg/include/ctrl/agg_ctrl.h similarity index 100% rename from desmume/src/windows/agg/include/ctrl/agg_ctrl.h rename to desmume/src/frontend/windows/agg/include/ctrl/agg_ctrl.h diff --git a/desmume/src/windows/agg/include/ctrl/agg_gamma_ctrl.h b/desmume/src/frontend/windows/agg/include/ctrl/agg_gamma_ctrl.h similarity index 100% rename from desmume/src/windows/agg/include/ctrl/agg_gamma_ctrl.h rename to desmume/src/frontend/windows/agg/include/ctrl/agg_gamma_ctrl.h diff --git a/desmume/src/windows/agg/include/ctrl/agg_gamma_spline.h b/desmume/src/frontend/windows/agg/include/ctrl/agg_gamma_spline.h similarity index 100% rename from desmume/src/windows/agg/include/ctrl/agg_gamma_spline.h rename to desmume/src/frontend/windows/agg/include/ctrl/agg_gamma_spline.h diff --git a/desmume/src/windows/agg/include/ctrl/agg_polygon_ctrl.h b/desmume/src/frontend/windows/agg/include/ctrl/agg_polygon_ctrl.h similarity index 100% rename from desmume/src/windows/agg/include/ctrl/agg_polygon_ctrl.h rename to desmume/src/frontend/windows/agg/include/ctrl/agg_polygon_ctrl.h diff --git a/desmume/src/windows/agg/include/ctrl/agg_rbox_ctrl.h b/desmume/src/frontend/windows/agg/include/ctrl/agg_rbox_ctrl.h similarity index 100% rename from desmume/src/windows/agg/include/ctrl/agg_rbox_ctrl.h rename to desmume/src/frontend/windows/agg/include/ctrl/agg_rbox_ctrl.h diff --git a/desmume/src/windows/agg/include/ctrl/agg_scale_ctrl.h b/desmume/src/frontend/windows/agg/include/ctrl/agg_scale_ctrl.h similarity index 100% rename from desmume/src/windows/agg/include/ctrl/agg_scale_ctrl.h rename to desmume/src/frontend/windows/agg/include/ctrl/agg_scale_ctrl.h diff --git a/desmume/src/windows/agg/include/ctrl/agg_slider_ctrl.h b/desmume/src/frontend/windows/agg/include/ctrl/agg_slider_ctrl.h similarity index 100% rename from desmume/src/windows/agg/include/ctrl/agg_slider_ctrl.h rename to desmume/src/frontend/windows/agg/include/ctrl/agg_slider_ctrl.h diff --git a/desmume/src/windows/agg/include/ctrl/agg_spline_ctrl.h b/desmume/src/frontend/windows/agg/include/ctrl/agg_spline_ctrl.h similarity index 100% rename from desmume/src/windows/agg/include/ctrl/agg_spline_ctrl.h rename to desmume/src/frontend/windows/agg/include/ctrl/agg_spline_ctrl.h diff --git a/desmume/src/windows/agg/include/platform/agg_platform_support.h b/desmume/src/frontend/windows/agg/include/platform/agg_platform_support.h similarity index 100% rename from desmume/src/windows/agg/include/platform/agg_platform_support.h rename to desmume/src/frontend/windows/agg/include/platform/agg_platform_support.h diff --git a/desmume/src/windows/agg/include/platform/mac/agg_mac_pmap.h b/desmume/src/frontend/windows/agg/include/platform/mac/agg_mac_pmap.h similarity index 100% rename from desmume/src/windows/agg/include/platform/mac/agg_mac_pmap.h rename to desmume/src/frontend/windows/agg/include/platform/mac/agg_mac_pmap.h diff --git a/desmume/src/windows/agg/include/platform/win32/agg_win32_bmp.h b/desmume/src/frontend/windows/agg/include/platform/win32/agg_win32_bmp.h similarity index 100% rename from desmume/src/windows/agg/include/platform/win32/agg_win32_bmp.h rename to desmume/src/frontend/windows/agg/include/platform/win32/agg_win32_bmp.h diff --git a/desmume/src/windows/agg/include/util/agg_color_conv.h b/desmume/src/frontend/windows/agg/include/util/agg_color_conv.h similarity index 100% rename from desmume/src/windows/agg/include/util/agg_color_conv.h rename to desmume/src/frontend/windows/agg/include/util/agg_color_conv.h diff --git a/desmume/src/windows/agg/include/util/agg_color_conv_rgb16.h b/desmume/src/frontend/windows/agg/include/util/agg_color_conv_rgb16.h similarity index 100% rename from desmume/src/windows/agg/include/util/agg_color_conv_rgb16.h rename to desmume/src/frontend/windows/agg/include/util/agg_color_conv_rgb16.h diff --git a/desmume/src/windows/agg/include/util/agg_color_conv_rgb8.h b/desmume/src/frontend/windows/agg/include/util/agg_color_conv_rgb8.h similarity index 100% rename from desmume/src/windows/agg/include/util/agg_color_conv_rgb8.h rename to desmume/src/frontend/windows/agg/include/util/agg_color_conv_rgb8.h diff --git a/desmume/src/windows/agg/src/ChangeLog b/desmume/src/frontend/windows/agg/src/ChangeLog similarity index 100% rename from desmume/src/windows/agg/src/ChangeLog rename to desmume/src/frontend/windows/agg/src/ChangeLog diff --git a/desmume/src/windows/agg/src/Makefile b/desmume/src/frontend/windows/agg/src/Makefile similarity index 100% rename from desmume/src/windows/agg/src/Makefile rename to desmume/src/frontend/windows/agg/src/Makefile diff --git a/desmume/src/windows/agg/src/agg_arc.cpp b/desmume/src/frontend/windows/agg/src/agg_arc.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_arc.cpp rename to desmume/src/frontend/windows/agg/src/agg_arc.cpp diff --git a/desmume/src/windows/agg/src/agg_arrowhead.cpp b/desmume/src/frontend/windows/agg/src/agg_arrowhead.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_arrowhead.cpp rename to desmume/src/frontend/windows/agg/src/agg_arrowhead.cpp diff --git a/desmume/src/windows/agg/src/agg_bezier_arc.cpp b/desmume/src/frontend/windows/agg/src/agg_bezier_arc.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_bezier_arc.cpp rename to desmume/src/frontend/windows/agg/src/agg_bezier_arc.cpp diff --git a/desmume/src/windows/agg/src/agg_bspline.cpp b/desmume/src/frontend/windows/agg/src/agg_bspline.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_bspline.cpp rename to desmume/src/frontend/windows/agg/src/agg_bspline.cpp diff --git a/desmume/src/windows/agg/src/agg_curves.cpp b/desmume/src/frontend/windows/agg/src/agg_curves.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_curves.cpp rename to desmume/src/frontend/windows/agg/src/agg_curves.cpp diff --git a/desmume/src/windows/agg/src/agg_embedded_raster_fonts.cpp b/desmume/src/frontend/windows/agg/src/agg_embedded_raster_fonts.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_embedded_raster_fonts.cpp rename to desmume/src/frontend/windows/agg/src/agg_embedded_raster_fonts.cpp diff --git a/desmume/src/windows/agg/src/agg_gsv_text.cpp b/desmume/src/frontend/windows/agg/src/agg_gsv_text.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_gsv_text.cpp rename to desmume/src/frontend/windows/agg/src/agg_gsv_text.cpp diff --git a/desmume/src/windows/agg/src/agg_image_filters.cpp b/desmume/src/frontend/windows/agg/src/agg_image_filters.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_image_filters.cpp rename to desmume/src/frontend/windows/agg/src/agg_image_filters.cpp diff --git a/desmume/src/windows/agg/src/agg_line_aa_basics.cpp b/desmume/src/frontend/windows/agg/src/agg_line_aa_basics.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_line_aa_basics.cpp rename to desmume/src/frontend/windows/agg/src/agg_line_aa_basics.cpp diff --git a/desmume/src/windows/agg/src/agg_line_profile_aa.cpp b/desmume/src/frontend/windows/agg/src/agg_line_profile_aa.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_line_profile_aa.cpp rename to desmume/src/frontend/windows/agg/src/agg_line_profile_aa.cpp diff --git a/desmume/src/windows/agg/src/agg_rounded_rect.cpp b/desmume/src/frontend/windows/agg/src/agg_rounded_rect.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_rounded_rect.cpp rename to desmume/src/frontend/windows/agg/src/agg_rounded_rect.cpp diff --git a/desmume/src/windows/agg/src/agg_sqrt_tables.cpp b/desmume/src/frontend/windows/agg/src/agg_sqrt_tables.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_sqrt_tables.cpp rename to desmume/src/frontend/windows/agg/src/agg_sqrt_tables.cpp diff --git a/desmume/src/windows/agg/src/agg_trans_affine.cpp b/desmume/src/frontend/windows/agg/src/agg_trans_affine.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_trans_affine.cpp rename to desmume/src/frontend/windows/agg/src/agg_trans_affine.cpp diff --git a/desmume/src/windows/agg/src/agg_trans_double_path.cpp b/desmume/src/frontend/windows/agg/src/agg_trans_double_path.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_trans_double_path.cpp rename to desmume/src/frontend/windows/agg/src/agg_trans_double_path.cpp diff --git a/desmume/src/windows/agg/src/agg_trans_single_path.cpp b/desmume/src/frontend/windows/agg/src/agg_trans_single_path.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_trans_single_path.cpp rename to desmume/src/frontend/windows/agg/src/agg_trans_single_path.cpp diff --git a/desmume/src/windows/agg/src/agg_trans_warp_magnifier.cpp b/desmume/src/frontend/windows/agg/src/agg_trans_warp_magnifier.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_trans_warp_magnifier.cpp rename to desmume/src/frontend/windows/agg/src/agg_trans_warp_magnifier.cpp diff --git a/desmume/src/windows/agg/src/agg_vcgen_bspline.cpp b/desmume/src/frontend/windows/agg/src/agg_vcgen_bspline.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_vcgen_bspline.cpp rename to desmume/src/frontend/windows/agg/src/agg_vcgen_bspline.cpp diff --git a/desmume/src/windows/agg/src/agg_vcgen_contour.cpp b/desmume/src/frontend/windows/agg/src/agg_vcgen_contour.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_vcgen_contour.cpp rename to desmume/src/frontend/windows/agg/src/agg_vcgen_contour.cpp diff --git a/desmume/src/windows/agg/src/agg_vcgen_dash.cpp b/desmume/src/frontend/windows/agg/src/agg_vcgen_dash.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_vcgen_dash.cpp rename to desmume/src/frontend/windows/agg/src/agg_vcgen_dash.cpp diff --git a/desmume/src/windows/agg/src/agg_vcgen_markers_term.cpp b/desmume/src/frontend/windows/agg/src/agg_vcgen_markers_term.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_vcgen_markers_term.cpp rename to desmume/src/frontend/windows/agg/src/agg_vcgen_markers_term.cpp diff --git a/desmume/src/windows/agg/src/agg_vcgen_smooth_poly1.cpp b/desmume/src/frontend/windows/agg/src/agg_vcgen_smooth_poly1.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_vcgen_smooth_poly1.cpp rename to desmume/src/frontend/windows/agg/src/agg_vcgen_smooth_poly1.cpp diff --git a/desmume/src/windows/agg/src/agg_vcgen_stroke.cpp b/desmume/src/frontend/windows/agg/src/agg_vcgen_stroke.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_vcgen_stroke.cpp rename to desmume/src/frontend/windows/agg/src/agg_vcgen_stroke.cpp diff --git a/desmume/src/windows/agg/src/agg_vpgen_clip_polygon.cpp b/desmume/src/frontend/windows/agg/src/agg_vpgen_clip_polygon.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_vpgen_clip_polygon.cpp rename to desmume/src/frontend/windows/agg/src/agg_vpgen_clip_polygon.cpp diff --git a/desmume/src/windows/agg/src/agg_vpgen_clip_polyline.cpp b/desmume/src/frontend/windows/agg/src/agg_vpgen_clip_polyline.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_vpgen_clip_polyline.cpp rename to desmume/src/frontend/windows/agg/src/agg_vpgen_clip_polyline.cpp diff --git a/desmume/src/windows/agg/src/agg_vpgen_segmentator.cpp b/desmume/src/frontend/windows/agg/src/agg_vpgen_segmentator.cpp similarity index 100% rename from desmume/src/windows/agg/src/agg_vpgen_segmentator.cpp rename to desmume/src/frontend/windows/agg/src/agg_vpgen_segmentator.cpp diff --git a/desmume/src/windows/agg/src/authors b/desmume/src/frontend/windows/agg/src/authors similarity index 100% rename from desmume/src/windows/agg/src/authors rename to desmume/src/frontend/windows/agg/src/authors diff --git a/desmume/src/windows/agg/src/autogen.sh b/desmume/src/frontend/windows/agg/src/autogen.sh similarity index 100% rename from desmume/src/windows/agg/src/autogen.sh rename to desmume/src/frontend/windows/agg/src/autogen.sh diff --git a/desmume/src/windows/agg/src/configure.in b/desmume/src/frontend/windows/agg/src/configure.in similarity index 100% rename from desmume/src/windows/agg/src/configure.in rename to desmume/src/frontend/windows/agg/src/configure.in diff --git a/desmume/src/windows/agg/src/copying b/desmume/src/frontend/windows/agg/src/copying similarity index 100% rename from desmume/src/windows/agg/src/copying rename to desmume/src/frontend/windows/agg/src/copying diff --git a/desmume/src/windows/agg/src/ctrl/agg_bezier_ctrl.cpp b/desmume/src/frontend/windows/agg/src/ctrl/agg_bezier_ctrl.cpp similarity index 100% rename from desmume/src/windows/agg/src/ctrl/agg_bezier_ctrl.cpp rename to desmume/src/frontend/windows/agg/src/ctrl/agg_bezier_ctrl.cpp diff --git a/desmume/src/windows/agg/src/ctrl/agg_cbox_ctrl.cpp b/desmume/src/frontend/windows/agg/src/ctrl/agg_cbox_ctrl.cpp similarity index 100% rename from desmume/src/windows/agg/src/ctrl/agg_cbox_ctrl.cpp rename to desmume/src/frontend/windows/agg/src/ctrl/agg_cbox_ctrl.cpp diff --git a/desmume/src/windows/agg/src/ctrl/agg_gamma_ctrl.cpp b/desmume/src/frontend/windows/agg/src/ctrl/agg_gamma_ctrl.cpp similarity index 100% rename from desmume/src/windows/agg/src/ctrl/agg_gamma_ctrl.cpp rename to desmume/src/frontend/windows/agg/src/ctrl/agg_gamma_ctrl.cpp diff --git a/desmume/src/windows/agg/src/ctrl/agg_gamma_spline.cpp b/desmume/src/frontend/windows/agg/src/ctrl/agg_gamma_spline.cpp similarity index 100% rename from desmume/src/windows/agg/src/ctrl/agg_gamma_spline.cpp rename to desmume/src/frontend/windows/agg/src/ctrl/agg_gamma_spline.cpp diff --git a/desmume/src/windows/agg/src/ctrl/agg_polygon_ctrl.cpp b/desmume/src/frontend/windows/agg/src/ctrl/agg_polygon_ctrl.cpp similarity index 100% rename from desmume/src/windows/agg/src/ctrl/agg_polygon_ctrl.cpp rename to desmume/src/frontend/windows/agg/src/ctrl/agg_polygon_ctrl.cpp diff --git a/desmume/src/windows/agg/src/ctrl/agg_rbox_ctrl.cpp b/desmume/src/frontend/windows/agg/src/ctrl/agg_rbox_ctrl.cpp similarity index 100% rename from desmume/src/windows/agg/src/ctrl/agg_rbox_ctrl.cpp rename to desmume/src/frontend/windows/agg/src/ctrl/agg_rbox_ctrl.cpp diff --git a/desmume/src/windows/agg/src/ctrl/agg_scale_ctrl.cpp b/desmume/src/frontend/windows/agg/src/ctrl/agg_scale_ctrl.cpp similarity index 100% rename from desmume/src/windows/agg/src/ctrl/agg_scale_ctrl.cpp rename to desmume/src/frontend/windows/agg/src/ctrl/agg_scale_ctrl.cpp diff --git a/desmume/src/windows/agg/src/ctrl/agg_slider_ctrl.cpp b/desmume/src/frontend/windows/agg/src/ctrl/agg_slider_ctrl.cpp similarity index 100% rename from desmume/src/windows/agg/src/ctrl/agg_slider_ctrl.cpp rename to desmume/src/frontend/windows/agg/src/ctrl/agg_slider_ctrl.cpp diff --git a/desmume/src/windows/agg/src/ctrl/agg_spline_ctrl.cpp b/desmume/src/frontend/windows/agg/src/ctrl/agg_spline_ctrl.cpp similarity index 100% rename from desmume/src/windows/agg/src/ctrl/agg_spline_ctrl.cpp rename to desmume/src/frontend/windows/agg/src/ctrl/agg_spline_ctrl.cpp diff --git a/desmume/src/windows/agg/src/install b/desmume/src/frontend/windows/agg/src/install similarity index 100% rename from desmume/src/windows/agg/src/install rename to desmume/src/frontend/windows/agg/src/install diff --git a/desmume/src/windows/agg/src/news b/desmume/src/frontend/windows/agg/src/news similarity index 100% rename from desmume/src/windows/agg/src/news rename to desmume/src/frontend/windows/agg/src/news diff --git a/desmume/src/windows/agg/src/platform/win32/agg_platform_support.cpp b/desmume/src/frontend/windows/agg/src/platform/win32/agg_platform_support.cpp similarity index 100% rename from desmume/src/windows/agg/src/platform/win32/agg_platform_support.cpp rename to desmume/src/frontend/windows/agg/src/platform/win32/agg_platform_support.cpp diff --git a/desmume/src/windows/agg/src/platform/win32/agg_win32_bmp.cpp b/desmume/src/frontend/windows/agg/src/platform/win32/agg_win32_bmp.cpp similarity index 100% rename from desmume/src/windows/agg/src/platform/win32/agg_win32_bmp.cpp rename to desmume/src/frontend/windows/agg/src/platform/win32/agg_win32_bmp.cpp diff --git a/desmume/src/windows/agg/src/readme b/desmume/src/frontend/windows/agg/src/readme similarity index 100% rename from desmume/src/windows/agg/src/readme rename to desmume/src/frontend/windows/agg/src/readme diff --git a/desmume/src/windows/aviout.cpp b/desmume/src/frontend/windows/aviout.cpp similarity index 99% rename from desmume/src/windows/aviout.cpp rename to desmume/src/frontend/windows/aviout.cpp index cd34ac559..0e9c9a2db 100644 --- a/desmume/src/windows/aviout.cpp +++ b/desmume/src/frontend/windows/aviout.cpp @@ -22,11 +22,11 @@ #include #include -#include "../debug.h" -#include "../console.h" -#include "../gfx3d.h" -#include "../GPU_osd.h" -#include "../SPU.h" +#include "debug.h" +#include "console.h" +#include "gfx3d.h" +#include "GPU_osd.h" +#include "SPU.h" #include "video.h" #include "windriver.h" diff --git a/desmume/src/windows/aviout.h b/desmume/src/frontend/windows/aviout.h similarity index 94% rename from desmume/src/windows/aviout.h rename to desmume/src/frontend/windows/aviout.h index 17abaa61c..cf2ddc5d8 100644 --- a/desmume/src/windows/aviout.h +++ b/desmume/src/frontend/windows/aviout.h @@ -18,7 +18,7 @@ #ifndef _AVIOUT_H_ #define _AVIOUT_H_ -#include "../types.h" +#include "types.h" bool DRV_AviBegin(const char* fname); void DRV_AviEnd(); diff --git a/desmume/src/windows/bitmaps/FileBinary.ico b/desmume/src/frontend/windows/bitmaps/FileBinary.ico similarity index 100% rename from desmume/src/windows/bitmaps/FileBinary.ico rename to desmume/src/frontend/windows/bitmaps/FileBinary.ico diff --git a/desmume/src/windows/bitmaps/FolderClosed.ico b/desmume/src/frontend/windows/bitmaps/FolderClosed.ico similarity index 100% rename from desmume/src/windows/bitmaps/FolderClosed.ico rename to desmume/src/frontend/windows/bitmaps/FolderClosed.ico diff --git a/desmume/src/windows/bitmaps/FolderOpen.ico b/desmume/src/frontend/windows/bitmaps/FolderOpen.ico similarity index 100% rename from desmume/src/windows/bitmaps/FolderOpen.ico rename to desmume/src/frontend/windows/bitmaps/FolderOpen.ico diff --git a/desmume/src/windows/bitmaps/IDB_FRAMEADVANCE.bmp b/desmume/src/frontend/windows/bitmaps/IDB_FRAMEADVANCE.bmp similarity index 100% rename from desmume/src/windows/bitmaps/IDB_FRAMEADVANCE.bmp rename to desmume/src/frontend/windows/bitmaps/IDB_FRAMEADVANCE.bmp diff --git a/desmume/src/windows/bitmaps/IDB_OPEN.bmp b/desmume/src/frontend/windows/bitmaps/IDB_OPEN.bmp similarity index 100% rename from desmume/src/windows/bitmaps/IDB_OPEN.bmp rename to desmume/src/frontend/windows/bitmaps/IDB_OPEN.bmp diff --git a/desmume/src/windows/bitmaps/IDB_PAUSE.bmp b/desmume/src/frontend/windows/bitmaps/IDB_PAUSE.bmp similarity index 100% rename from desmume/src/windows/bitmaps/IDB_PAUSE.bmp rename to desmume/src/frontend/windows/bitmaps/IDB_PAUSE.bmp diff --git a/desmume/src/windows/bitmaps/IDB_PLAY.bmp b/desmume/src/frontend/windows/bitmaps/IDB_PLAY.bmp similarity index 100% rename from desmume/src/windows/bitmaps/IDB_PLAY.bmp rename to desmume/src/frontend/windows/bitmaps/IDB_PLAY.bmp diff --git a/desmume/src/windows/bitmaps/IDB_RESET.bmp b/desmume/src/frontend/windows/bitmaps/IDB_RESET.bmp similarity index 100% rename from desmume/src/windows/bitmaps/IDB_RESET.bmp rename to desmume/src/frontend/windows/bitmaps/IDB_RESET.bmp diff --git a/desmume/src/windows/bitmaps/IDB_ROTATECCW.bmp b/desmume/src/frontend/windows/bitmaps/IDB_ROTATECCW.bmp similarity index 100% rename from desmume/src/windows/bitmaps/IDB_ROTATECCW.bmp rename to desmume/src/frontend/windows/bitmaps/IDB_ROTATECCW.bmp diff --git a/desmume/src/windows/bitmaps/IDB_ROTATECW.bmp b/desmume/src/frontend/windows/bitmaps/IDB_ROTATECW.bmp similarity index 100% rename from desmume/src/windows/bitmaps/IDB_ROTATECW.bmp rename to desmume/src/frontend/windows/bitmaps/IDB_ROTATECW.bmp diff --git a/desmume/src/windows/bitmaps/IDB_STOP.bmp b/desmume/src/frontend/windows/bitmaps/IDB_STOP.bmp similarity index 100% rename from desmume/src/windows/bitmaps/IDB_STOP.bmp rename to desmume/src/frontend/windows/bitmaps/IDB_STOP.bmp diff --git a/desmume/src/windows/cheatsWin.cpp b/desmume/src/frontend/windows/cheatsWin.cpp similarity index 99% rename from desmume/src/windows/cheatsWin.cpp rename to desmume/src/frontend/windows/cheatsWin.cpp index 8c62f27c0..9b9f43f79 100644 --- a/desmume/src/windows/cheatsWin.cpp +++ b/desmume/src/frontend/windows/cheatsWin.cpp @@ -19,13 +19,13 @@ #include -#include "../common.h" -#include "../cheatSystem.h" -#include "../debug.h" -#include "../utils/xstring.h" -#include "../path.h" -#include "../NDSSystem.h" -#include "../version.h" +#include "common.h" +#include "cheatSystem.h" +#include "debug.h" +#include "utils/xstring.h" +#include "path.h" +#include "NDSSystem.h" +#include "version.h" #include "resource.h" #include "main.h" diff --git a/desmume/src/windows/cheatsWin.h b/desmume/src/frontend/windows/cheatsWin.h similarity index 95% rename from desmume/src/windows/cheatsWin.h rename to desmume/src/frontend/windows/cheatsWin.h index 7f43ac5f5..3b61976ad 100644 --- a/desmume/src/windows/cheatsWin.h +++ b/desmume/src/frontend/windows/cheatsWin.h @@ -19,7 +19,7 @@ #define _CHEATSWIN_H_ #include -#include "../types.h" +#include "types.h" extern void CheatsListDialog(HWND hwnd); extern void CheatsSearchDialog(HWND hwnd); diff --git a/desmume/src/windows/colorctrl.cpp b/desmume/src/frontend/windows/colorctrl.cpp similarity index 100% rename from desmume/src/windows/colorctrl.cpp rename to desmume/src/frontend/windows/colorctrl.cpp diff --git a/desmume/src/windows/colorctrl.h b/desmume/src/frontend/windows/colorctrl.h similarity index 100% rename from desmume/src/windows/colorctrl.h rename to desmume/src/frontend/windows/colorctrl.h diff --git a/desmume/src/windows/console.cpp b/desmume/src/frontend/windows/console.cpp similarity index 99% rename from desmume/src/windows/console.cpp rename to desmume/src/frontend/windows/console.cpp index bad4c2928..e73662c8e 100644 --- a/desmume/src/windows/console.cpp +++ b/desmume/src/frontend/windows/console.cpp @@ -1,5 +1,5 @@ /* - Copyright 2008-2015 DeSmuME team + Copyright 2008-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #include #include -#include "../version.h" +#include "version.h" #include "main.h" #include "winutil.h" diff --git a/desmume/src/windows/console.h b/desmume/src/frontend/windows/console.h similarity index 100% rename from desmume/src/windows/console.h rename to desmume/src/frontend/windows/console.h diff --git a/desmume/src/windows/defaultconfig/SubWCRev.bat b/desmume/src/frontend/windows/defaultconfig/SubWCRev.bat similarity index 100% rename from desmume/src/windows/defaultconfig/SubWCRev.bat rename to desmume/src/frontend/windows/defaultconfig/SubWCRev.bat diff --git a/desmume/src/windows/defaultconfig/SubWCRev.exe b/desmume/src/frontend/windows/defaultconfig/SubWCRev.exe similarity index 100% rename from desmume/src/windows/defaultconfig/SubWCRev.exe rename to desmume/src/frontend/windows/defaultconfig/SubWCRev.exe diff --git a/desmume/src/windows/defaultconfig/intl3_tsvn32.dll b/desmume/src/frontend/windows/defaultconfig/intl3_tsvn32.dll similarity index 100% rename from desmume/src/windows/defaultconfig/intl3_tsvn32.dll rename to desmume/src/frontend/windows/defaultconfig/intl3_tsvn32.dll diff --git a/desmume/src/windows/defaultconfig/libapr_tsvn32.dll b/desmume/src/frontend/windows/defaultconfig/libapr_tsvn32.dll similarity index 100% rename from desmume/src/windows/defaultconfig/libapr_tsvn32.dll rename to desmume/src/frontend/windows/defaultconfig/libapr_tsvn32.dll diff --git a/desmume/src/windows/defaultconfig/libaprutil_tsvn32.dll b/desmume/src/frontend/windows/defaultconfig/libaprutil_tsvn32.dll similarity index 100% rename from desmume/src/windows/defaultconfig/libaprutil_tsvn32.dll rename to desmume/src/frontend/windows/defaultconfig/libaprutil_tsvn32.dll diff --git a/desmume/src/windows/defaultconfig/libsasl32.dll b/desmume/src/frontend/windows/defaultconfig/libsasl32.dll similarity index 100% rename from desmume/src/windows/defaultconfig/libsasl32.dll rename to desmume/src/frontend/windows/defaultconfig/libsasl32.dll diff --git a/desmume/src/windows/defaultconfig/libsvn_tsvn32.dll b/desmume/src/frontend/windows/defaultconfig/libsvn_tsvn32.dll similarity index 100% rename from desmume/src/windows/defaultconfig/libsvn_tsvn32.dll rename to desmume/src/frontend/windows/defaultconfig/libsvn_tsvn32.dll diff --git a/desmume/src/windows/defaultconfig/svnrev.h b/desmume/src/frontend/windows/defaultconfig/svnrev.h similarity index 100% rename from desmume/src/windows/defaultconfig/svnrev.h rename to desmume/src/frontend/windows/defaultconfig/svnrev.h diff --git a/desmume/src/windows/defaultconfig/svnrev_template.h b/desmume/src/frontend/windows/defaultconfig/svnrev_template.h similarity index 100% rename from desmume/src/windows/defaultconfig/svnrev_template.h rename to desmume/src/frontend/windows/defaultconfig/svnrev_template.h diff --git a/desmume/src/windows/desmume.props b/desmume/src/frontend/windows/desmume.props similarity index 96% rename from desmume/src/windows/desmume.props rename to desmume/src/frontend/windows/desmume.props index 1abb27fe2..8e778e61e 100644 --- a/desmume/src/windows/desmume.props +++ b/desmume/src/frontend/windows/desmume.props @@ -86,7 +86,7 @@ - .;..;lua\include;glib-2.20.1\build;.\zlib128;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;directx;File_Extractor;..\libretro-common\include;%(AdditionalIncludeDirectories) + .;..\..;lua\include;glib-2.20.1\build;.\zlib128;.\zziplib;.\winpcap;userconfig;defaultconfig;.\agg\include;.\agg\examples;directx;File_Extractor;..\..\libretro-common\include;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_ZLIB_DEFLATE;HAVE_LIBZ;NOMINMAX;%(PreprocessorDefinitions) diff --git a/desmume/src/windows/directx/XAudio2.h b/desmume/src/frontend/windows/directx/XAudio2.h similarity index 100% rename from desmume/src/windows/directx/XAudio2.h rename to desmume/src/frontend/windows/directx/XAudio2.h diff --git a/desmume/src/windows/directx/XInput.h b/desmume/src/frontend/windows/directx/XInput.h similarity index 100% rename from desmume/src/windows/directx/XInput.h rename to desmume/src/frontend/windows/directx/XInput.h diff --git a/desmume/src/windows/directx/audiodefs.h b/desmume/src/frontend/windows/directx/audiodefs.h similarity index 100% rename from desmume/src/windows/directx/audiodefs.h rename to desmume/src/frontend/windows/directx/audiodefs.h diff --git a/desmume/src/windows/directx/comdecl.h b/desmume/src/frontend/windows/directx/comdecl.h similarity index 100% rename from desmume/src/windows/directx/comdecl.h rename to desmume/src/frontend/windows/directx/comdecl.h diff --git a/desmume/src/windows/directx/ddraw.h b/desmume/src/frontend/windows/directx/ddraw.h similarity index 100% rename from desmume/src/windows/directx/ddraw.h rename to desmume/src/frontend/windows/directx/ddraw.h diff --git a/desmume/src/windows/directx/dinput.h b/desmume/src/frontend/windows/directx/dinput.h similarity index 100% rename from desmume/src/windows/directx/dinput.h rename to desmume/src/frontend/windows/directx/dinput.h diff --git a/desmume/src/windows/directx/directx.7z b/desmume/src/frontend/windows/directx/directx.7z similarity index 100% rename from desmume/src/windows/directx/directx.7z rename to desmume/src/frontend/windows/directx/directx.7z diff --git a/desmume/src/windows/directx/dsound.h b/desmume/src/frontend/windows/directx/dsound.h similarity index 100% rename from desmume/src/windows/directx/dsound.h rename to desmume/src/frontend/windows/directx/dsound.h diff --git a/desmume/src/windows/directx/dxerr8.h b/desmume/src/frontend/windows/directx/dxerr8.h similarity index 100% rename from desmume/src/windows/directx/dxerr8.h rename to desmume/src/frontend/windows/directx/dxerr8.h diff --git a/desmume/src/windows/directx/xma2defs.h b/desmume/src/frontend/windows/directx/xma2defs.h similarity index 100% rename from desmume/src/windows/directx/xma2defs.h rename to desmume/src/frontend/windows/directx/xma2defs.h diff --git a/desmume/src/windows/disView.cpp b/desmume/src/frontend/windows/disView.cpp similarity index 99% rename from desmume/src/windows/disView.cpp rename to desmume/src/frontend/windows/disView.cpp index 32b51d9cb..368d62c20 100644 --- a/desmume/src/windows/disView.cpp +++ b/desmume/src/frontend/windows/disView.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2006 yopyop - Copyright (C) 2006-2015 DeSmuME team + Copyright (C) 2006-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,10 +23,10 @@ #include #include -#include "../MMU.h" -#include "../Disassembler.h" -#include "../NDSSystem.h" -#include "../armcpu.h" +#include "MMU.h" +#include "Disassembler.h" +#include "NDSSystem.h" +#include "armcpu.h" #include "resource.h" #include "main.h" diff --git a/desmume/src/windows/disView.h b/desmume/src/frontend/windows/disView.h similarity index 100% rename from desmume/src/windows/disView.h rename to desmume/src/frontend/windows/disView.h diff --git a/desmume/src/windows/fsnitroView.cpp b/desmume/src/frontend/windows/fsnitroView.cpp similarity index 95% rename from desmume/src/windows/fsnitroView.cpp rename to desmume/src/frontend/windows/fsnitroView.cpp index 30fbe7da2..27e585aed 100644 --- a/desmume/src/windows/fsnitroView.cpp +++ b/desmume/src/frontend/windows/fsnitroView.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 DeSmuME team + Copyright (C) 2013-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ #include "fsnitroView.h" #include -#include "../path.h" -#include "../common.h" -#include "../NDSSystem.h" -#include "../MMU.h" -#include "../utils/fsnitro.h" +#include "path.h" +#include "common.h" +#include "NDSSystem.h" +#include "MMU.h" +#include "utils/fsnitro.h" #include "resource.h" #include "CWindow.h" diff --git a/desmume/src/windows/fsnitroView.h b/desmume/src/frontend/windows/fsnitroView.h similarity index 100% rename from desmume/src/windows/fsnitroView.h rename to desmume/src/frontend/windows/fsnitroView.h diff --git a/desmume/src/windows/gbaslot_config.cpp b/desmume/src/frontend/windows/gbaslot_config.cpp similarity index 99% rename from desmume/src/windows/gbaslot_config.cpp rename to desmume/src/frontend/windows/gbaslot_config.cpp index 2a40f980d..75bb02053 100644 --- a/desmume/src/windows/gbaslot_config.cpp +++ b/desmume/src/frontend/windows/gbaslot_config.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2009-2015 DeSmuME team + Copyright (C) 2009-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,9 +20,9 @@ #include #include -#include "../debug.h" -#include "../slot2.h" -#include "../NDSSystem.h" +#include "debug.h" +#include "slot2.h" +#include "NDSSystem.h" #include "resource.h" #include "inputdx.h" diff --git a/desmume/src/windows/gbaslot_config.h b/desmume/src/frontend/windows/gbaslot_config.h similarity index 100% rename from desmume/src/windows/gbaslot_config.h rename to desmume/src/frontend/windows/gbaslot_config.h diff --git a/desmume/src/windows/ginfo.cpp b/desmume/src/frontend/windows/ginfo.cpp similarity index 98% rename from desmume/src/windows/ginfo.cpp rename to desmume/src/frontend/windows/ginfo.cpp index 392ea4232..4749b4eb8 100644 --- a/desmume/src/windows/ginfo.cpp +++ b/desmume/src/frontend/windows/ginfo.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2006 yopyop - Copyright (C) 2006-2015 DeSmuME team + Copyright (C) 2006-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,9 +21,9 @@ #include #include -#include "../common.h" -#include "../MMU.h" -#include "../NDSSystem.h" +#include "common.h" +#include "MMU.h" +#include "NDSSystem.h" #include "resource.h" #include "FirmConfig.h" diff --git a/desmume/src/windows/ginfo.h b/desmume/src/frontend/windows/ginfo.h similarity index 100% rename from desmume/src/windows/ginfo.h rename to desmume/src/frontend/windows/ginfo.h diff --git a/desmume/src/windows/hotkey.cpp b/desmume/src/frontend/windows/hotkey.cpp similarity index 100% rename from desmume/src/windows/hotkey.cpp rename to desmume/src/frontend/windows/hotkey.cpp diff --git a/desmume/src/windows/hotkey.h b/desmume/src/frontend/windows/hotkey.h similarity index 96% rename from desmume/src/windows/hotkey.h rename to desmume/src/frontend/windows/hotkey.h index 82c4f73f4..6c46ab99b 100644 --- a/desmume/src/windows/hotkey.h +++ b/desmume/src/frontend/windows/hotkey.h @@ -1,6 +1,6 @@ /* Copyright (C) 2006 yopyop - Copyright (C) 2008-2015 DeSmuME team + Copyright (C) 2008-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ #include #include #include -#include "../types.h" +#include "types.h" enum HotkeyPage { HOTKEY_PAGE_MAIN=0, diff --git a/desmume/src/windows/importSave.cpp b/desmume/src/frontend/windows/importSave.cpp similarity index 94% rename from desmume/src/windows/importSave.cpp rename to desmume/src/frontend/windows/importSave.cpp index 655a92dba..9a8d64f60 100644 --- a/desmume/src/windows/importSave.cpp +++ b/desmume/src/frontend/windows/importSave.cpp @@ -18,11 +18,11 @@ #include "importSave.h" -#include "../types.h" -#include "../path.h" -#include "../MMU.h" -#include "../NDSSystem.h" -#include "../utils/advanscene.h" +#include "types.h" +#include "path.h" +#include "MMU.h" +#include "NDSSystem.h" +#include "utils/advanscene.h" #include "resource.h" diff --git a/desmume/src/windows/importSave.h b/desmume/src/frontend/windows/importSave.h similarity index 100% rename from desmume/src/windows/importSave.h rename to desmume/src/frontend/windows/importSave.h diff --git a/desmume/src/windows/inputdx.cpp b/desmume/src/frontend/windows/inputdx.cpp similarity index 99% rename from desmume/src/windows/inputdx.cpp rename to desmume/src/frontend/windows/inputdx.cpp index 54c8b8b18..c1e9cf8e5 100644 --- a/desmume/src/windows/inputdx.cpp +++ b/desmume/src/frontend/windows/inputdx.cpp @@ -3,7 +3,7 @@ licensed under the terms supplied at the end of this file (for the terms are very long!) Differences from that baseline version are: - Copyright (C) 2009-2015 DeSmuME team + Copyright (C) 2009-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,11 +41,11 @@ #include #endif -#include "../types.h" -#include "../common.h" -#include "../NDSSystem.h" -#include "../slot2.h" -#include "../debug.h" +#include "types.h" +#include "common.h" +#include "NDSSystem.h" +#include "slot2.h" +#include "debug.h" #include "resource.h" #include "hotkey.h" diff --git a/desmume/src/windows/inputdx.h b/desmume/src/frontend/windows/inputdx.h similarity index 100% rename from desmume/src/windows/inputdx.h rename to desmume/src/frontend/windows/inputdx.h diff --git a/desmume/src/windows/lightView.cpp b/desmume/src/frontend/windows/lightView.cpp similarity index 98% rename from desmume/src/windows/lightView.cpp rename to desmume/src/frontend/windows/lightView.cpp index a92c0495d..90d7698b5 100644 --- a/desmume/src/windows/lightView.cpp +++ b/desmume/src/frontend/windows/lightView.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2007 Acid Burn - Copyright (C) 2008-2015 DeSmuME team + Copyright (C) 2008-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,8 +20,8 @@ #include -#include "../debug.h" -#include "../gfx3d.h" +#include "debug.h" +#include "gfx3d.h" #include "colorctrl.h" #include "resource.h" diff --git a/desmume/src/windows/lightView.h b/desmume/src/frontend/windows/lightView.h similarity index 100% rename from desmume/src/windows/lightView.h rename to desmume/src/frontend/windows/lightView.h diff --git a/desmume/src/windows/lua/include/lapi.h b/desmume/src/frontend/windows/lua/include/lapi.h similarity index 100% rename from desmume/src/windows/lua/include/lapi.h rename to desmume/src/frontend/windows/lua/include/lapi.h diff --git a/desmume/src/windows/lua/include/lauxlib.h b/desmume/src/frontend/windows/lua/include/lauxlib.h similarity index 100% rename from desmume/src/windows/lua/include/lauxlib.h rename to desmume/src/frontend/windows/lua/include/lauxlib.h diff --git a/desmume/src/windows/lua/include/lcode.h b/desmume/src/frontend/windows/lua/include/lcode.h similarity index 100% rename from desmume/src/windows/lua/include/lcode.h rename to desmume/src/frontend/windows/lua/include/lcode.h diff --git a/desmume/src/windows/lua/include/ldebug.h b/desmume/src/frontend/windows/lua/include/ldebug.h similarity index 100% rename from desmume/src/windows/lua/include/ldebug.h rename to desmume/src/frontend/windows/lua/include/ldebug.h diff --git a/desmume/src/windows/lua/include/ldo.h b/desmume/src/frontend/windows/lua/include/ldo.h similarity index 100% rename from desmume/src/windows/lua/include/ldo.h rename to desmume/src/frontend/windows/lua/include/ldo.h diff --git a/desmume/src/windows/lua/include/lfunc.h b/desmume/src/frontend/windows/lua/include/lfunc.h similarity index 100% rename from desmume/src/windows/lua/include/lfunc.h rename to desmume/src/frontend/windows/lua/include/lfunc.h diff --git a/desmume/src/windows/lua/include/lgc.h b/desmume/src/frontend/windows/lua/include/lgc.h similarity index 100% rename from desmume/src/windows/lua/include/lgc.h rename to desmume/src/frontend/windows/lua/include/lgc.h diff --git a/desmume/src/windows/lua/include/llex.h b/desmume/src/frontend/windows/lua/include/llex.h similarity index 100% rename from desmume/src/windows/lua/include/llex.h rename to desmume/src/frontend/windows/lua/include/llex.h diff --git a/desmume/src/windows/lua/include/llimits.h b/desmume/src/frontend/windows/lua/include/llimits.h similarity index 100% rename from desmume/src/windows/lua/include/llimits.h rename to desmume/src/frontend/windows/lua/include/llimits.h diff --git a/desmume/src/windows/lua/include/lmem.h b/desmume/src/frontend/windows/lua/include/lmem.h similarity index 100% rename from desmume/src/windows/lua/include/lmem.h rename to desmume/src/frontend/windows/lua/include/lmem.h diff --git a/desmume/src/windows/lua/include/lobject.h b/desmume/src/frontend/windows/lua/include/lobject.h similarity index 100% rename from desmume/src/windows/lua/include/lobject.h rename to desmume/src/frontend/windows/lua/include/lobject.h diff --git a/desmume/src/windows/lua/include/lopcodes.h b/desmume/src/frontend/windows/lua/include/lopcodes.h similarity index 100% rename from desmume/src/windows/lua/include/lopcodes.h rename to desmume/src/frontend/windows/lua/include/lopcodes.h diff --git a/desmume/src/windows/lua/include/lparser.h b/desmume/src/frontend/windows/lua/include/lparser.h similarity index 100% rename from desmume/src/windows/lua/include/lparser.h rename to desmume/src/frontend/windows/lua/include/lparser.h diff --git a/desmume/src/windows/lua/include/lstate.h b/desmume/src/frontend/windows/lua/include/lstate.h similarity index 100% rename from desmume/src/windows/lua/include/lstate.h rename to desmume/src/frontend/windows/lua/include/lstate.h diff --git a/desmume/src/windows/lua/include/lstring.h b/desmume/src/frontend/windows/lua/include/lstring.h similarity index 100% rename from desmume/src/windows/lua/include/lstring.h rename to desmume/src/frontend/windows/lua/include/lstring.h diff --git a/desmume/src/windows/lua/include/ltable.h b/desmume/src/frontend/windows/lua/include/ltable.h similarity index 100% rename from desmume/src/windows/lua/include/ltable.h rename to desmume/src/frontend/windows/lua/include/ltable.h diff --git a/desmume/src/windows/lua/include/ltm.h b/desmume/src/frontend/windows/lua/include/ltm.h similarity index 100% rename from desmume/src/windows/lua/include/ltm.h rename to desmume/src/frontend/windows/lua/include/ltm.h diff --git a/desmume/src/windows/lua/include/lua.h b/desmume/src/frontend/windows/lua/include/lua.h similarity index 100% rename from desmume/src/windows/lua/include/lua.h rename to desmume/src/frontend/windows/lua/include/lua.h diff --git a/desmume/src/windows/lua/include/lua.hpp b/desmume/src/frontend/windows/lua/include/lua.hpp similarity index 100% rename from desmume/src/windows/lua/include/lua.hpp rename to desmume/src/frontend/windows/lua/include/lua.hpp diff --git a/desmume/src/windows/lua/include/luaconf.h b/desmume/src/frontend/windows/lua/include/luaconf.h similarity index 100% rename from desmume/src/windows/lua/include/luaconf.h rename to desmume/src/frontend/windows/lua/include/luaconf.h diff --git a/desmume/src/windows/lua/include/lualib.h b/desmume/src/frontend/windows/lua/include/lualib.h similarity index 100% rename from desmume/src/windows/lua/include/lualib.h rename to desmume/src/frontend/windows/lua/include/lualib.h diff --git a/desmume/src/windows/lua/include/lundump.h b/desmume/src/frontend/windows/lua/include/lundump.h similarity index 100% rename from desmume/src/windows/lua/include/lundump.h rename to desmume/src/frontend/windows/lua/include/lundump.h diff --git a/desmume/src/windows/lua/include/lvm.h b/desmume/src/frontend/windows/lua/include/lvm.h similarity index 100% rename from desmume/src/windows/lua/include/lvm.h rename to desmume/src/frontend/windows/lua/include/lvm.h diff --git a/desmume/src/windows/lua/include/lzio.h b/desmume/src/frontend/windows/lua/include/lzio.h similarity index 100% rename from desmume/src/windows/lua/include/lzio.h rename to desmume/src/frontend/windows/lua/include/lzio.h diff --git a/desmume/src/windows/lua/lua-megapack_from_tastools b/desmume/src/frontend/windows/lua/lua-megapack_from_tastools similarity index 100% rename from desmume/src/windows/lua/lua-megapack_from_tastools rename to desmume/src/frontend/windows/lua/lua-megapack_from_tastools diff --git a/desmume/src/windows/lua/lua.7z b/desmume/src/frontend/windows/lua/lua.7z similarity index 100% rename from desmume/src/windows/lua/lua.7z rename to desmume/src/frontend/windows/lua/lua.7z diff --git a/desmume/src/windows/luaconsole.cpp b/desmume/src/frontend/windows/luaconsole.cpp similarity index 96% rename from desmume/src/windows/luaconsole.cpp rename to desmume/src/frontend/windows/luaconsole.cpp index 0eb2225f2..0b52fdac5 100644 --- a/desmume/src/windows/luaconsole.cpp +++ b/desmume/src/frontend/windows/luaconsole.cpp @@ -23,8 +23,8 @@ #include #include -#include "../driver.h" -#include "../lua-engine.h" +#include "driver.h" +#include "lua-engine.h" #include "resource.h" #include "main.h" diff --git a/desmume/src/windows/main.cpp b/desmume/src/frontend/windows/main.cpp similarity index 99% rename from desmume/src/windows/main.cpp rename to desmume/src/frontend/windows/main.cpp index d1d381358..82975bec2 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/frontend/windows/main.cpp @@ -39,32 +39,32 @@ #include //emulator core -#include "../common.h" //wtf this needs to disappear -#include "../MMU.h" -#include "../armcpu.h" -#include "../NDSSystem.h" -#include "../driver.h" -#include "../debug.h" -#include "../saves.h" -#include "../slot1.h" -#include "../slot2.h" -#include "../GPU.h" -#include "../GPU_osd.h" -#include "../SPU.h" -#include "../OGLRender.h" -#include "../OGLRender_3_2.h" -#include "../rasterize.h" -#include "../gfx3d.h" -#include "../render3D.h" -#include "../gdbstub.h" -#include "../wifi.h" -#include "../cheatSystem.h" -#include "../mic.h" -#include "../movie.h" -#include "../firmware.h" -#include "../lua-engine.h" -#include "../path.h" -#include "../utils/advanscene.h" +#include "common.h" //wtf this needs to disappear +#include "MMU.h" +#include "armcpu.h" +#include "NDSSystem.h" +#include "driver.h" +#include "debug.h" +#include "saves.h" +#include "slot1.h" +#include "slot2.h" +#include "GPU.h" +#include "GPU_osd.h" +#include "SPU.h" +#include "OGLRender.h" +#include "OGLRender_3_2.h" +#include "rasterize.h" +#include "gfx3d.h" +#include "render3D.h" +#include "gdbstub.h" +#include "wifi.h" +#include "cheatSystem.h" +#include "mic.h" +#include "movie.h" +#include "firmware.h" +#include "lua-engine.h" +#include "path.h" +#include "utils/advanscene.h" //other random stuff #include "rthreads/rthreads.h" diff --git a/desmume/src/windows/main.h b/desmume/src/frontend/windows/main.h similarity index 95% rename from desmume/src/windows/main.h rename to desmume/src/frontend/windows/main.h index a216cb1d4..d59f9cc62 100644 --- a/desmume/src/windows/main.h +++ b/desmume/src/frontend/windows/main.h @@ -1,6 +1,6 @@ /* Copyright (C) 2006 Theo Berkau - Copyright (C) 2006-2015 DeSmuME team + Copyright (C) 2006-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ #define WIN32_LEAN_AND_MEAN #include -#include "../types.h" +#include "types.h" #include "CWindow.h" extern WINCLASS *MainWindow; diff --git a/desmume/src/windows/mapView.cpp b/desmume/src/frontend/windows/mapView.cpp similarity index 98% rename from desmume/src/windows/mapView.cpp rename to desmume/src/frontend/windows/mapView.cpp index a33acbabd..094430571 100644 --- a/desmume/src/windows/mapView.cpp +++ b/desmume/src/frontend/windows/mapView.cpp @@ -20,10 +20,10 @@ #include -#include "../GPU.h" -#include "../MMU.h" -#include "../NDSSystem.h" -#include "../debug.h" +#include "GPU.h" +#include "MMU.h" +#include "NDSSystem.h" +#include "debug.h" #include "resource.h" #include "main.h" diff --git a/desmume/src/windows/mapView.h b/desmume/src/frontend/windows/mapView.h similarity index 100% rename from desmume/src/windows/mapView.h rename to desmume/src/frontend/windows/mapView.h diff --git a/desmume/src/windows/matrixView.cpp b/desmume/src/frontend/windows/matrixView.cpp similarity index 99% rename from desmume/src/windows/matrixView.cpp rename to desmume/src/frontend/windows/matrixView.cpp index f983b2898..060a9b343 100644 --- a/desmume/src/windows/matrixView.cpp +++ b/desmume/src/frontend/windows/matrixView.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2007 Acid Burn - Copyright (C) 2007-2015 DeSmuME team + Copyright (C) 2007-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,8 +20,8 @@ #include -#include "../debug.h" -#include "../gfx3d.h" +#include "debug.h" +#include "gfx3d.h" #include "resource.h" #include "main.h" diff --git a/desmume/src/windows/matrixView.h b/desmume/src/frontend/windows/matrixView.h similarity index 100% rename from desmume/src/windows/matrixView.h rename to desmume/src/frontend/windows/matrixView.h diff --git a/desmume/src/windows/memView.cpp b/desmume/src/frontend/windows/memView.cpp similarity index 99% rename from desmume/src/windows/memView.cpp rename to desmume/src/frontend/windows/memView.cpp index c9b870def..c29bdcec5 100644 --- a/desmume/src/windows/memView.cpp +++ b/desmume/src/frontend/windows/memView.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2006 yopyop - Copyright (C) 2006-2015 DeSmuME team + Copyright (C) 2006-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,11 +22,11 @@ #include #include -#include "../common.h" -#include "../NDSSystem.h" -#include "../emufile.h" -#include "../MMU.h" -#include "../debug.h" +#include "common.h" +#include "NDSSystem.h" +#include "emufile.h" +#include "MMU.h" +#include "debug.h" #include "resource.h" #include "winutil.h" diff --git a/desmume/src/windows/memView.h b/desmume/src/frontend/windows/memView.h similarity index 91% rename from desmume/src/windows/memView.h rename to desmume/src/frontend/windows/memView.h index 1bf75d82b..eb2fb9c0e 100644 --- a/desmume/src/windows/memView.h +++ b/desmume/src/frontend/windows/memView.h @@ -1,6 +1,6 @@ /* Copyright (C) 2006 yopyop - Copyright (C) 2008-2015 DeSmuME team + Copyright (C) 2008-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ #include #include "CWindow.h" -#include "../types.h" +#include "types.h" enum MemRegionType { MEMVIEW_ARM9 = 0, diff --git a/desmume/src/windows/mic-win.cpp b/desmume/src/frontend/windows/mic-win.cpp similarity index 98% rename from desmume/src/windows/mic-win.cpp rename to desmume/src/frontend/windows/mic-win.cpp index 6de4ad42d..9592f595a 100644 --- a/desmume/src/windows/mic-win.cpp +++ b/desmume/src/frontend/windows/mic-win.cpp @@ -24,7 +24,7 @@ documented on GBATek. */ -#include "../mic.h" +#include "mic.h" #include #include @@ -32,12 +32,12 @@ #include #include -#include "../types.h" -#include "../NDSSystem.h" -#include "../emufile.h" -#include "../debug.h" -#include "../movie.h" -#include "../readwrite.h" +#include "types.h" +#include "NDSSystem.h" +#include "emufile.h" +#include "debug.h" +#include "movie.h" +#include "readwrite.h" int MicDisplay; int SampleLoaded=0; diff --git a/desmume/src/windows/oamView.cpp b/desmume/src/frontend/windows/oamView.cpp similarity index 99% rename from desmume/src/windows/oamView.cpp rename to desmume/src/frontend/windows/oamView.cpp index c09780b08..b02e7cc29 100644 --- a/desmume/src/windows/oamView.cpp +++ b/desmume/src/frontend/windows/oamView.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2006 yopyop - Copyright (C) 2006-2015 DeSmuME team + Copyright (C) 2006-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,10 +20,10 @@ #include -#include "../debug.h" -#include "../MMU.h" -#include "../GPU.h" -#include "../NDSSystem.h" +#include "debug.h" +#include "MMU.h" +#include "GPU.h" +#include "NDSSystem.h" #include "resource.h" #include "windriver.h" diff --git a/desmume/src/windows/oamView.h b/desmume/src/frontend/windows/oamView.h similarity index 100% rename from desmume/src/windows/oamView.h rename to desmume/src/frontend/windows/oamView.h diff --git a/desmume/src/windows/ogl.cpp b/desmume/src/frontend/windows/ogl.cpp similarity index 98% rename from desmume/src/windows/ogl.cpp rename to desmume/src/frontend/windows/ogl.cpp index d25c1f35d..38119fb22 100644 --- a/desmume/src/windows/ogl.cpp +++ b/desmume/src/frontend/windows/ogl.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2006-2013 DeSmuME team + Copyright (C) 2006-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,8 +16,8 @@ */ #define WIN32_LEAN_AND_MEAN -#include "../common.h" -#include "../debug.h" +#include "common.h" +#include "debug.h" //in case we ever need glew //#define GLEW_STATIC diff --git a/desmume/src/windows/ogl.h b/desmume/src/frontend/windows/ogl.h similarity index 100% rename from desmume/src/windows/ogl.h rename to desmume/src/frontend/windows/ogl.h diff --git a/desmume/src/windows/palView.cpp b/desmume/src/frontend/windows/palView.cpp similarity index 99% rename from desmume/src/windows/palView.cpp rename to desmume/src/frontend/windows/palView.cpp index b484f97fd..cea732e45 100644 --- a/desmume/src/windows/palView.cpp +++ b/desmume/src/frontend/windows/palView.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2006 yopyop - Copyright (C) 2006-2015 DeSmuME team + Copyright (C) 2006-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,10 +20,10 @@ #include -#include "../types.h" -#include "../debug.h" -#include "../MMU.h" -#include "../gfx3d.h" +#include "types.h" +#include "debug.h" +#include "MMU.h" +#include "gfx3d.h" #include "resource.h" #include "main.h" diff --git a/desmume/src/windows/palView.h b/desmume/src/frontend/windows/palView.h similarity index 100% rename from desmume/src/windows/palView.h rename to desmume/src/frontend/windows/palView.h diff --git a/desmume/src/windows/pathsettings.cpp b/desmume/src/frontend/windows/pathsettings.cpp similarity index 100% rename from desmume/src/windows/pathsettings.cpp rename to desmume/src/frontend/windows/pathsettings.cpp diff --git a/desmume/src/windows/pathsettings.h b/desmume/src/frontend/windows/pathsettings.h similarity index 100% rename from desmume/src/windows/pathsettings.h rename to desmume/src/frontend/windows/pathsettings.h diff --git a/desmume/src/windows/ram_search.cpp b/desmume/src/frontend/windows/ram_search.cpp similarity index 99% rename from desmume/src/windows/ram_search.cpp rename to desmume/src/frontend/windows/ram_search.cpp index 80f37541d..e9ca52889 100644 --- a/desmume/src/windows/ram_search.cpp +++ b/desmume/src/frontend/windows/ram_search.cpp @@ -2,7 +2,7 @@ //Authors: Nitsuja, Upthorn, adelikat /* - Modifications Copyright (C) 2009-2015 DeSmuME team + Modifications Copyright (C) 2009-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -55,9 +55,9 @@ #include #include -#include "../common.h" -#include "../NDSSystem.h" -#include "../MMU.h" +#include "common.h" +#include "NDSSystem.h" +#include "MMU.h" #include "resource.h" #include "main.h" diff --git a/desmume/src/windows/ram_search.h b/desmume/src/frontend/windows/ram_search.h similarity index 100% rename from desmume/src/windows/ram_search.h rename to desmume/src/frontend/windows/ram_search.h diff --git a/desmume/src/windows/ramwatch.cpp b/desmume/src/frontend/windows/ramwatch.cpp similarity index 99% rename from desmume/src/windows/ramwatch.cpp rename to desmume/src/frontend/windows/ramwatch.cpp index de4900979..88457fb8d 100644 --- a/desmume/src/windows/ramwatch.cpp +++ b/desmume/src/frontend/windows/ramwatch.cpp @@ -2,7 +2,7 @@ //Authors: adelikat, Upthorn, Nitsuja /* - Modifications Copyright (C) 2009-2015 DeSmuME team + Modifications Copyright (C) 2009-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,10 +26,10 @@ #include #include -#include "../common.h" -#include "../NDSSystem.h" -#include "../path.h" -#include "../MMU.h" +#include "common.h" +#include "NDSSystem.h" +#include "path.h" +#include "MMU.h" #include "resource.h" #include "main.h" diff --git a/desmume/src/windows/ramwatch.h b/desmume/src/frontend/windows/ramwatch.h similarity index 100% rename from desmume/src/windows/ramwatch.h rename to desmume/src/frontend/windows/ramwatch.h diff --git a/desmume/src/windows/recentroms.cpp b/desmume/src/frontend/windows/recentroms.cpp similarity index 95% rename from desmume/src/windows/recentroms.cpp rename to desmume/src/frontend/windows/recentroms.cpp index a90968b8a..bf351c988 100644 --- a/desmume/src/windows/recentroms.cpp +++ b/desmume/src/frontend/windows/recentroms.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2008-2015 DeSmuME team + Copyright (C) 2008-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ #include #include -#include "../common.h" +#include "common.h" #include "resource.h" #include "winutil.h" diff --git a/desmume/src/windows/recentroms.h b/desmume/src/frontend/windows/recentroms.h similarity index 100% rename from desmume/src/windows/recentroms.h rename to desmume/src/frontend/windows/recentroms.h diff --git a/desmume/src/windows/replay.cpp b/desmume/src/frontend/windows/replay.cpp similarity index 99% rename from desmume/src/windows/replay.cpp rename to desmume/src/frontend/windows/replay.cpp index aca507e40..a185623f0 100644 --- a/desmume/src/windows/replay.cpp +++ b/desmume/src/frontend/windows/replay.cpp @@ -23,8 +23,8 @@ #include #include -#include "../types.h" -#include "../movie.h" +#include "types.h" +#include "movie.h" #include "utils/xstring.h" #include "resource.h" diff --git a/desmume/src/windows/replay.h b/desmume/src/frontend/windows/replay.h similarity index 100% rename from desmume/src/windows/replay.h rename to desmume/src/frontend/windows/replay.h diff --git a/desmume/src/windows/resource.h b/desmume/src/frontend/windows/resource.h similarity index 100% rename from desmume/src/windows/resource.h rename to desmume/src/frontend/windows/resource.h diff --git a/desmume/src/windows/resources.rc b/desmume/src/frontend/windows/resources.rc similarity index 100% rename from desmume/src/windows/resources.rc rename to desmume/src/frontend/windows/resources.rc diff --git a/desmume/src/windows/sdl/SDL.7z b/desmume/src/frontend/windows/sdl/SDL.7z similarity index 100% rename from desmume/src/windows/sdl/SDL.7z rename to desmume/src/frontend/windows/sdl/SDL.7z diff --git a/desmume/src/windows/sdl/include/SDL.h b/desmume/src/frontend/windows/sdl/include/SDL.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL.h rename to desmume/src/frontend/windows/sdl/include/SDL.h diff --git a/desmume/src/windows/sdl/include/SDL_active.h b/desmume/src/frontend/windows/sdl/include/SDL_active.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_active.h rename to desmume/src/frontend/windows/sdl/include/SDL_active.h diff --git a/desmume/src/windows/sdl/include/SDL_audio.h b/desmume/src/frontend/windows/sdl/include/SDL_audio.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_audio.h rename to desmume/src/frontend/windows/sdl/include/SDL_audio.h diff --git a/desmume/src/windows/sdl/include/SDL_byteorder.h b/desmume/src/frontend/windows/sdl/include/SDL_byteorder.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_byteorder.h rename to desmume/src/frontend/windows/sdl/include/SDL_byteorder.h diff --git a/desmume/src/windows/sdl/include/SDL_cdrom.h b/desmume/src/frontend/windows/sdl/include/SDL_cdrom.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_cdrom.h rename to desmume/src/frontend/windows/sdl/include/SDL_cdrom.h diff --git a/desmume/src/windows/sdl/include/SDL_config.h b/desmume/src/frontend/windows/sdl/include/SDL_config.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_config.h rename to desmume/src/frontend/windows/sdl/include/SDL_config.h diff --git a/desmume/src/windows/sdl/include/SDL_config.h.default b/desmume/src/frontend/windows/sdl/include/SDL_config.h.default similarity index 100% rename from desmume/src/windows/sdl/include/SDL_config.h.default rename to desmume/src/frontend/windows/sdl/include/SDL_config.h.default diff --git a/desmume/src/windows/sdl/include/SDL_config.h.in b/desmume/src/frontend/windows/sdl/include/SDL_config.h.in similarity index 100% rename from desmume/src/windows/sdl/include/SDL_config.h.in rename to desmume/src/frontend/windows/sdl/include/SDL_config.h.in diff --git a/desmume/src/windows/sdl/include/SDL_config_dreamcast.h b/desmume/src/frontend/windows/sdl/include/SDL_config_dreamcast.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_config_dreamcast.h rename to desmume/src/frontend/windows/sdl/include/SDL_config_dreamcast.h diff --git a/desmume/src/windows/sdl/include/SDL_config_macos.h b/desmume/src/frontend/windows/sdl/include/SDL_config_macos.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_config_macos.h rename to desmume/src/frontend/windows/sdl/include/SDL_config_macos.h diff --git a/desmume/src/windows/sdl/include/SDL_config_macosx.h b/desmume/src/frontend/windows/sdl/include/SDL_config_macosx.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_config_macosx.h rename to desmume/src/frontend/windows/sdl/include/SDL_config_macosx.h diff --git a/desmume/src/windows/sdl/include/SDL_config_minimal.h b/desmume/src/frontend/windows/sdl/include/SDL_config_minimal.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_config_minimal.h rename to desmume/src/frontend/windows/sdl/include/SDL_config_minimal.h diff --git a/desmume/src/windows/sdl/include/SDL_config_nds.h b/desmume/src/frontend/windows/sdl/include/SDL_config_nds.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_config_nds.h rename to desmume/src/frontend/windows/sdl/include/SDL_config_nds.h diff --git a/desmume/src/windows/sdl/include/SDL_config_os2.h b/desmume/src/frontend/windows/sdl/include/SDL_config_os2.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_config_os2.h rename to desmume/src/frontend/windows/sdl/include/SDL_config_os2.h diff --git a/desmume/src/windows/sdl/include/SDL_config_symbian.h b/desmume/src/frontend/windows/sdl/include/SDL_config_symbian.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_config_symbian.h rename to desmume/src/frontend/windows/sdl/include/SDL_config_symbian.h diff --git a/desmume/src/windows/sdl/include/SDL_config_win32.h b/desmume/src/frontend/windows/sdl/include/SDL_config_win32.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_config_win32.h rename to desmume/src/frontend/windows/sdl/include/SDL_config_win32.h diff --git a/desmume/src/windows/sdl/include/SDL_copying.h b/desmume/src/frontend/windows/sdl/include/SDL_copying.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_copying.h rename to desmume/src/frontend/windows/sdl/include/SDL_copying.h diff --git a/desmume/src/windows/sdl/include/SDL_cpuinfo.h b/desmume/src/frontend/windows/sdl/include/SDL_cpuinfo.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_cpuinfo.h rename to desmume/src/frontend/windows/sdl/include/SDL_cpuinfo.h diff --git a/desmume/src/windows/sdl/include/SDL_endian.h b/desmume/src/frontend/windows/sdl/include/SDL_endian.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_endian.h rename to desmume/src/frontend/windows/sdl/include/SDL_endian.h diff --git a/desmume/src/windows/sdl/include/SDL_error.h b/desmume/src/frontend/windows/sdl/include/SDL_error.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_error.h rename to desmume/src/frontend/windows/sdl/include/SDL_error.h diff --git a/desmume/src/windows/sdl/include/SDL_events.h b/desmume/src/frontend/windows/sdl/include/SDL_events.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_events.h rename to desmume/src/frontend/windows/sdl/include/SDL_events.h diff --git a/desmume/src/windows/sdl/include/SDL_getenv.h b/desmume/src/frontend/windows/sdl/include/SDL_getenv.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_getenv.h rename to desmume/src/frontend/windows/sdl/include/SDL_getenv.h diff --git a/desmume/src/windows/sdl/include/SDL_joystick.h b/desmume/src/frontend/windows/sdl/include/SDL_joystick.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_joystick.h rename to desmume/src/frontend/windows/sdl/include/SDL_joystick.h diff --git a/desmume/src/windows/sdl/include/SDL_keyboard.h b/desmume/src/frontend/windows/sdl/include/SDL_keyboard.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_keyboard.h rename to desmume/src/frontend/windows/sdl/include/SDL_keyboard.h diff --git a/desmume/src/windows/sdl/include/SDL_keysym.h b/desmume/src/frontend/windows/sdl/include/SDL_keysym.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_keysym.h rename to desmume/src/frontend/windows/sdl/include/SDL_keysym.h diff --git a/desmume/src/windows/sdl/include/SDL_loadso.h b/desmume/src/frontend/windows/sdl/include/SDL_loadso.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_loadso.h rename to desmume/src/frontend/windows/sdl/include/SDL_loadso.h diff --git a/desmume/src/windows/sdl/include/SDL_main.h b/desmume/src/frontend/windows/sdl/include/SDL_main.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_main.h rename to desmume/src/frontend/windows/sdl/include/SDL_main.h diff --git a/desmume/src/windows/sdl/include/SDL_mouse.h b/desmume/src/frontend/windows/sdl/include/SDL_mouse.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_mouse.h rename to desmume/src/frontend/windows/sdl/include/SDL_mouse.h diff --git a/desmume/src/windows/sdl/include/SDL_mutex.h b/desmume/src/frontend/windows/sdl/include/SDL_mutex.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_mutex.h rename to desmume/src/frontend/windows/sdl/include/SDL_mutex.h diff --git a/desmume/src/windows/sdl/include/SDL_name.h b/desmume/src/frontend/windows/sdl/include/SDL_name.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_name.h rename to desmume/src/frontend/windows/sdl/include/SDL_name.h diff --git a/desmume/src/windows/sdl/include/SDL_opengl.h b/desmume/src/frontend/windows/sdl/include/SDL_opengl.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_opengl.h rename to desmume/src/frontend/windows/sdl/include/SDL_opengl.h diff --git a/desmume/src/windows/sdl/include/SDL_platform.h b/desmume/src/frontend/windows/sdl/include/SDL_platform.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_platform.h rename to desmume/src/frontend/windows/sdl/include/SDL_platform.h diff --git a/desmume/src/windows/sdl/include/SDL_quit.h b/desmume/src/frontend/windows/sdl/include/SDL_quit.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_quit.h rename to desmume/src/frontend/windows/sdl/include/SDL_quit.h diff --git a/desmume/src/windows/sdl/include/SDL_rwops.h b/desmume/src/frontend/windows/sdl/include/SDL_rwops.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_rwops.h rename to desmume/src/frontend/windows/sdl/include/SDL_rwops.h diff --git a/desmume/src/windows/sdl/include/SDL_stdinc.h b/desmume/src/frontend/windows/sdl/include/SDL_stdinc.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_stdinc.h rename to desmume/src/frontend/windows/sdl/include/SDL_stdinc.h diff --git a/desmume/src/windows/sdl/include/SDL_syswm.h b/desmume/src/frontend/windows/sdl/include/SDL_syswm.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_syswm.h rename to desmume/src/frontend/windows/sdl/include/SDL_syswm.h diff --git a/desmume/src/windows/sdl/include/SDL_thread.h b/desmume/src/frontend/windows/sdl/include/SDL_thread.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_thread.h rename to desmume/src/frontend/windows/sdl/include/SDL_thread.h diff --git a/desmume/src/windows/sdl/include/SDL_timer.h b/desmume/src/frontend/windows/sdl/include/SDL_timer.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_timer.h rename to desmume/src/frontend/windows/sdl/include/SDL_timer.h diff --git a/desmume/src/windows/sdl/include/SDL_types.h b/desmume/src/frontend/windows/sdl/include/SDL_types.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_types.h rename to desmume/src/frontend/windows/sdl/include/SDL_types.h diff --git a/desmume/src/windows/sdl/include/SDL_version.h b/desmume/src/frontend/windows/sdl/include/SDL_version.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_version.h rename to desmume/src/frontend/windows/sdl/include/SDL_version.h diff --git a/desmume/src/windows/sdl/include/SDL_video.h b/desmume/src/frontend/windows/sdl/include/SDL_video.h similarity index 100% rename from desmume/src/windows/sdl/include/SDL_video.h rename to desmume/src/frontend/windows/sdl/include/SDL_video.h diff --git a/desmume/src/windows/sdl/include/begin_code.h b/desmume/src/frontend/windows/sdl/include/begin_code.h similarity index 100% rename from desmume/src/windows/sdl/include/begin_code.h rename to desmume/src/frontend/windows/sdl/include/begin_code.h diff --git a/desmume/src/windows/sdl/include/close_code.h b/desmume/src/frontend/windows/sdl/include/close_code.h similarity index 100% rename from desmume/src/windows/sdl/include/close_code.h rename to desmume/src/frontend/windows/sdl/include/close_code.h diff --git a/desmume/src/windows/sdl/include/doxyfile b/desmume/src/frontend/windows/sdl/include/doxyfile similarity index 100% rename from desmume/src/windows/sdl/include/doxyfile rename to desmume/src/frontend/windows/sdl/include/doxyfile diff --git a/desmume/src/windows/slot1_config.cpp b/desmume/src/frontend/windows/slot1_config.cpp similarity index 95% rename from desmume/src/windows/slot1_config.cpp rename to desmume/src/frontend/windows/slot1_config.cpp index cd87ed32e..0569c2b2f 100644 --- a/desmume/src/windows/slot1_config.cpp +++ b/desmume/src/frontend/windows/slot1_config.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2011-2015 DeSmuME team + Copyright (C) 2011-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,10 +21,10 @@ #include #include -#include "../slot1.h" -#include "../debug.h" -#include "../NDSSystem.h" -#include "../path.h" +#include "slot1.h" +#include "debug.h" +#include "NDSSystem.h" +#include "path.h" #include "resource.h" #include "main.h" diff --git a/desmume/src/windows/slot1_config.h b/desmume/src/frontend/windows/slot1_config.h similarity index 100% rename from desmume/src/windows/slot1_config.h rename to desmume/src/frontend/windows/slot1_config.h diff --git a/desmume/src/windows/snddx.cpp b/desmume/src/frontend/windows/snddx.cpp similarity index 99% rename from desmume/src/windows/snddx.cpp rename to desmume/src/frontend/windows/snddx.cpp index 3e762c15e..65b9da6ec 100755 --- a/desmume/src/windows/snddx.cpp +++ b/desmume/src/frontend/windows/snddx.cpp @@ -33,7 +33,7 @@ const char* __stdcall DXGetErrorDescription8A(HRESULT hr); #include "directx/dxerr8.h" #endif -#include "../SPU.h" +#include "SPU.h" #include "CWindow.h" #include "windriver.h" diff --git a/desmume/src/windows/snddx.h b/desmume/src/frontend/windows/snddx.h similarity index 94% rename from desmume/src/windows/snddx.h rename to desmume/src/frontend/windows/snddx.h index 45e266f3d..c8496b83d 100755 --- a/desmume/src/windows/snddx.h +++ b/desmume/src/frontend/windows/snddx.h @@ -19,7 +19,7 @@ #ifndef SNDDX_H #define SNDDX_H -#include "../SPU.h" +#include "SPU.h" #define SNDCORE_DIRECTX 2 extern SoundInterface_struct SNDDIRECTX; diff --git a/desmume/src/windows/sndxa2.cpp b/desmume/src/frontend/windows/sndxa2.cpp similarity index 95% rename from desmume/src/windows/sndxa2.cpp rename to desmume/src/frontend/windows/sndxa2.cpp index 0216052b3..5ddea4369 100644 --- a/desmume/src/windows/sndxa2.cpp +++ b/desmume/src/frontend/windows/sndxa2.cpp @@ -19,7 +19,7 @@ #include "directx/XAudio2.h" #include -#include "../types.h" +#include "types.h" #include "windriver.h" int SNDXA2Init(int buffersize); diff --git a/desmume/src/windows/sndxa2.h b/desmume/src/frontend/windows/sndxa2.h similarity index 94% rename from desmume/src/windows/sndxa2.h rename to desmume/src/frontend/windows/sndxa2.h index 6adbfa076..bbf6e0ffd 100644 --- a/desmume/src/windows/sndxa2.h +++ b/desmume/src/frontend/windows/sndxa2.h @@ -18,7 +18,7 @@ #ifndef SNDXA2_H #define SNDXA2_H -#include "../SPU.h" +#include "SPU.h" #define SNDCORE_XAUDIO2 3 extern SoundInterface_struct SNDXAUDIO2; diff --git a/desmume/src/windows/soundView.cpp b/desmume/src/frontend/windows/soundView.cpp similarity index 95% rename from desmume/src/windows/soundView.cpp rename to desmume/src/frontend/windows/soundView.cpp index 4b19b524f..52783e844 100644 --- a/desmume/src/windows/soundView.cpp +++ b/desmume/src/frontend/windows/soundView.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 2009-2015 DeSmuME team + Copyright (C) 2009-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,12 +23,12 @@ #include #include -#include "../common.h" -#include "../NDSSystem.h" -#include "../debug.h" -#include "../matrix.h" -#include "../MMU.h" -#include "../SPU.h" +#include "common.h" +#include "NDSSystem.h" +#include "debug.h" +#include "matrix.h" +#include "MMU.h" +#include "SPU.h" #include "resource.h" #include "winutil.h" diff --git a/desmume/src/windows/soundView.h b/desmume/src/frontend/windows/soundView.h similarity index 100% rename from desmume/src/windows/soundView.h rename to desmume/src/frontend/windows/soundView.h diff --git a/desmume/src/windows/throttle.cpp b/desmume/src/frontend/windows/throttle.cpp similarity index 97% rename from desmume/src/windows/throttle.cpp rename to desmume/src/frontend/windows/throttle.cpp index 8b2943160..bb7a1a033 100644 --- a/desmume/src/windows/throttle.cpp +++ b/desmume/src/frontend/windows/throttle.cpp @@ -3,7 +3,7 @@ //(the code might look quite different by now, though...) /* - Many Modifications Copyright (C) 2009-2015 DeSmuME team + Many Modifications Copyright (C) 2009-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,10 +23,10 @@ #include -#include "../types.h" -#include "../debug.h" -#include "../console.h" -#include "../GPU_osd.h" +#include "types.h" +#include "debug.h" +#include "console.h" +#include "GPU_osd.h" #include "winutil.h" diff --git a/desmume/src/windows/throttle.h b/desmume/src/frontend/windows/throttle.h similarity index 100% rename from desmume/src/windows/throttle.h rename to desmume/src/frontend/windows/throttle.h diff --git a/desmume/src/windows/tileView.cpp b/desmume/src/frontend/windows/tileView.cpp similarity index 99% rename from desmume/src/windows/tileView.cpp rename to desmume/src/frontend/windows/tileView.cpp index b1c72b0de..1426de7a9 100644 --- a/desmume/src/windows/tileView.cpp +++ b/desmume/src/frontend/windows/tileView.cpp @@ -1,6 +1,6 @@ /* Copyright (C) 2006 yopyop - Copyright (C) 2006-2015 DeSmuME team + Copyright (C) 2006-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,8 +18,8 @@ #include "tileView.h" -#include "../MMU.h" -#include "../GPU.h" +#include "MMU.h" +#include "GPU.h" #include "commctrl.h" #include "resource.h" diff --git a/desmume/src/windows/tileView.h b/desmume/src/frontend/windows/tileView.h similarity index 100% rename from desmume/src/windows/tileView.h rename to desmume/src/frontend/windows/tileView.h diff --git a/desmume/src/windows/touch.exe b/desmume/src/frontend/windows/touch.exe similarity index 100% rename from desmume/src/windows/touch.exe rename to desmume/src/frontend/windows/touch.exe diff --git a/desmume/src/windows/un7z_and_touch.bat b/desmume/src/frontend/windows/un7z_and_touch.bat similarity index 100% rename from desmume/src/windows/un7z_and_touch.bat rename to desmume/src/frontend/windows/un7z_and_touch.bat diff --git a/desmume/src/windows/video.h b/desmume/src/frontend/windows/video.h similarity index 100% rename from desmume/src/windows/video.h rename to desmume/src/frontend/windows/video.h diff --git a/desmume/src/windows/windriver.h b/desmume/src/frontend/windows/windriver.h similarity index 89% rename from desmume/src/windows/windriver.h rename to desmume/src/frontend/windows/windriver.h index 3dcbdc27c..4e9942327 100644 --- a/desmume/src/windows/windriver.h +++ b/desmume/src/frontend/windows/windriver.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2008-2010 DeSmuME team + Copyright (C) 2008-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #define _WINDRIVER_H_ #define WIN32_LEAN_AND_MEAN -#include "../common.h" +#include "common.h" #include "CWindow.h" extern WINCLASS *MainWindow; diff --git a/desmume/src/windows/winpcap.h b/desmume/src/frontend/windows/winpcap.h similarity index 100% rename from desmume/src/windows/winpcap.h rename to desmume/src/frontend/windows/winpcap.h diff --git a/desmume/src/windows/winpcap/Devioctl.h b/desmume/src/frontend/windows/winpcap/Devioctl.h similarity index 100% rename from desmume/src/windows/winpcap/Devioctl.h rename to desmume/src/frontend/windows/winpcap/Devioctl.h diff --git a/desmume/src/windows/winpcap/Gnuc.h b/desmume/src/frontend/windows/winpcap/Gnuc.h similarity index 100% rename from desmume/src/windows/winpcap/Gnuc.h rename to desmume/src/frontend/windows/winpcap/Gnuc.h diff --git a/desmume/src/windows/winpcap/Ntddndis.h b/desmume/src/frontend/windows/winpcap/Ntddndis.h similarity index 100% rename from desmume/src/windows/winpcap/Ntddndis.h rename to desmume/src/frontend/windows/winpcap/Ntddndis.h diff --git a/desmume/src/windows/winpcap/Ntddpack.h b/desmume/src/frontend/windows/winpcap/Ntddpack.h similarity index 100% rename from desmume/src/windows/winpcap/Ntddpack.h rename to desmume/src/frontend/windows/winpcap/Ntddpack.h diff --git a/desmume/src/windows/winpcap/Packet32.h b/desmume/src/frontend/windows/winpcap/Packet32.h similarity index 100% rename from desmume/src/windows/winpcap/Packet32.h rename to desmume/src/frontend/windows/winpcap/Packet32.h diff --git a/desmume/src/windows/winpcap/Win32-Extensions.h b/desmume/src/frontend/windows/winpcap/Win32-Extensions.h similarity index 100% rename from desmume/src/windows/winpcap/Win32-Extensions.h rename to desmume/src/frontend/windows/winpcap/Win32-Extensions.h diff --git a/desmume/src/windows/winpcap/bittypes.h b/desmume/src/frontend/windows/winpcap/bittypes.h similarity index 100% rename from desmume/src/windows/winpcap/bittypes.h rename to desmume/src/frontend/windows/winpcap/bittypes.h diff --git a/desmume/src/windows/winpcap/bucket_lookup.h b/desmume/src/frontend/windows/winpcap/bucket_lookup.h similarity index 100% rename from desmume/src/windows/winpcap/bucket_lookup.h rename to desmume/src/frontend/windows/winpcap/bucket_lookup.h diff --git a/desmume/src/windows/winpcap/count_packets.h b/desmume/src/frontend/windows/winpcap/count_packets.h similarity index 100% rename from desmume/src/windows/winpcap/count_packets.h rename to desmume/src/frontend/windows/winpcap/count_packets.h diff --git a/desmume/src/windows/winpcap/ip6_misc.h b/desmume/src/frontend/windows/winpcap/ip6_misc.h similarity index 100% rename from desmume/src/windows/winpcap/ip6_misc.h rename to desmume/src/frontend/windows/winpcap/ip6_misc.h diff --git a/desmume/src/windows/winpcap/memory_t.h b/desmume/src/frontend/windows/winpcap/memory_t.h similarity index 100% rename from desmume/src/windows/winpcap/memory_t.h rename to desmume/src/frontend/windows/winpcap/memory_t.h diff --git a/desmume/src/windows/winpcap/normal_lookup.h b/desmume/src/frontend/windows/winpcap/normal_lookup.h similarity index 100% rename from desmume/src/windows/winpcap/normal_lookup.h rename to desmume/src/frontend/windows/winpcap/normal_lookup.h diff --git a/desmume/src/windows/winpcap/pcap-bpf.h b/desmume/src/frontend/windows/winpcap/pcap-bpf.h similarity index 100% rename from desmume/src/windows/winpcap/pcap-bpf.h rename to desmume/src/frontend/windows/winpcap/pcap-bpf.h diff --git a/desmume/src/windows/winpcap/pcap-int.h b/desmume/src/frontend/windows/winpcap/pcap-int.h similarity index 100% rename from desmume/src/windows/winpcap/pcap-int.h rename to desmume/src/frontend/windows/winpcap/pcap-int.h diff --git a/desmume/src/windows/winpcap/pcap-stdinc.h b/desmume/src/frontend/windows/winpcap/pcap-stdinc.h similarity index 100% rename from desmume/src/windows/winpcap/pcap-stdinc.h rename to desmume/src/frontend/windows/winpcap/pcap-stdinc.h diff --git a/desmume/src/windows/winpcap/pcap.h b/desmume/src/frontend/windows/winpcap/pcap.h similarity index 100% rename from desmume/src/windows/winpcap/pcap.h rename to desmume/src/frontend/windows/winpcap/pcap.h diff --git a/desmume/src/windows/winpcap/remote-ext.h b/desmume/src/frontend/windows/winpcap/remote-ext.h similarity index 100% rename from desmume/src/windows/winpcap/remote-ext.h rename to desmume/src/frontend/windows/winpcap/remote-ext.h diff --git a/desmume/src/windows/winpcap/tcp_session.h b/desmume/src/frontend/windows/winpcap/tcp_session.h similarity index 100% rename from desmume/src/windows/winpcap/tcp_session.h rename to desmume/src/frontend/windows/winpcap/tcp_session.h diff --git a/desmume/src/windows/winpcap/time_calls.h b/desmume/src/frontend/windows/winpcap/time_calls.h similarity index 100% rename from desmume/src/windows/winpcap/time_calls.h rename to desmume/src/frontend/windows/winpcap/time_calls.h diff --git a/desmume/src/windows/winpcap/tme.h b/desmume/src/frontend/windows/winpcap/tme.h similarity index 100% rename from desmume/src/windows/winpcap/tme.h rename to desmume/src/frontend/windows/winpcap/tme.h diff --git a/desmume/src/windows/winres.h b/desmume/src/frontend/windows/winres.h similarity index 100% rename from desmume/src/windows/winres.h rename to desmume/src/frontend/windows/winres.h diff --git a/desmume/src/windows/winutil.cpp b/desmume/src/frontend/windows/winutil.cpp similarity index 100% rename from desmume/src/windows/winutil.cpp rename to desmume/src/frontend/windows/winutil.cpp diff --git a/desmume/src/windows/winutil.h b/desmume/src/frontend/windows/winutil.h similarity index 100% rename from desmume/src/windows/winutil.h rename to desmume/src/frontend/windows/winutil.h diff --git a/desmume/src/windows/zlib128/zconf.h b/desmume/src/frontend/windows/zlib128/zconf.h similarity index 100% rename from desmume/src/windows/zlib128/zconf.h rename to desmume/src/frontend/windows/zlib128/zconf.h diff --git a/desmume/src/windows/zlib128/zlib-1.2.8_from_tastools b/desmume/src/frontend/windows/zlib128/zlib-1.2.8_from_tastools similarity index 100% rename from desmume/src/windows/zlib128/zlib-1.2.8_from_tastools rename to desmume/src/frontend/windows/zlib128/zlib-1.2.8_from_tastools diff --git a/desmume/src/windows/zlib128/zlib-vc8-Win32.lib b/desmume/src/frontend/windows/zlib128/zlib-vc8-Win32.lib similarity index 100% rename from desmume/src/windows/zlib128/zlib-vc8-Win32.lib rename to desmume/src/frontend/windows/zlib128/zlib-vc8-Win32.lib diff --git a/desmume/src/windows/zlib128/zlib-vc8-x64.lib b/desmume/src/frontend/windows/zlib128/zlib-vc8-x64.lib similarity index 100% rename from desmume/src/windows/zlib128/zlib-vc8-x64.lib rename to desmume/src/frontend/windows/zlib128/zlib-vc8-x64.lib diff --git a/desmume/src/windows/zlib128/zlib.h b/desmume/src/frontend/windows/zlib128/zlib.h similarity index 100% rename from desmume/src/windows/zlib128/zlib.h rename to desmume/src/frontend/windows/zlib128/zlib.h diff --git a/desmume/src/windows/zlib128/zutil.h b/desmume/src/frontend/windows/zlib128/zutil.h similarity index 100% rename from desmume/src/windows/zlib128/zutil.h rename to desmume/src/frontend/windows/zlib128/zutil.h diff --git a/desmume/src/movie.cpp b/desmume/src/movie.cpp index a3c747037..f6eb30a98 100644 --- a/desmume/src/movie.cpp +++ b/desmume/src/movie.cpp @@ -1,5 +1,5 @@ /* - Copyright 2008-2015 DeSmuME team + Copyright 2008-2016 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ bool autoMovieBackup = true; #define MOVIE_VERSION 1 #ifdef WIN32 -#include ".\windows\main.h" +#include "frontend/windows/main.h" #endif //----movie engine main state diff --git a/desmume/src/path.h b/desmume/src/path.h index 62302b816..6580fbcda 100644 --- a/desmume/src/path.h +++ b/desmume/src/path.h @@ -25,8 +25,8 @@ #include #include - #include "windows/winutil.h" - #include "windows/resource.h" + #include "frontend/windows/winutil.h" + #include "frontend/windows/resource.h" #elif !defined(DESMUME_COCOA) #include #endif /* HOST_WINDOWS */ diff --git a/desmume/src/saves.cpp b/desmume/src/saves.cpp index 0cd9cdf6f..d8a71c77d 100644 --- a/desmume/src/saves.cpp +++ b/desmume/src/saves.cpp @@ -57,7 +57,7 @@ #include "path.h" #ifdef HOST_WINDOWS -#include "windows/main.h" +#include "frontend/windows/main.h" #endif int lastSaveState = 0; //Keeps track of last savestate used for quick save/load functions diff --git a/desmume/src/windows/stdint/stdint.h b/desmume/src/windows/stdint/stdint.h deleted file mode 100644 index 4fe0ef9a9..000000000 --- a/desmume/src/windows/stdint/stdint.h +++ /dev/null @@ -1,259 +0,0 @@ -// ISO C9x compliant stdint.h for Microsoft Visual Studio -// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -// -// Copyright (c) 2006-2013 Alexander Chemeris -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. Neither the name of the product nor the names of its contributors may -// be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MSC_VER // [ -#error "Use this header only with Microsoft Visual C++ compilers!" -#endif // _MSC_VER ] - -#ifndef _MSC_STDINT_H_ // [ -#define _MSC_STDINT_H_ - -#if _MSC_VER > 1000 -#pragma once -#endif - -#if _MSC_VER >= 1600 // [ -#include -#else // ] _MSC_VER >= 1600 [ - -#include - -// For Visual Studio 6 in C++ mode and for many Visual Studio versions when -// compiling for ARM we should wrap include with 'extern "C++" {}' -// or compiler give many errors like this: -// error C2733: second C linkage of overloaded function 'wmemchr' not allowed -#ifdef __cplusplus -extern "C" { -#endif -# include -#ifdef __cplusplus -} -#endif - -// Define _W64 macros to mark types changing their size, like intptr_t. -#ifndef _W64 -# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300 -# define _W64 __w64 -# else -# define _W64 -# endif -#endif - - -// 7.18.1 Integer types - -// 7.18.1.1 Exact-width integer types - -// Visual Studio 6 and Embedded Visual C++ 4 doesn't -// realize that, e.g. char has the same size as __int8 -// so we give up on __intX for them. -#if (_MSC_VER < 1300) - typedef signed char int8_t; - typedef signed short int16_t; - typedef signed int int32_t; - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - typedef unsigned int uint32_t; -#else - typedef signed __int8 int8_t; - typedef signed __int16 int16_t; - typedef signed __int32 int32_t; - typedef unsigned __int8 uint8_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int32 uint32_t; -#endif -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; - - -// 7.18.1.2 Minimum-width integer types -typedef int8_t int_least8_t; -typedef int16_t int_least16_t; -typedef int32_t int_least32_t; -typedef int64_t int_least64_t; -typedef uint8_t uint_least8_t; -typedef uint16_t uint_least16_t; -typedef uint32_t uint_least32_t; -typedef uint64_t uint_least64_t; - -// 7.18.1.3 Fastest minimum-width integer types -typedef int8_t int_fast8_t; -typedef int16_t int_fast16_t; -typedef int32_t int_fast32_t; -typedef int64_t int_fast64_t; -typedef uint8_t uint_fast8_t; -typedef uint16_t uint_fast16_t; -typedef uint32_t uint_fast32_t; -typedef uint64_t uint_fast64_t; - -// 7.18.1.4 Integer types capable of holding object pointers -#ifdef _WIN64 // [ - typedef signed __int64 intptr_t; - typedef unsigned __int64 uintptr_t; -#else // _WIN64 ][ - typedef _W64 signed int intptr_t; - typedef _W64 unsigned int uintptr_t; -#endif // _WIN64 ] - -// 7.18.1.5 Greatest-width integer types -typedef int64_t intmax_t; -typedef uint64_t uintmax_t; - - -// 7.18.2 Limits of specified-width integer types - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259 - -// 7.18.2.1 Limits of exact-width integer types -#define INT8_MIN ((int8_t)_I8_MIN) -#define INT8_MAX _I8_MAX -#define INT16_MIN ((int16_t)_I16_MIN) -#define INT16_MAX _I16_MAX -#define INT32_MIN ((int32_t)_I32_MIN) -#define INT32_MAX _I32_MAX -#define INT64_MIN ((int64_t)_I64_MIN) -#define INT64_MAX _I64_MAX -#define UINT8_MAX _UI8_MAX -#define UINT16_MAX _UI16_MAX -#define UINT32_MAX _UI32_MAX -#define UINT64_MAX _UI64_MAX - -// 7.18.2.2 Limits of minimum-width integer types -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST8_MAX INT8_MAX -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST16_MAX INT16_MAX -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST32_MAX INT32_MAX -#define INT_LEAST64_MIN INT64_MIN -#define INT_LEAST64_MAX INT64_MAX -#define UINT_LEAST8_MAX UINT8_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#define UINT_LEAST64_MAX UINT64_MAX - -// 7.18.2.3 Limits of fastest minimum-width integer types -#define INT_FAST8_MIN INT8_MIN -#define INT_FAST8_MAX INT8_MAX -#define INT_FAST16_MIN INT16_MIN -#define INT_FAST16_MAX INT16_MAX -#define INT_FAST32_MIN INT32_MIN -#define INT_FAST32_MAX INT32_MAX -#define INT_FAST64_MIN INT64_MIN -#define INT_FAST64_MAX INT64_MAX -#define UINT_FAST8_MAX UINT8_MAX -#define UINT_FAST16_MAX UINT16_MAX -#define UINT_FAST32_MAX UINT32_MAX -#define UINT_FAST64_MAX UINT64_MAX - -// 7.18.2.4 Limits of integer types capable of holding object pointers -#ifdef _WIN64 // [ -# define INTPTR_MIN INT64_MIN -# define INTPTR_MAX INT64_MAX -# define UINTPTR_MAX UINT64_MAX -#else // _WIN64 ][ -# define INTPTR_MIN INT32_MIN -# define INTPTR_MAX INT32_MAX -# define UINTPTR_MAX UINT32_MAX -#endif // _WIN64 ] - -// 7.18.2.5 Limits of greatest-width integer types -#define INTMAX_MIN INT64_MIN -#define INTMAX_MAX INT64_MAX -#define UINTMAX_MAX UINT64_MAX - -// 7.18.3 Limits of other integer types - -#ifdef _WIN64 // [ -# define PTRDIFF_MIN _I64_MIN -# define PTRDIFF_MAX _I64_MAX -#else // _WIN64 ][ -# define PTRDIFF_MIN _I32_MIN -# define PTRDIFF_MAX _I32_MAX -#endif // _WIN64 ] - -#define SIG_ATOMIC_MIN INT_MIN -#define SIG_ATOMIC_MAX INT_MAX - -#ifndef SIZE_MAX // [ -# ifdef _WIN64 // [ -# define SIZE_MAX _UI64_MAX -# else // _WIN64 ][ -# define SIZE_MAX _UI32_MAX -# endif // _WIN64 ] -#endif // SIZE_MAX ] - -// WCHAR_MIN and WCHAR_MAX are also defined in -#ifndef WCHAR_MIN // [ -# define WCHAR_MIN 0 -#endif // WCHAR_MIN ] -#ifndef WCHAR_MAX // [ -# define WCHAR_MAX _UI16_MAX -#endif // WCHAR_MAX ] - -#define WINT_MIN 0 -#define WINT_MAX _UI16_MAX - -#endif // __STDC_LIMIT_MACROS ] - - -// 7.18.4 Limits of other integer types - -#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260 - -// 7.18.4.1 Macros for minimum-width integer constants - -#define INT8_C(val) val##i8 -#define INT16_C(val) val##i16 -#define INT32_C(val) val##i32 -#define INT64_C(val) val##i64 - -#define UINT8_C(val) val##ui8 -#define UINT16_C(val) val##ui16 -#define UINT32_C(val) val##ui32 -#define UINT64_C(val) val##ui64 - -// 7.18.4.2 Macros for greatest-width integer constants -// These #ifndef's are needed to prevent collisions with . -// Check out Issue 9 for the details. -#ifndef INTMAX_C // [ -# define INTMAX_C INT64_C -#endif // INTMAX_C ] -#ifndef UINTMAX_C // [ -# define UINTMAX_C UINT64_C -#endif // UINTMAX_C ] - -#endif // __STDC_CONSTANT_MACROS ] - -#endif // _MSC_VER >= 1600 ] - -#endif // _MSC_STDINT_H_ ]