From 184e3fe7fff22f89e93e7eedfefeb8ff0292ddd4 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Tue, 13 Nov 2012 22:01:12 +0200 Subject: [PATCH] Clean up library includes --- include/library/commands.hpp | 2 +- include/library/emustatus.hpp | 2 +- include/library/filesys.hpp | 2 +- include/library/{lua.hpp => luabase.hpp} | 6 +++--- include/library/memorysearch.hpp | 2 +- include/library/memoryspace.hpp | 2 +- include/library/movie.hpp | 2 +- include/library/patch.hpp | 4 ++-- include/library/pixfmt-lrgb.hpp | 4 ++-- include/library/pixfmt-rgb15.hpp | 4 ++-- include/library/pixfmt-rgb16.hpp | 4 ++-- include/library/pixfmt-rgb24.hpp | 4 ++-- include/library/pixfmt-rgb32.hpp | 4 ++-- include/library/png.hpp | 4 ++-- include/library/recentfiles.hpp | 4 ++-- include/library/register-queue.hpp | 2 +- include/library/settings-cmd-bridge.hpp | 4 ++-- include/library/settings.hpp | 2 +- include/library/sha256.hpp | 2 +- include/library/threadtypes.hpp | 23 +++++++++++++++++++++++ include/library/utf8.hpp | 4 ++-- include/library/workthread.hpp | 2 +- include/library/zip.hpp | 4 ++-- include/lua/internal.hpp | 2 +- src/library/Makefile | 2 +- src/library/bintohex.cpp | 2 +- src/library/commands.cpp | 12 ++++++------ src/library/controller-data.cpp | 8 ++++---- src/library/emustatus.cpp | 2 +- src/library/filesys.cpp | 6 +++--- src/library/framebuffer.cpp | 10 +++++----- src/library/joyfun.cpp | 4 ++-- src/library/loadlib.cpp | 2 +- src/library/{lua.cpp => luabase.cpp} | 4 ++-- src/library/memorysearch.cpp | 4 ++-- src/library/memoryspace.cpp | 4 ++-- src/library/messagebuffer.cpp | 2 +- src/library/movie.cpp | 4 +--- src/library/patch-bps.cpp | 8 ++++---- src/library/patch-ips.cpp | 8 ++++---- src/library/patch.cpp | 6 +++--- src/library/pixfmt-lrgb.cpp | 2 +- src/library/pixfmt-rgb15.cpp | 2 +- src/library/pixfmt-rgb16.cpp | 2 +- src/library/pixfmt-rgb24.cpp | 2 +- src/library/pixfmt-rgb32.cpp | 2 +- src/library/png.cpp | 2 +- src/library/recentfiles.cpp | 4 ++-- src/library/settings-cmd-bridge.cpp | 4 ++-- src/library/settings.cpp | 8 ++++---- src/library/sha256.cpp | 2 +- src/library/string.cpp | 4 ++-- src/library/utf8.cpp | 2 +- src/library/workthread.cpp | 2 +- src/library/zip.cpp | 4 +--- src/library/zlibstream.cpp | 4 ++-- 56 files changed, 124 insertions(+), 105 deletions(-) rename include/library/{lua.hpp => luabase.hpp} (99%) create mode 100644 include/library/threadtypes.hpp rename src/library/{lua.cpp => luabase.cpp} (98%) diff --git a/include/library/commands.hpp b/include/library/commands.hpp index d7deb8d8..705016fa 100644 --- a/include/library/commands.hpp +++ b/include/library/commands.hpp @@ -6,7 +6,7 @@ #include #include #include -#include "library/threadtypes.hpp" +#include "threadtypes.hpp" class command; diff --git a/include/library/emustatus.hpp b/include/library/emustatus.hpp index dc9f65b5..ac2633b5 100644 --- a/include/library/emustatus.hpp +++ b/include/library/emustatus.hpp @@ -1,7 +1,7 @@ #ifndef _library__emustatus__hpp__included__ #define _library__emustatus__hpp__included__ -#include "library/threadtypes.hpp" +#include "threadtypes.hpp" #include #include diff --git a/include/library/filesys.hpp b/include/library/filesys.hpp index 05488926..8cd9bd19 100644 --- a/include/library/filesys.hpp +++ b/include/library/filesys.hpp @@ -5,7 +5,7 @@ #include #include #include -#include "library/threadtypes.hpp" +#include "threadtypes.hpp" #define CLUSTER_SIZE 8192 #define CLUSTERS_PER_SUPER (CLUSTER_SIZE / 4) diff --git a/include/library/lua.hpp b/include/library/luabase.hpp similarity index 99% rename from include/library/lua.hpp rename to include/library/luabase.hpp index 0d990c34..048d2aac 100644 --- a/include/library/lua.hpp +++ b/include/library/luabase.hpp @@ -1,11 +1,11 @@ -#ifndef _library__lua__hpp__included__ -#define _library__lua__hpp__included__ +#ifndef _library__luabase__hpp__included__ +#define _library__luabase__hpp__included__ #include #include #include #include -#include "library/string.hpp" +#include "string.hpp" extern "C" { #include diff --git a/include/library/memorysearch.hpp b/include/library/memorysearch.hpp index c8d4a35b..242c36cf 100644 --- a/include/library/memorysearch.hpp +++ b/include/library/memorysearch.hpp @@ -1,7 +1,7 @@ #ifndef _library__memorysearch__hpp__included__ #define _library__memorysearch__hpp__included__ -#include "library/memoryspace.hpp" +#include "memoryspace.hpp" #include #include #include diff --git a/include/library/memoryspace.hpp b/include/library/memoryspace.hpp index bf43fabd..01c0ec72 100644 --- a/include/library/memoryspace.hpp +++ b/include/library/memoryspace.hpp @@ -6,7 +6,7 @@ #include #include #include -#include "library/threadtypes.hpp" +#include "threadtypes.hpp" /** * Information about region of memory. diff --git a/include/library/movie.hpp b/include/library/movie.hpp index fd37f812..caa94a64 100644 --- a/include/library/movie.hpp +++ b/include/library/movie.hpp @@ -4,7 +4,7 @@ #include #include #include -#include "library/controller-data.hpp" +#include "controller-data.hpp" /** * Movie being played back or recorded diff --git a/include/library/patch.hpp b/include/library/patch.hpp index 3ad549ef..7065c586 100644 --- a/include/library/patch.hpp +++ b/include/library/patch.hpp @@ -1,5 +1,5 @@ -#ifndef _slot__hpp__included__ -#define _slot__hpp__included__ +#ifndef _library__patch__hpp__included__ +#define _library__patch__hpp__included__ #include #include diff --git a/include/library/pixfmt-lrgb.hpp b/include/library/pixfmt-lrgb.hpp index d7724510..eec8dba5 100644 --- a/include/library/pixfmt-lrgb.hpp +++ b/include/library/pixfmt-lrgb.hpp @@ -1,5 +1,5 @@ -#ifndef _pixfmt_lrgb__hpp__included__ -#define _pixfmt_lrgb__hpp__included__ +#ifndef _library__pixfmt_lrgb__hpp__included__ +#define _library__pixfmt_lrgb__hpp__included__ #include "framebuffer.hpp" diff --git a/include/library/pixfmt-rgb15.hpp b/include/library/pixfmt-rgb15.hpp index 3047d5db..24b90543 100644 --- a/include/library/pixfmt-rgb15.hpp +++ b/include/library/pixfmt-rgb15.hpp @@ -1,5 +1,5 @@ -#ifndef _pixfmt_rgb15__hpp__included__ -#define _pixfmt_rgb15__hpp__included__ +#ifndef _library__pixfmt_rgb15__hpp__included__ +#define _library__pixfmt_rgb15__hpp__included__ #include "framebuffer.hpp" diff --git a/include/library/pixfmt-rgb16.hpp b/include/library/pixfmt-rgb16.hpp index dd53351b..566e0780 100644 --- a/include/library/pixfmt-rgb16.hpp +++ b/include/library/pixfmt-rgb16.hpp @@ -1,5 +1,5 @@ -#ifndef _pixfmt_rgb16__hpp__included__ -#define _pixfmt_rgb16__hpp__included__ +#ifndef _library__pixfmt_rgb16__hpp__included__ +#define _library__pixfmt_rgb16__hpp__included__ #include "framebuffer.hpp" diff --git a/include/library/pixfmt-rgb24.hpp b/include/library/pixfmt-rgb24.hpp index 89a8dced..f24f4d07 100644 --- a/include/library/pixfmt-rgb24.hpp +++ b/include/library/pixfmt-rgb24.hpp @@ -1,5 +1,5 @@ -#ifndef _pixfmt_rgb24__hpp__included__ -#define _pixfmt_rgb24__hpp__included__ +#ifndef _library__pixfmt_rgb24__hpp__included__ +#define _library__pixfmt_rgb24__hpp__included__ #include "framebuffer.hpp" diff --git a/include/library/pixfmt-rgb32.hpp b/include/library/pixfmt-rgb32.hpp index d70992a2..05fefa09 100644 --- a/include/library/pixfmt-rgb32.hpp +++ b/include/library/pixfmt-rgb32.hpp @@ -1,5 +1,5 @@ -#ifndef _pixfmt_rgb32__hpp__included__ -#define _pixfmt_rgb32__hpp__included__ +#ifndef _library__pixfmt_rgb32__hpp__included__ +#define _library__pixfmt_rgb32__hpp__included__ #include "framebuffer.hpp" diff --git a/include/library/png.hpp b/include/library/png.hpp index e829bd31..251559bd 100644 --- a/include/library/png.hpp +++ b/include/library/png.hpp @@ -1,5 +1,5 @@ -#ifndef _png__hpp__included__ -#define _png__hpp__included__ +#ifndef _library__png__hpp__included__ +#define _library__png__hpp__included__ #include #include diff --git a/include/library/recentfiles.hpp b/include/library/recentfiles.hpp index fd6885ad..9606c330 100644 --- a/include/library/recentfiles.hpp +++ b/include/library/recentfiles.hpp @@ -1,5 +1,5 @@ -#ifndef _recentfiles__hpp__included__ -#define _recentfiles__hpp__included__ +#ifndef _library__recentfiles__hpp__included__ +#define _library__recentfiles__hpp__included__ #include #include diff --git a/include/library/register-queue.hpp b/include/library/register-queue.hpp index 45f7940f..78cc0ac2 100644 --- a/include/library/register-queue.hpp +++ b/include/library/register-queue.hpp @@ -1,7 +1,7 @@ #ifndef _library__register_queue__hpp__included__ #define _library__register_queue__hpp__included__ -#include "library/threadtypes.hpp" +#include "threadtypes.hpp" #include #include #include diff --git a/include/library/settings-cmd-bridge.hpp b/include/library/settings-cmd-bridge.hpp index 1e89e654..d887c29e 100644 --- a/include/library/settings-cmd-bridge.hpp +++ b/include/library/settings-cmd-bridge.hpp @@ -1,8 +1,8 @@ #ifndef _library__settings_cmd_bridge__hpp__included__ #define _library__settings_cmd_bridge__hpp__included__ -#include "library/commands.hpp" -#include "library/settings.hpp" +#include "commands.hpp" +#include "settings.hpp" /** * Bridge between command group and settings group. diff --git a/include/library/settings.hpp b/include/library/settings.hpp index d2c203a1..4ef819b7 100644 --- a/include/library/settings.hpp +++ b/include/library/settings.hpp @@ -7,7 +7,7 @@ #include #include #include -#include "library/threadtypes.hpp" +#include "threadtypes.hpp" class setting; class setting_group; diff --git a/include/library/sha256.hpp b/include/library/sha256.hpp index 36702016..62505cba 100644 --- a/include/library/sha256.hpp +++ b/include/library/sha256.hpp @@ -1,7 +1,7 @@ #ifndef _library__sha256__hpp__included__ #define _library__sha256__hpp__included__ -#include "library/bintohex.hpp" +#include "bintohex.hpp" #include #include #include diff --git a/include/library/threadtypes.hpp b/include/library/threadtypes.hpp new file mode 100644 index 00000000..3ff572e9 --- /dev/null +++ b/include/library/threadtypes.hpp @@ -0,0 +1,23 @@ +#ifndef _library_threadtypes__hpp__included__ +#define _library_threadtypes__hpp__included__ + +#include + +#ifdef NATIVE_THREADS +#include +#include +#include +typedef std::thread thread_class; +typedef std::condition_variable cv_class; +typedef std::mutex mutex_class; +typedef std::unique_lock umutex_class; +#else +#include +#include +typedef boost::thread thread_class; +typedef boost::condition_variable cv_class; +typedef boost::mutex mutex_class; +typedef boost::unique_lock umutex_class; +#endif + +#endif diff --git a/include/library/utf8.hpp b/include/library/utf8.hpp index 1b8fb25e..fb718ccf 100644 --- a/include/library/utf8.hpp +++ b/include/library/utf8.hpp @@ -1,5 +1,5 @@ -#ifndef _utf8__hpp__included__ -#define _utf8__hpp__included__ +#ifndef _library__utf8__hpp__included__ +#define _library__utf8__hpp__included__ #include #include diff --git a/include/library/workthread.hpp b/include/library/workthread.hpp index fe8cd53f..a39bbdb2 100644 --- a/include/library/workthread.hpp +++ b/include/library/workthread.hpp @@ -2,7 +2,7 @@ #define _library_workthread__hpp__included__ #include -#include "library/threadtypes.hpp" +#include "threadtypes.hpp" #define WORKFLAG_QUIT_REQUEST 0x80000000U diff --git a/include/library/zip.hpp b/include/library/zip.hpp index 3ec5ad9f..ba0c57e4 100644 --- a/include/library/zip.hpp +++ b/include/library/zip.hpp @@ -1,5 +1,5 @@ -#ifndef _zip__hpp__included__ -#define _zip__hpp__included__ +#ifndef _library__zip__hpp__included__ +#define _library__zip__hpp__included__ #include #include diff --git a/include/lua/internal.hpp b/include/lua/internal.hpp index 2a9507b0..9e81e189 100644 --- a/include/lua/internal.hpp +++ b/include/lua/internal.hpp @@ -5,7 +5,7 @@ #include #include #include -#include "library/lua.hpp" +#include "library/luabase.hpp" extern lua_state LS; diff --git a/src/library/Makefile b/src/library/Makefile index 4cf17fc4..2e13c767 100644 --- a/src/library/Makefile +++ b/src/library/Makefile @@ -7,7 +7,7 @@ __all__.$(OBJECT_SUFFIX): $(OBJECTS) touch __all__.ldflags %.$(OBJECT_SUFFIX): %.cpp - $(REALCC) $(CFLAGS) -c -o $@ $< -I../../include + $(REALCC) $(CFLAGS) -c -o $@ $< -I../../include/library precheck: @true diff --git a/src/library/bintohex.cpp b/src/library/bintohex.cpp index b60878f7..a48f506f 100644 --- a/src/library/bintohex.cpp +++ b/src/library/bintohex.cpp @@ -1,4 +1,4 @@ -#include "library/bintohex.hpp" +#include "bintohex.hpp" #include #include diff --git a/src/library/commands.cpp b/src/library/commands.cpp index 2d0441d9..8cb9dd98 100644 --- a/src/library/commands.cpp +++ b/src/library/commands.cpp @@ -1,9 +1,9 @@ -#include "library/commands.hpp" -#include "library/globalwrap.hpp" -#include "library/minmax.hpp" -#include "library/register-queue.hpp" -#include "library/string.hpp" -#include "library/zip.hpp" +#include "commands.hpp" +#include "globalwrap.hpp" +#include "minmax.hpp" +#include "register-queue.hpp" +#include "string.hpp" +#include "zip.hpp" #include #include diff --git a/src/library/controller-data.cpp b/src/library/controller-data.cpp index 29cbe13a..0150fbbd 100644 --- a/src/library/controller-data.cpp +++ b/src/library/controller-data.cpp @@ -1,7 +1,7 @@ -#include "library/controller-data.hpp" -#include "library/threadtypes.hpp" -#include "library/minmax.hpp" -#include "library/globalwrap.hpp" +#include "controller-data.hpp" +#include "threadtypes.hpp" +#include "minmax.hpp" +#include "globalwrap.hpp" #include #include diff --git a/src/library/emustatus.cpp b/src/library/emustatus.cpp index 80547a64..4ec53a47 100644 --- a/src/library/emustatus.cpp +++ b/src/library/emustatus.cpp @@ -1,4 +1,4 @@ -#include "library/emustatus.hpp" +#include "emustatus.hpp" emulator_status::emulator_status() throw(std::bad_alloc) { diff --git a/src/library/filesys.cpp b/src/library/filesys.cpp index 726f28e6..403dee7d 100644 --- a/src/library/filesys.cpp +++ b/src/library/filesys.cpp @@ -1,6 +1,6 @@ -#include "library/filesys.hpp" -#include "library/minmax.hpp" -#include "library/serialization.hpp" +#include "filesys.hpp" +#include "minmax.hpp" +#include "serialization.hpp" #include #include #include diff --git a/src/library/framebuffer.cpp b/src/library/framebuffer.cpp index 01eab498..7aa5c509 100644 --- a/src/library/framebuffer.cpp +++ b/src/library/framebuffer.cpp @@ -1,8 +1,8 @@ -#include "library/framebuffer.hpp" -#include "library/png.hpp" -#include "library/serialization.hpp" -#include "library/string.hpp" -#include "library/utf8.hpp" +#include "framebuffer.hpp" +#include "png.hpp" +#include "serialization.hpp" +#include "string.hpp" +#include "utf8.hpp" #include #include #include diff --git a/src/library/joyfun.cpp b/src/library/joyfun.cpp index 7f3a9998..30397ec2 100644 --- a/src/library/joyfun.cpp +++ b/src/library/joyfun.cpp @@ -1,5 +1,5 @@ -#include "library/joyfun.hpp" -#include "library/string.hpp" +#include "joyfun.hpp" +#include "string.hpp" #include #include diff --git a/src/library/loadlib.cpp b/src/library/loadlib.cpp index 3241f808..3c7ba4c4 100644 --- a/src/library/loadlib.cpp +++ b/src/library/loadlib.cpp @@ -1,4 +1,4 @@ -#include "library/loadlib.hpp" +#include "loadlib.hpp" #include #if !defined(NO_DLFCN) && !defined(_WIN32) && !defined(_WIN64) diff --git a/src/library/lua.cpp b/src/library/luabase.cpp similarity index 98% rename from src/library/lua.cpp rename to src/library/luabase.cpp index 4be83d5b..28b75aee 100644 --- a/src/library/lua.cpp +++ b/src/library/luabase.cpp @@ -1,5 +1,5 @@ -#include "library/lua.hpp" -#include "library/register-queue.hpp" +#include "luabase.hpp" +#include "register-queue.hpp" #include #include diff --git a/src/library/memorysearch.cpp b/src/library/memorysearch.cpp index 641fe2a5..09dabf44 100644 --- a/src/library/memorysearch.cpp +++ b/src/library/memorysearch.cpp @@ -1,5 +1,5 @@ -#include "library/memorysearch.hpp" -#include "library/minmax.hpp" +#include "memorysearch.hpp" +#include "minmax.hpp" #include memory_search::memory_search(memory_space& space) throw(std::bad_alloc) diff --git a/src/library/memoryspace.cpp b/src/library/memoryspace.cpp index e965453a..ad8f0ef6 100644 --- a/src/library/memoryspace.cpp +++ b/src/library/memoryspace.cpp @@ -1,5 +1,5 @@ -#include "library/memoryspace.hpp" -#include "library/minmax.hpp" +#include "memoryspace.hpp" +#include "minmax.hpp" #include namespace diff --git a/src/library/messagebuffer.cpp b/src/library/messagebuffer.cpp index 4e7bb52b..27dd0daf 100644 --- a/src/library/messagebuffer.cpp +++ b/src/library/messagebuffer.cpp @@ -1,4 +1,4 @@ -#include "library/messagebuffer.hpp" +#include "messagebuffer.hpp" messagebuffer::update_handler::~update_handler() throw() { diff --git a/src/library/movie.cpp b/src/library/movie.cpp index 544af0d3..7e480040 100644 --- a/src/library/movie.cpp +++ b/src/library/movie.cpp @@ -1,6 +1,4 @@ -#include "lsnes.hpp" - -#include "library/movie.hpp" +#include "movie.hpp" #include #include diff --git a/src/library/patch-bps.cpp b/src/library/patch-bps.cpp index f1da18f9..279450a6 100644 --- a/src/library/patch-bps.cpp +++ b/src/library/patch-bps.cpp @@ -1,7 +1,7 @@ -#include "library/minmax.hpp" -#include "library/patch.hpp" -#include "library/serialization.hpp" -#include "library/string.hpp" +#include "minmax.hpp" +#include "patch.hpp" +#include "serialization.hpp" +#include "string.hpp" #include #include #include diff --git a/src/library/patch-ips.cpp b/src/library/patch-ips.cpp index 17cf3413..607a91e6 100644 --- a/src/library/patch-ips.cpp +++ b/src/library/patch-ips.cpp @@ -1,7 +1,7 @@ -#include "library/minmax.hpp" -#include "library/patch.hpp" -#include "library/serialization.hpp" -#include "library/string.hpp" +#include "minmax.hpp" +#include "patch.hpp" +#include "serialization.hpp" +#include "string.hpp" #include #include #include diff --git a/src/library/patch.cpp b/src/library/patch.cpp index f035d86a..fc2d891f 100644 --- a/src/library/patch.cpp +++ b/src/library/patch.cpp @@ -1,6 +1,6 @@ -#include "library/patch.hpp" -#include "library/sha256.hpp" -#include "library/string.hpp" +#include "patch.hpp" +#include "sha256.hpp" +#include "string.hpp" #include #include #include diff --git a/src/library/pixfmt-lrgb.cpp b/src/library/pixfmt-lrgb.cpp index 98cc2741..72acfa18 100644 --- a/src/library/pixfmt-lrgb.cpp +++ b/src/library/pixfmt-lrgb.cpp @@ -1,4 +1,4 @@ -#include "library/pixfmt-lrgb.hpp" +#include "pixfmt-lrgb.hpp" pixel_format_lrgb::~pixel_format_lrgb() throw() { diff --git a/src/library/pixfmt-rgb15.cpp b/src/library/pixfmt-rgb15.cpp index 0bb311e5..6f51d3a3 100644 --- a/src/library/pixfmt-rgb15.cpp +++ b/src/library/pixfmt-rgb15.cpp @@ -1,4 +1,4 @@ -#include "library/pixfmt-rgb15.hpp" +#include "pixfmt-rgb15.hpp" template pixel_format_rgb15::~pixel_format_rgb15() throw() diff --git a/src/library/pixfmt-rgb16.cpp b/src/library/pixfmt-rgb16.cpp index 73c37e08..bb6cd85e 100644 --- a/src/library/pixfmt-rgb16.cpp +++ b/src/library/pixfmt-rgb16.cpp @@ -1,4 +1,4 @@ -#include "library/pixfmt-rgb16.hpp" +#include "pixfmt-rgb16.hpp" template pixel_format_rgb16::~pixel_format_rgb16() throw() diff --git a/src/library/pixfmt-rgb24.cpp b/src/library/pixfmt-rgb24.cpp index d47d49b5..fdd8ed2d 100644 --- a/src/library/pixfmt-rgb24.cpp +++ b/src/library/pixfmt-rgb24.cpp @@ -1,4 +1,4 @@ -#include "library/pixfmt-rgb24.hpp" +#include "pixfmt-rgb24.hpp" #include template diff --git a/src/library/pixfmt-rgb32.cpp b/src/library/pixfmt-rgb32.cpp index 20e40a52..9aa08f5d 100644 --- a/src/library/pixfmt-rgb32.cpp +++ b/src/library/pixfmt-rgb32.cpp @@ -1,4 +1,4 @@ -#include "library/pixfmt-rgb32.hpp" +#include "pixfmt-rgb32.hpp" pixel_format_rgb32::~pixel_format_rgb32() throw() {} diff --git a/src/library/png.cpp b/src/library/png.cpp index 2e556fed..1efc588f 100644 --- a/src/library/png.cpp +++ b/src/library/png.cpp @@ -1,4 +1,4 @@ -#include "library/png.hpp" +#include "png.hpp" #include #include diff --git a/src/library/recentfiles.cpp b/src/library/recentfiles.cpp index 1d7aa20c..564de067 100644 --- a/src/library/recentfiles.cpp +++ b/src/library/recentfiles.cpp @@ -1,5 +1,5 @@ -#include "library/recentfiles.hpp" -#include "library/zip.hpp" +#include "recentfiles.hpp" +#include "zip.hpp" #include recent_files::recent_files(const std::string& _cfgfile, size_t _maxcount) diff --git a/src/library/settings-cmd-bridge.cpp b/src/library/settings-cmd-bridge.cpp index 622e0a0e..73f4ad08 100644 --- a/src/library/settings-cmd-bridge.cpp +++ b/src/library/settings-cmd-bridge.cpp @@ -1,5 +1,5 @@ -#include "library/settings-cmd-bridge.hpp" -#include "library/string.hpp" +#include "settings-cmd-bridge.hpp" +#include "string.hpp" namespace { diff --git a/src/library/settings.cpp b/src/library/settings.cpp index a52ec79e..b16cbcce 100644 --- a/src/library/settings.cpp +++ b/src/library/settings.cpp @@ -1,7 +1,7 @@ -#include "library/globalwrap.hpp" -#include "library/register-queue.hpp" -#include "library/settings.hpp" -#include "library/string.hpp" +#include "globalwrap.hpp" +#include "register-queue.hpp" +#include "settings.hpp" +#include "string.hpp" #include #include diff --git a/src/library/sha256.cpp b/src/library/sha256.cpp index 969da800..d3af286c 100644 --- a/src/library/sha256.cpp +++ b/src/library/sha256.cpp @@ -1,4 +1,4 @@ -#include "library/sha256.hpp" +#include "sha256.hpp" #include #include #include diff --git a/src/library/string.cpp b/src/library/string.cpp index b0df9bcc..a362832c 100644 --- a/src/library/string.cpp +++ b/src/library/string.cpp @@ -1,5 +1,5 @@ -#include "library/string.hpp" -#include "library/minmax.hpp" +#include "string.hpp" +#include "minmax.hpp" #include #include diff --git a/src/library/utf8.cpp b/src/library/utf8.cpp index 6bdf304e..8239049c 100644 --- a/src/library/utf8.cpp +++ b/src/library/utf8.cpp @@ -1,4 +1,4 @@ -#include "library/utf8.hpp" +#include "utf8.hpp" namespace { diff --git a/src/library/workthread.cpp b/src/library/workthread.cpp index ab3aeb91..43c12717 100644 --- a/src/library/workthread.cpp +++ b/src/library/workthread.cpp @@ -1,4 +1,4 @@ -#include "library/workthread.hpp" +#include "workthread.hpp" #include #include diff --git a/src/library/zip.cpp b/src/library/zip.cpp index 8dd6814c..e1174fbd 100644 --- a/src/library/zip.cpp +++ b/src/library/zip.cpp @@ -1,6 +1,4 @@ -#include "lsnes.hpp" - -#include "library/zip.hpp" +#include "zip.hpp" #include #include diff --git a/src/library/zlibstream.cpp b/src/library/zlibstream.cpp index c54f3138..36b51689 100644 --- a/src/library/zlibstream.cpp +++ b/src/library/zlibstream.cpp @@ -1,5 +1,5 @@ -#include "library/zlibstream.hpp" -#include "library/minmax.hpp" +#include "zlibstream.hpp" +#include "minmax.hpp" #include #include #include