diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj
index 4cdc825bd..8f101f75a 100644
--- a/build/win32/Cxbx.vcxproj
+++ b/build/win32/Cxbx.vcxproj
@@ -199,23 +199,23 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -265,14 +265,14 @@
-
-
-
+
+
+
-
+
@@ -343,27 +343,27 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
%(AdditionalIncludeDirectories)
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
%(PreprocessorDefinitions)
-
-
+
+
%(AdditionalIncludeDirectories)
%(AdditionalIncludeDirectories)
@@ -481,13 +481,13 @@
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
-
+
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
-
+
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
%(AdditionalIncludeDirectories)
@@ -512,7 +512,7 @@
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
-
+
%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
%(AdditionalIncludeDirectories)
diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters
index 0b890abd4..dba356ee1 100644
--- a/build/win32/Cxbx.vcxproj.filters
+++ b/build/win32/Cxbx.vcxproj.filters
@@ -88,10 +88,10 @@
Kernel
-
+
Shared
-
+
Shared
@@ -127,7 +127,7 @@
Emulator
-
+
Emulator
@@ -154,19 +154,19 @@
Emulator
-
+
Emulator
Emulator
-
+
Shared
-
+
Shared
-
+
Shared
@@ -202,7 +202,7 @@
Hardware
-
+
Shared
@@ -211,7 +211,7 @@
Shared
-
+
Shared
@@ -290,34 +290,34 @@
GUI
-
+
Emulator
Kernel
-
+
Cross Platform\Win32
-
+
Shared\Input
-
+
Shared\Input
Cross Platform
-
+
Cross Platform
-
+
Shared
GUI
-
+
Cross Platform\Win32
@@ -359,13 +359,13 @@
Shared
-
+
Shared
-
+
Shared
-
+
Shared
@@ -428,7 +428,7 @@
Emulator
-
+
Emulator
@@ -437,19 +437,19 @@
Shared
-
+
Shared
-
+
Shared
-
+
Shared
-
+
Shared
-
+
Shared
@@ -461,7 +461,7 @@
core\HLE\D3D8
-
+
Shared
@@ -500,13 +500,13 @@
Hardware
-
+
Shared
Shared
-
+
Shared
@@ -602,28 +602,28 @@
GUI
-
+
Emulator
-
+
Shared\Input
-
+
Shared\Input
Cross Platform
-
+
Cross Platform
-
+
Shared
GUI
-
+
Cross Platform
diff --git a/src/common/CxbxDebugger.cpp b/src/common/CxbxDebugger.cpp
index 76673a685..1c874e64f 100644
--- a/src/common/CxbxDebugger.cpp
+++ b/src/common/CxbxDebugger.cpp
@@ -33,7 +33,7 @@
// ******************************************************************
#include "Cxbx.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "CxbxDebugger.h"
// Note this implementation uses SEH. See the reference docs for RaiseException:
diff --git a/src/common/Logging.cpp b/src/common/Logging.cpp
index 9990dfbf1..567cae0ce 100644
--- a/src/common/Logging.cpp
+++ b/src/common/Logging.cpp
@@ -38,7 +38,7 @@
#include "Logging.h"
#include "Common/Settings.hpp"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
// For thread_local, see : http://en.cppreference.com/w/cpp/language/storage_duration
// TODO : Use Boost.Format http://www.boost.org/doc/libs/1_53_0/libs/format/index.html
diff --git a/src/common/ReservedMemory.h b/src/common/ReservedMemory.h
index c84abc4df..f2d7562c0 100644
--- a/src/common/ReservedMemory.h
+++ b/src/common/ReservedMemory.h
@@ -40,7 +40,7 @@ extern "C"
{
#endif
-#include "CxbxKrnl/EmuShared.h" // For XBE_MAX_VA, XBE_IMAGE_BASE and CXBX_BASE_OF_CODE
+#include "EmuShared.h" // For XBE_MAX_VA, XBE_IMAGE_BASE and CXBX_BASE_OF_CODE
// The following code reserves virtual addresses from 0x00011000 upwards;
#define VM_PLACEHOLDER_SIZE (XBE_MAX_VA - XBE_IMAGE_BASE - CXBX_BASE_OF_CODE)
@@ -60,4 +60,4 @@ unsigned char virtual_memory_placeholder[VM_PLACEHOLDER_SIZE]; // = { OPCODE_NOP
}
#endif
-#endif // RESERVEDMEMORY_H
\ No newline at end of file
+#endif // RESERVEDMEMORY_H
diff --git a/src/common/Settings.cpp b/src/common/Settings.cpp
index 28467c7e5..68e0a7711 100644
--- a/src/common/Settings.cpp
+++ b/src/common/Settings.cpp
@@ -37,7 +37,7 @@
#include "Settings.hpp"
#include "CxbxKrnl/Emu.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include
// TODO: Implement Qt support when real CPU emulation is available.
diff --git a/src/common/Input/InputConfig.cpp b/src/common/input/InputConfig.cpp
similarity index 100%
rename from src/common/Input/InputConfig.cpp
rename to src/common/input/InputConfig.cpp
diff --git a/src/common/Input/InputConfig.h b/src/common/input/InputConfig.h
similarity index 100%
rename from src/common/Input/InputConfig.h
rename to src/common/input/InputConfig.h
diff --git a/src/common/Input/SDL2_Device.cpp b/src/common/input/SDL2_Device.cpp
similarity index 100%
rename from src/common/Input/SDL2_Device.cpp
rename to src/common/input/SDL2_Device.cpp
diff --git a/src/common/Input/SDL2_Device.h b/src/common/input/SDL2_Device.h
similarity index 100%
rename from src/common/Input/SDL2_Device.h
rename to src/common/input/SDL2_Device.h
diff --git a/src/common/Linux/AlignPosfix1.h b/src/common/linux/AlignPosfix1.h
similarity index 100%
rename from src/common/Linux/AlignPosfix1.h
rename to src/common/linux/AlignPosfix1.h
diff --git a/src/common/Linux/AlignPrefix1.h b/src/common/linux/AlignPrefix1.h
similarity index 100%
rename from src/common/Linux/AlignPrefix1.h
rename to src/common/linux/AlignPrefix1.h
diff --git a/src/common/Win32/AlignPosfix1.h b/src/common/win32/AlignPosfix1.h
similarity index 100%
rename from src/common/Win32/AlignPosfix1.h
rename to src/common/win32/AlignPosfix1.h
diff --git a/src/common/Win32/AlignPrefix1.h b/src/common/win32/AlignPrefix1.h
similarity index 100%
rename from src/common/Win32/AlignPrefix1.h
rename to src/common/win32/AlignPrefix1.h
diff --git a/src/common/Win32/DInputController.cpp b/src/common/win32/DInputController.cpp
similarity index 99%
rename from src/common/Win32/DInputController.cpp
rename to src/common/win32/DInputController.cpp
index 71c4a7e5c..cdf8d76ec 100644
--- a/src/common/Win32/DInputController.cpp
+++ b/src/common/win32/DInputController.cpp
@@ -39,7 +39,7 @@
#include "DInputController.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "CxbxKrnl/EmuXTL.h"
// This is ridiculous
diff --git a/src/common/Win32/DInputController.h b/src/common/win32/DInputController.h
similarity index 100%
rename from src/common/Win32/DInputController.h
rename to src/common/win32/DInputController.h
diff --git a/src/common/Win32/EmuShared.cpp b/src/common/win32/EmuShared.cpp
similarity index 99%
rename from src/common/Win32/EmuShared.cpp
rename to src/common/win32/EmuShared.cpp
index c10cd59d5..a02983561 100644
--- a/src/common/Win32/EmuShared.cpp
+++ b/src/common/win32/EmuShared.cpp
@@ -37,7 +37,7 @@
#include "CxbxKrnl/CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#undef FIELD_OFFSET // prevent macro redefinition warnings
#include
diff --git a/src/CxbxKrnl/EmuShared.h b/src/common/win32/EmuShared.h
similarity index 100%
rename from src/CxbxKrnl/EmuShared.h
rename to src/common/win32/EmuShared.h
diff --git a/src/common/Win32/IPCWindows.cpp b/src/common/win32/IPCWindows.cpp
similarity index 99%
rename from src/common/Win32/IPCWindows.cpp
rename to src/common/win32/IPCWindows.cpp
index ebcce8d2e..93b5d63a6 100644
--- a/src/common/Win32/IPCWindows.cpp
+++ b/src/common/win32/IPCWindows.cpp
@@ -43,7 +43,7 @@
#include "gui/ResCxbx.h"
#include "Common/IPCHybrid.hpp"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "Common/Settings.hpp"
#include "Logging.h"
diff --git a/src/common/Win32/InlineFunc.cpp b/src/common/win32/InlineFunc.cpp
similarity index 100%
rename from src/common/Win32/InlineFunc.cpp
rename to src/common/win32/InlineFunc.cpp
diff --git a/src/common/Win32/Mutex.cpp b/src/common/win32/Mutex.cpp
similarity index 100%
rename from src/common/Win32/Mutex.cpp
rename to src/common/win32/Mutex.cpp
diff --git a/src/common/Win32/Mutex.h b/src/common/win32/Mutex.h
similarity index 100%
rename from src/common/Win32/Mutex.h
rename to src/common/win32/Mutex.h
diff --git a/src/common/Win32/Threads.cpp b/src/common/win32/Threads.cpp
similarity index 100%
rename from src/common/Win32/Threads.cpp
rename to src/common/win32/Threads.cpp
diff --git a/src/common/Win32/Threads.h b/src/common/win32/Threads.h
similarity index 100%
rename from src/common/Win32/Threads.h
rename to src/common/win32/Threads.h
diff --git a/src/common/Win32/XBPortMapping.cpp b/src/common/win32/XBPortMapping.cpp
similarity index 99%
rename from src/common/Win32/XBPortMapping.cpp
rename to src/common/win32/XBPortMapping.cpp
index f6f71b041..9fec4df94 100644
--- a/src/common/Win32/XBPortMapping.cpp
+++ b/src/common/win32/XBPortMapping.cpp
@@ -44,7 +44,7 @@ namespace xboxkrnl
};
#include
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "Common/Settings.hpp"
#include "Logging.h"
diff --git a/src/common/Win32/XBPortMapping.h b/src/common/win32/XBPortMapping.h
similarity index 100%
rename from src/common/Win32/XBPortMapping.h
rename to src/common/win32/XBPortMapping.h
diff --git a/src/common/XDVDFS Tools/buffered_io.cpp b/src/common/xdvdfs-tools/buffered_io.cpp
similarity index 100%
rename from src/common/XDVDFS Tools/buffered_io.cpp
rename to src/common/xdvdfs-tools/buffered_io.cpp
diff --git a/src/common/XDVDFS Tools/buffered_io.h b/src/common/xdvdfs-tools/buffered_io.h
similarity index 100%
rename from src/common/XDVDFS Tools/buffered_io.h
rename to src/common/xdvdfs-tools/buffered_io.h
diff --git a/src/common/XDVDFS Tools/xdvdfs.cpp b/src/common/xdvdfs-tools/xdvdfs.cpp
similarity index 100%
rename from src/common/XDVDFS Tools/xdvdfs.cpp
rename to src/common/xdvdfs-tools/xdvdfs.cpp
diff --git a/src/common/XDVDFS Tools/xdvdfs.h b/src/common/xdvdfs-tools/xdvdfs.h
similarity index 100%
rename from src/common/XDVDFS Tools/xdvdfs.h
rename to src/common/xdvdfs-tools/xdvdfs.h
diff --git a/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp b/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp
index cfb54992e..315a7b89f 100644
--- a/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp
+++ b/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp
@@ -50,7 +50,7 @@ namespace xboxkrnl
#include "CxbxKrnl/CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "gui/DbgConsole.h"
#include "CxbxKrnl/ResourceTracker.h"
#include "CxbxKrnl/VMManager.h" // for g_VMManager
diff --git a/src/core/HLE/DSOUND/DirectSound/DirectSound.cpp b/src/core/HLE/DSOUND/DirectSound/DirectSound.cpp
index a2323a205..4e2ca4ecf 100644
--- a/src/core/HLE/DSOUND/DirectSound/DirectSound.cpp
+++ b/src/core/HLE/DSOUND/DirectSound/DirectSound.cpp
@@ -48,7 +48,7 @@ namespace xboxkrnl {
#include "CxbxKrnl/CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "CxbxKrnl/EmuXTL.h"
#include "Common/Settings.hpp"
diff --git a/src/core/HLE/Intercept.cpp b/src/core/HLE/Intercept.cpp
index cbbd73d4d..929cc5120 100644
--- a/src/core/HLE/Intercept.cpp
+++ b/src/core/HLE/Intercept.cpp
@@ -47,7 +47,7 @@
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuXTL.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "Common/CxbxDebugger.h"
#include "Logging.h"
#pragma comment(lib, "XbSymbolDatabase.lib")
diff --git a/src/core/HLE/XACTENG/XactEng.cpp b/src/core/HLE/XACTENG/XactEng.cpp
index 5f8ec6657..196ebdd1c 100644
--- a/src/core/HLE/XACTENG/XactEng.cpp
+++ b/src/core/HLE/XACTENG/XactEng.cpp
@@ -47,7 +47,7 @@ namespace xboxkrnl
#include "Common/Logging.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "CxbxKrnl/EmuXTL.h"
#include "CxbxKrnl/VMManager.h"
diff --git a/src/core/HLE/XAPI/OHCI/XInput/DInput.cpp b/src/core/HLE/XAPI/OHCI/XInput/DInput.cpp
index 0a0d1691c..52379ee45 100644
--- a/src/core/HLE/XAPI/OHCI/XInput/DInput.cpp
+++ b/src/core/HLE/XAPI/OHCI/XInput/DInput.cpp
@@ -39,7 +39,7 @@
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "Common/Win32/DInputController.h"
#include "Logging.h"
diff --git a/src/core/HLE/XAPI/OHCI/XInput/XInput.cpp b/src/core/HLE/XAPI/OHCI/XInput/XInput.cpp
index da9aae948..dd40c7109 100644
--- a/src/core/HLE/XAPI/OHCI/XInput/XInput.cpp
+++ b/src/core/HLE/XAPI/OHCI/XInput/XInput.cpp
@@ -39,7 +39,7 @@
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "XInput.h"
#include
diff --git a/src/core/HLE/XAPI/Xapi.cpp b/src/core/HLE/XAPI/Xapi.cpp
index b2b6046d1..b0b161f55 100644
--- a/src/core/HLE/XAPI/Xapi.cpp
+++ b/src/core/HLE/XAPI/Xapi.cpp
@@ -52,7 +52,7 @@ namespace xboxkrnl
#include "CxbxKrnl/EmuFile.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuXTL.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "../Common/Win32/XBPortMapping.h"
#include "core/HLE/Intercept.hpp"
#include "vsbc/CxbxVSBC.h"
diff --git a/src/devices/SMCDevice.cpp b/src/devices/SMCDevice.cpp
index 9ac154987..85e33518e 100644
--- a/src/devices/SMCDevice.cpp
+++ b/src/devices/SMCDevice.cpp
@@ -44,7 +44,7 @@ namespace xboxkrnl
};
#include "CxbxKrnl\CxbxKrnl.h"
-#include "CxbxKrnl\EmuShared.h"
+#include "EmuShared.h"
#include "SMCDevice.h" // For SMCDevice
#include "ADM1032Device.h" // For ADM1032Device
diff --git a/src/gui/DlgAbout.cpp b/src/gui/DlgAbout.cpp
index 2f59f6fcd..7dbcf43ba 100644
--- a/src/gui/DlgAbout.cpp
+++ b/src/gui/DlgAbout.cpp
@@ -34,7 +34,7 @@
// *
// ******************************************************************
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "CxbxVersion.h"
#include "DlgAbout.h"
diff --git a/src/gui/DlgLoggingConfig.cpp b/src/gui/DlgLoggingConfig.cpp
index a09c639b5..98ecaeb2a 100644
--- a/src/gui/DlgLoggingConfig.cpp
+++ b/src/gui/DlgLoggingConfig.cpp
@@ -33,7 +33,7 @@
// ******************************************************************
#include "Logging.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "DlgLoggingConfig.h"
#include "ResCxbx.h"
#include "Common/IPCHybrid.hpp"
diff --git a/src/gui/WinMain.cpp b/src/gui/WinMain.cpp
index 6dbea11b1..f7cb9bb7a 100644
--- a/src/gui/WinMain.cpp
+++ b/src/gui/WinMain.cpp
@@ -38,7 +38,7 @@
#include "CxbxKrnl/CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "Common/Settings.hpp"
#include
diff --git a/src/gui/WndMain.cpp b/src/gui/WndMain.cpp
index 64c431141..9bfafe3ce 100644
--- a/src/gui/WndMain.cpp
+++ b/src/gui/WndMain.cpp
@@ -48,7 +48,7 @@
#include "DlgLoggingConfig.h"
#include "DlgXboxControllerPortMapping.h"
#include "common\xbe\XbePrinter.h" // For DumpInformation
-#include "CxbxKrnl/EmuShared.h"
+#include "EmuShared.h"
#include "CxbxKrnl/EmuXTL.h"
#include "Common/Settings.hpp"