Clean up library includes

include/library/commands.hpp

@@ -6,7 +6,7 @@
 #include <set>
 #include <map>
 #include <list>
-#include "library/threadtypes.hpp"
+#include "threadtypes.hpp"
 
 class command;
 

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 <map>
 #include <string>

include/library/filesys.hpp

@@ -5,7 +5,7 @@
 #include <map>
 #include <string>
 #include <fstream>
-#include "library/threadtypes.hpp"
+#include "threadtypes.hpp"
 
 #define CLUSTER_SIZE 8192
 #define CLUSTERS_PER_SUPER (CLUSTER_SIZE / 4)

include/library/luabase.hpp

@@ -1,11 +1,11 @@
-#ifndef _library__lua__hpp__included__
+#ifndef _library__luabase__hpp__included__
-#define _library__lua__hpp__included__
+#define _library__luabase__hpp__included__
 
 #include <string>
 #include <stdexcept>
 #include <map>
 #include <cassert>
-#include "library/string.hpp"
+#include "string.hpp"
 extern "C"
 {
 #include <lua.h>

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 <string>
 #include <list>
 #include <vector>

include/library/memoryspace.hpp

@@ -6,7 +6,7 @@
 #include <vector>
 #include <cstdint>
 #include <cstring>
-#include "library/threadtypes.hpp"
+#include "threadtypes.hpp"
 
 /**
  * Information about region of memory.

include/library/movie.hpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <cstdint>
 #include <stdexcept>
-#include "library/controller-data.hpp"
+#include "controller-data.hpp"
 
 /**
  * Movie being played back or recorded

include/library/patch.hpp

@@ -1,5 +1,5 @@
-#ifndef _slot__hpp__included__
+#ifndef _library__patch__hpp__included__
-#define _slot__hpp__included__
+#define _library__patch__hpp__included__
 
 #include <vector>
 #include <string>

include/library/pixfmt-lrgb.hpp

@@ -1,5 +1,5 @@
-#ifndef _pixfmt_lrgb__hpp__included__
+#ifndef _library__pixfmt_lrgb__hpp__included__
-#define _pixfmt_lrgb__hpp__included__
+#define _library__pixfmt_lrgb__hpp__included__
 
 #include "framebuffer.hpp"
 

include/library/pixfmt-rgb15.hpp

@@ -1,5 +1,5 @@
-#ifndef _pixfmt_rgb15__hpp__included__
+#ifndef _library__pixfmt_rgb15__hpp__included__
-#define _pixfmt_rgb15__hpp__included__
+#define _library__pixfmt_rgb15__hpp__included__
 
 #include "framebuffer.hpp"
 

include/library/pixfmt-rgb16.hpp

@@ -1,5 +1,5 @@
-#ifndef _pixfmt_rgb16__hpp__included__
+#ifndef _library__pixfmt_rgb16__hpp__included__
-#define _pixfmt_rgb16__hpp__included__
+#define _library__pixfmt_rgb16__hpp__included__
 
 #include "framebuffer.hpp"
 

include/library/pixfmt-rgb24.hpp

@@ -1,5 +1,5 @@
-#ifndef _pixfmt_rgb24__hpp__included__
+#ifndef _library__pixfmt_rgb24__hpp__included__
-#define _pixfmt_rgb24__hpp__included__
+#define _library__pixfmt_rgb24__hpp__included__
 
 #include "framebuffer.hpp"
 

include/library/pixfmt-rgb32.hpp

@@ -1,5 +1,5 @@
-#ifndef _pixfmt_rgb32__hpp__included__
+#ifndef _library__pixfmt_rgb32__hpp__included__
-#define _pixfmt_rgb32__hpp__included__
+#define _library__pixfmt_rgb32__hpp__included__
 
 #include "framebuffer.hpp"
 

include/library/png.hpp

@@ -1,5 +1,5 @@
-#ifndef _png__hpp__included__
+#ifndef _library__png__hpp__included__
-#define _png__hpp__included__
+#define _library__png__hpp__included__
 
 #include <stdexcept>
 #include <cstdint>

include/library/recentfiles.hpp

@@ -1,5 +1,5 @@
-#ifndef _recentfiles__hpp__included__
+#ifndef _library__recentfiles__hpp__included__
-#define _recentfiles__hpp__included__
+#define _library__recentfiles__hpp__included__
 
 #include <string>
 #include <cstdlib>

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 <string>
 #include <list>
 #include <set>

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 "commands.hpp"
-#include "library/settings.hpp"
+#include "settings.hpp"
 
 /**
  * Bridge between command group and settings group.

include/library/settings.hpp

@@ -7,7 +7,7 @@
 #include <iostream>
 #include <map>
 #include <list>
-#include "library/threadtypes.hpp"
+#include "threadtypes.hpp"
 
 class setting;
 class setting_group;

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 <cstdint>
 #include <cstring>
 #include <vector>

include/library/threadtypes.hpp

@@ -0,0 +1,23 @@
+#ifndef _library_threadtypes__hpp__included__
+#define _library_threadtypes__hpp__included__
+
+#include <cstdint>
+
+#ifdef NATIVE_THREADS
+#include <thread>
+#include <condition_variable>
+#include <mutex>
+typedef std::thread thread_class;
+typedef std::condition_variable cv_class;
+typedef std::mutex mutex_class;
+typedef std::unique_lock<std::mutex> umutex_class;
+#else
+#include <boost/thread.hpp>
+#include <boost/thread/locks.hpp>
+typedef boost::thread thread_class;
+typedef boost::condition_variable cv_class;
+typedef boost::mutex mutex_class;
+typedef boost::unique_lock<boost::mutex> umutex_class;
+#endif
+
+#endif

include/library/utf8.hpp

@@ -1,5 +1,5 @@
-#ifndef _utf8__hpp__included__
+#ifndef _library__utf8__hpp__included__
-#define _utf8__hpp__included__
+#define _library__utf8__hpp__included__
 
 #include <cstdint>
 #include <cstdlib>

include/library/workthread.hpp

@@ -2,7 +2,7 @@
 #define _library_workthread__hpp__included__
 
 #include <cstdint>
-#include "library/threadtypes.hpp"
+#include "threadtypes.hpp"
 
 #define WORKFLAG_QUIT_REQUEST 0x80000000U
 

include/library/zip.hpp

@@ -1,5 +1,5 @@
-#ifndef _zip__hpp__included__
+#ifndef _library__zip__hpp__included__
-#define _zip__hpp__included__
+#define _library__zip__hpp__included__
 
 #include <boost/iostreams/filtering_stream.hpp>
 #include <iostream>

include/lua/internal.hpp

@@ -5,7 +5,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
-#include "library/lua.hpp"
+#include "library/luabase.hpp"
 
 extern lua_state LS;
 

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

src/library/bintohex.cpp

@@ -1,4 +1,4 @@
-#include "library/bintohex.hpp"
+#include "bintohex.hpp"
 #include <sstream>
 #include <iomanip>
 

src/library/commands.cpp

@@ -1,9 +1,9 @@
-#include "library/commands.hpp"
+#include "commands.hpp"
-#include "library/globalwrap.hpp"
+#include "globalwrap.hpp"
-#include "library/minmax.hpp"
+#include "minmax.hpp"
-#include "library/register-queue.hpp"
+#include "register-queue.hpp"
-#include "library/string.hpp"
+#include "string.hpp"
-#include "library/zip.hpp"
+#include "zip.hpp"
 #include <iostream>
 #include <cstdlib>
 

src/library/controller-data.cpp

@@ -1,7 +1,7 @@
-#include "library/controller-data.hpp"
+#include "controller-data.hpp"
-#include "library/threadtypes.hpp"
+#include "threadtypes.hpp"
-#include "library/minmax.hpp"
+#include "minmax.hpp"
-#include "library/globalwrap.hpp"
+#include "globalwrap.hpp"
 #include <iostream>
 #include <list>
 

src/library/emustatus.cpp

@@ -1,4 +1,4 @@
-#include "library/emustatus.hpp"
+#include "emustatus.hpp"
 
 emulator_status::emulator_status() throw(std::bad_alloc)
 {

src/library/filesys.cpp

@@ -1,6 +1,6 @@
-#include "library/filesys.hpp"
+#include "filesys.hpp"
-#include "library/minmax.hpp"
+#include "minmax.hpp"
-#include "library/serialization.hpp"
+#include "serialization.hpp"
 #include <cstring>
 #include <stdexcept>
 #include <iostream>

src/library/framebuffer.cpp

@@ -1,8 +1,8 @@
-#include "library/framebuffer.hpp"
+#include "framebuffer.hpp"
-#include "library/png.hpp"
+#include "png.hpp"
-#include "library/serialization.hpp"
+#include "serialization.hpp"
-#include "library/string.hpp"
+#include "string.hpp"
-#include "library/utf8.hpp"
+#include "utf8.hpp"
 #include <cstring>
 #include <iostream>
 #include <list>

src/library/joyfun.cpp

@@ -1,5 +1,5 @@
-#include "library/joyfun.hpp"
+#include "joyfun.hpp"
-#include "library/string.hpp"
+#include "string.hpp"
 #include <sstream>
 #include <iostream>
 

src/library/loadlib.cpp

@@ -1,4 +1,4 @@
-#include "library/loadlib.hpp"
+#include "loadlib.hpp"
 #include <sstream>
 
 #if !defined(NO_DLFCN) && !defined(_WIN32) && !defined(_WIN64)

src/library/luabase.cpp

@@ -1,5 +1,5 @@
-#include "library/lua.hpp"
+#include "luabase.hpp"
-#include "library/register-queue.hpp"
+#include "register-queue.hpp"
 #include <iostream>
 #include <cassert>
 

src/library/memorysearch.cpp

@@ -1,5 +1,5 @@
-#include "library/memorysearch.hpp"
+#include "memorysearch.hpp"
-#include "library/minmax.hpp"
+#include "minmax.hpp"
 #include <iostream>
 
 memory_search::memory_search(memory_space& space) throw(std::bad_alloc)

src/library/memoryspace.cpp

@@ -1,5 +1,5 @@
-#include "library/memoryspace.hpp"
+#include "memoryspace.hpp"
-#include "library/minmax.hpp"
+#include "minmax.hpp"
 #include <algorithm>
 
 namespace

src/library/messagebuffer.cpp

@@ -1,4 +1,4 @@
-#include "library/messagebuffer.hpp"
+#include "messagebuffer.hpp"
 
 messagebuffer::update_handler::~update_handler() throw()
 {

src/library/movie.cpp

@@ -1,6 +1,4 @@
-#include "lsnes.hpp"
+#include "movie.hpp"
-
-#include "library/movie.hpp"
 
 #include <stdexcept>
 #include <cassert>

src/library/patch-bps.cpp

@@ -1,7 +1,7 @@
-#include "library/minmax.hpp"
+#include "minmax.hpp"
-#include "library/patch.hpp"
+#include "patch.hpp"
-#include "library/serialization.hpp"
+#include "serialization.hpp"
-#include "library/string.hpp"
+#include "string.hpp"
 #include <cstdint>
 #include <limits>
 #include <cstring>

src/library/patch-ips.cpp

@@ -1,7 +1,7 @@
-#include "library/minmax.hpp"
+#include "minmax.hpp"
-#include "library/patch.hpp"
+#include "patch.hpp"
-#include "library/serialization.hpp"
+#include "serialization.hpp"
-#include "library/string.hpp"
+#include "string.hpp"
 #include <cstdint>
 #include <limits>
 #include <cstring>

src/library/patch.cpp

@@ -1,6 +1,6 @@
-#include "library/patch.hpp"
+#include "patch.hpp"
-#include "library/sha256.hpp"
+#include "sha256.hpp"
-#include "library/string.hpp"
+#include "string.hpp"
 #include <cstdint>
 #include <cstring>
 #include <iostream>

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()
 {

src/library/pixfmt-rgb15.cpp

@@ -1,4 +1,4 @@
-#include "library/pixfmt-rgb15.hpp"
+#include "pixfmt-rgb15.hpp"
 
 template<bool uvswap>
 pixel_format_rgb15<uvswap>::~pixel_format_rgb15() throw()

src/library/pixfmt-rgb16.cpp

@@ -1,4 +1,4 @@
-#include "library/pixfmt-rgb16.hpp"
+#include "pixfmt-rgb16.hpp"
 
 template<bool uvswap>
 pixel_format_rgb16<uvswap>::~pixel_format_rgb16() throw()

src/library/pixfmt-rgb24.cpp

@@ -1,4 +1,4 @@
-#include "library/pixfmt-rgb24.hpp"
+#include "pixfmt-rgb24.hpp"
 #include <cstring>
 
 template<bool uvswap>

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() {}
 

src/library/png.cpp

@@ -1,4 +1,4 @@
-#include "library/png.hpp"
+#include "png.hpp"
 
 #include <fstream>
 #include <iostream>

src/library/recentfiles.cpp

@@ -1,5 +1,5 @@
-#include "library/recentfiles.hpp"
+#include "recentfiles.hpp"
-#include "library/zip.hpp"
+#include "zip.hpp"
 #include <fstream>
 
 recent_files::recent_files(const std::string& _cfgfile, size_t _maxcount)

src/library/settings-cmd-bridge.cpp

@@ -1,5 +1,5 @@
-#include "library/settings-cmd-bridge.hpp"
+#include "settings-cmd-bridge.hpp"
-#include "library/string.hpp"
+#include "string.hpp"
 
 namespace
 {

src/library/settings.cpp

@@ -1,7 +1,7 @@
-#include "library/globalwrap.hpp"
+#include "globalwrap.hpp"
-#include "library/register-queue.hpp"
+#include "register-queue.hpp"
-#include "library/settings.hpp"
+#include "settings.hpp"
-#include "library/string.hpp"
+#include "string.hpp"
 
 #include <set>
 #include <map>

src/library/sha256.cpp

@@ -1,4 +1,4 @@
-#include "library/sha256.hpp"
+#include "sha256.hpp"
 #include <cstdint>
 #include <sstream>
 #include <iostream>

src/library/string.cpp

@@ -1,5 +1,5 @@
-#include "library/string.hpp"
+#include "string.hpp"
-#include "library/minmax.hpp"
+#include "minmax.hpp"
 #include <cctype>
 #include <boost/regex.hpp>
 

src/library/utf8.cpp

@@ -1,4 +1,4 @@
-#include "library/utf8.hpp"
+#include "utf8.hpp"
 
 namespace
 {

src/library/workthread.cpp

@@ -1,4 +1,4 @@
-#include "library/workthread.hpp"
+#include "workthread.hpp"
 #include <stdexcept>
 #include <sys/time.h>
 

src/library/zip.cpp

@@ -1,6 +1,4 @@
-#include "lsnes.hpp"
+#include "zip.hpp"
-
-#include "library/zip.hpp"
 
 #include <cstdint>
 #include <cstring>

src/library/zlibstream.cpp

@@ -1,5 +1,5 @@
-#include "library/zlibstream.hpp"
+#include "zlibstream.hpp"
-#include "library/minmax.hpp"
+#include "minmax.hpp"
 #include <stdexcept>
 #include <cstring>
 #include <cerrno>