Fix path slashes and made filenames case-sensitive

diff --git a/source/Main.cpp b/source/Main.cpp
index 9e2d42b2ac2283f9b80ad86cf05b6179517ab491..c12dee5dace9c2032cdc6b385538daa27777a283 100644 (file)
--- a/source/Main.cpp
+++ b/source/Main.cpp
@@ -5,7 +5,7 @@
 #include "Gui.h"
 #include "Bootloader.h"
 
-#include "citraimport\GPU\window\emu_window_glfw.h"
+#include "citraimport/GPU/window/emu_window_glfw.h"
 
 namespace VideoCore {
        void Init(EmuWindow* emu_window);

diff --git a/source/citraimport/GPU/HW/gpu.h b/source/citraimport/GPU/HW/gpu.h
index acbd6567d19fb33c913efa3e797c778f31338533..416169a7b9399ca86a85fa69cf20ffde816dfd2b 100644 (file)
--- a/source/citraimport/GPU/HW/gpu.h
+++ b/source/citraimport/GPU/HW/gpu.h
@@ -7,10 +7,10 @@
 #include <cstddef>
 #include <type_traits>
 
-#include "citraimport\common/assert.h"
-#include "citraimport\common/bit_field.h"
-#include "citraimport\common/common_funcs.h"
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/assert.h"
+#include "citraimport/common/bit_field.h"
+#include "citraimport/common/common_funcs.h"
+#include "citraimport/common/common_types.h"
 
 namespace GPU {
 

diff --git a/source/citraimport/GPU/HW/hw.h b/source/citraimport/GPU/HW/hw.h
index 48c37c8ae218d4609880e0b91d4f42fedc8972aa..161ebd47ea629dc272cb212ccba60ef841511726 100644 (file)
--- a/source/citraimport/GPU/HW/hw.h
+++ b/source/citraimport/GPU/HW/hw.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
 namespace HW {
 

diff --git a/source/citraimport/GPU/HW/lcd.h b/source/citraimport/GPU/HW/lcd.h
index 95efbf7fff54e11e1d8ae7b3a1951d435ee30395..ed87cd699e77bf6e535d8b2075788a5506d6e84b 100644 (file)
--- a/source/citraimport/GPU/HW/lcd.h
+++ b/source/citraimport/GPU/HW/lcd.h
@@ -7,9 +7,9 @@
 #include <cstddef>
 #include <type_traits>
 
-#include "citraimport\common/bit_field.h"
-#include "citraimport\common/common_funcs.h"
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/bit_field.h"
+#include "citraimport/common/common_funcs.h"
+#include "citraimport/common/common_types.h"
 
 #define LCD_REG_INDEX(field_name) (offsetof(LCD::Regs, field_name) / sizeof(u32))
 

diff --git a/source/citraimport/GPU/citragpu.cpp b/source/citraimport/GPU/citragpu.cpp
index 90fa507b14c5db2ad9804e1ea4c9b056422d486f..9bebe47148864e3723d9783fd31787fce08d2ffd 100644 (file)
--- a/source/citraimport/GPU/citragpu.cpp
+++ b/source/citraimport/GPU/citragpu.cpp
@@ -6,27 +6,28 @@ extern bool novideo;
 
 #include <cstring>
 #include <numeric>
+#include <algorithm>
 #include <type_traits>
 
-#include "citraimport\common/color.h"
-#include "citraimport\common/common_types.h"
-#include "citraimport\common/logging/log.h"
-#include "citraimport\common/microprofile.h"
-#include "citraimport\common/vector_math.h"
+#include "citraimport/common/color.h"
+#include "citraimport/common/common_types.h"
+#include "citraimport/common/logging/log.h"
+#include "citraimport/common/microprofile.h"
+#include "citraimport/common/vector_math.h"
 
-#include "citraimport\settings.h"
+#include "citraimport/settings.h"
 
 
-#include "citraimport\GPU\HW/hw.h"
-#include "citraimport\GPU\HW/gpu.h"
+#include "citraimport/GPU/HW/hw.h"
+#include "citraimport/GPU/HW/gpu.h"
 
-#include "citraimport\GPU\video_core/command_processor.h"
-#include "citraimport\GPU\video_core/hwrasterizer_base.h"
-#include "citraimport\GPU\video_core/renderer_base.h"
-#include "citraimport\GPU\video_core/utils.h"
-#include "citraimport\GPU\video_core/video_core.h"
+#include "citraimport/GPU/video_core/command_processor.h"
+#include "citraimport/GPU/video_core/hwrasterizer_base.h"
+#include "citraimport/GPU/video_core/renderer_base.h"
+#include "citraimport/GPU/video_core/utils.h"
+#include "citraimport/GPU/video_core/video_core.h"
 
-#include "citraimport\GPU\video_core/debug_utils/debug_utils.h"
+#include "citraimport/GPU/video_core/debug_utils/debug_utils.h"
 
 u8* Mem_GetPhysicalPointer(u32 addr);
 

diff --git a/source/citraimport/GPU/video_core/command_processor.cpp b/source/citraimport/GPU/video_core/command_processor.cpp
index a328cce1bc0a1fca960965d99c0ec17787a88124..565547cd9e8895747b7ce9803a7322f5575bbc87 100644 (file)
--- a/source/citraimport/GPU/video_core/command_processor.cpp
+++ b/source/citraimport/GPU/video_core/command_processor.cpp
@@ -10,16 +10,16 @@
 
 #include <citraimport/settings.h>
 
-#include "citraimport\GPU\video_core/clipper.h"
-#include "citraimport\GPU\video_core/command_processor.h"
-#include "citraimport\GPU\video_core/pica.h"
-#include "citraimport\GPU\video_core/primitive_assembly.h"
-#include "citraimport\GPU\video_core/renderer_base.h"
-#include "citraimport\GPU\video_core/video_core.h"
-#include "citraimport\GPU\video_core/debug_utils/debug_utils.h"
-#include "citraimport\GPU\video_core/shader/shader_interpreter.h"
-
-#include "citraimport\GPU\HW\gpu.h"
+#include "citraimport/GPU/video_core/clipper.h"
+#include "citraimport/GPU/video_core/command_processor.h"
+#include "citraimport/GPU/video_core/pica.h"
+#include "citraimport/GPU/video_core/primitive_assembly.h"
+#include "citraimport/GPU/video_core/renderer_base.h"
+#include "citraimport/GPU/video_core/video_core.h"
+#include "citraimport/GPU/video_core/debug_utils/debug_utils.h"
+#include "citraimport/GPU/video_core/shader/shader_interpreter.h"
+
+#include "citraimport/GPU/HW/gpu.h"
 
 u8* Mem_GetPhysicalPointer(u32 addr);
 extern "C" void citraFireInterrupt(int id);

diff --git a/source/citraimport/GPU/video_core/command_processor.h b/source/citraimport/GPU/video_core/command_processor.h
index 9439423585d37d137cd6a7307599f143ae49a876..84c88a00e60b0871a327dc73e35678476b9a5fa8 100644 (file)
--- a/source/citraimport/GPU/video_core/command_processor.h
+++ b/source/citraimport/GPU/video_core/command_processor.h
@@ -6,8 +6,8 @@
 
 #include <type_traits>
 
-#include "citraimport\common/bit_field.h"
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/bit_field.h"
+#include "citraimport/common/common_types.h"
 
 namespace Pica {
 

diff --git a/source/citraimport/GPU/video_core/debug_utils/debug_utils.h b/source/citraimport/GPU/video_core/debug_utils/debug_utils.h
index 1dff5b149378abb1a35374511e90ece96b94bc28..c0832d78b69c45efd444611a0f15697b04f34ce0 100644 (file)
--- a/source/citraimport/GPU/video_core/debug_utils/debug_utils.h
+++ b/source/citraimport/GPU/video_core/debug_utils/debug_utils.h
@@ -12,9 +12,9 @@
 #include <mutex>
 #include <vector>
 
-#include "citraimport\common/vector_math.h"
+#include "citraimport/common/vector_math.h"
 
-#include "citraimport\GPU\video_core/pica.h"
+#include "citraimport/GPU/video_core/pica.h"
 
 namespace Pica {
 

diff --git a/source/citraimport/GPU/video_core/hwrasterizer_base.h b/source/citraimport/GPU/video_core/hwrasterizer_base.h
index c11f3d249c4c4fe34c457ba8c3697a9823881eaf..1d3351000e5c42d6ca62851663cef5ab33ef4fa2 100644 (file)
--- a/source/citraimport/GPU/video_core/hwrasterizer_base.h
+++ b/source/citraimport/GPU/video_core/hwrasterizer_base.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
 namespace Pica {
 namespace Shader {

diff --git a/source/citraimport/GPU/video_core/pica.cpp b/source/citraimport/GPU/video_core/pica.cpp
index 0288194703c0a748f07017f6c9ce2383b4e6679b..a19d2e57c140cd725bcfb96c4ff1e222541626f9 100644 (file)
--- a/source/citraimport/GPU/video_core/pica.cpp
+++ b/source/citraimport/GPU/video_core/pica.cpp
@@ -5,8 +5,8 @@
 #include <cstring>
 #include <unordered_map>
 
-#include "citraimport\GPU\video_core/pica.h"
-#include "citraimport\GPU\video_core/shader/shader.h"
+#include "citraimport/GPU/video_core/pica.h"
+#include "citraimport/GPU/video_core/shader/shader.h"
 
 namespace Pica {
 

diff --git a/source/citraimport/GPU/video_core/pica.h b/source/citraimport/GPU/video_core/pica.h
index 6864e3f3587050921fcadab3fe788e577cdcc624..0ede18011f62aceb132641f5d29f719a57f944fa 100644 (file)
--- a/source/citraimport/GPU/video_core/pica.h
+++ b/source/citraimport/GPU/video_core/pica.h
@@ -9,12 +9,12 @@
 #include <cstddef>
 #include <string>
 
-#include "citraimport\common/assert.h"
-#include "citraimport\common/bit_field.h"
-#include "citraimport\common/common_funcs.h"
-#include "citraimport\common/common_types.h"
-#include "citraimport\common/vector_math.h"
-#include "citraimport\common/logging/log.h"
+#include "citraimport/common/assert.h"
+#include "citraimport/common/bit_field.h"
+#include "citraimport/common/common_funcs.h"
+#include "citraimport/common/common_types.h"
+#include "citraimport/common/vector_math.h"
+#include "citraimport/common/logging/log.h"
 
 namespace Pica {
 

diff --git a/source/citraimport/GPU/video_core/primitive_assembly.cpp b/source/citraimport/GPU/video_core/primitive_assembly.cpp
index 6909f59df773fefe91051593b2501c7a16f52154..ce7701b253d6a448f11e39d27afc97e6d20e79bb 100644 (file)
--- a/source/citraimport/GPU/video_core/primitive_assembly.cpp
+++ b/source/citraimport/GPU/video_core/primitive_assembly.cpp
@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citraimport\GPU\video_core/pica.h"
-#include "citraimport\GPU\video_core/primitive_assembly.h"
-#include "citraimport\GPU\video_core/debug_utils/debug_utils.h"
-#include "citraimport\GPU\video_core/shader/shader_interpreter.h"
+#include "citraimport/GPU/video_core/pica.h"
+#include "citraimport/GPU/video_core/primitive_assembly.h"
+#include "citraimport/GPU/video_core/debug_utils/debug_utils.h"
+#include "citraimport/GPU/video_core/shader/shader_interpreter.h"
 
 namespace Pica {
 

diff --git a/source/citraimport/GPU/video_core/primitive_assembly.h b/source/citraimport/GPU/video_core/primitive_assembly.h
index 84aae529d260abef3ad8300af55c790d2786e3e3..969e2c605306e3b66a8f96c0ac8220e0ffc2b816 100644 (file)
--- a/source/citraimport/GPU/video_core/primitive_assembly.h
+++ b/source/citraimport/GPU/video_core/primitive_assembly.h
@@ -6,7 +6,7 @@
 
 #include <functional>
 
-#include "citraimport\GPU\video_core/pica.h"
+#include "citraimport/GPU/video_core/pica.h"
 
 namespace Pica {
 

diff --git a/source/citraimport/GPU/video_core/rasterizer.cpp b/source/citraimport/GPU/video_core/rasterizer.cpp
index 6960cd9c3b23116d27bc608c736390547bd5824c..c3eaefae29159f19addd487ffc83c898a21e4e65 100644 (file)
--- a/source/citraimport/GPU/video_core/rasterizer.cpp
+++ b/source/citraimport/GPU/video_core/rasterizer.cpp
@@ -7,19 +7,19 @@
 #include <algorithm>
 #include <cmath>
 
-#include "citraimport\common/color.h"
-#include "citraimport\common/common_types.h"
-#include "citraimport\common/math_util.h"
-#include "citraimport\common/microprofile.h"
-#include "citraimport\common/profiler.h"
+#include "citraimport/common/color.h"
+#include "citraimport/common/common_types.h"
+#include "citraimport/common/math_util.h"
+#include "citraimport/common/microprofile.h"
+#include "citraimport/common/profiler.h"
 
-#include "citraimport\GPU\video_core/pica.h"
-#include "citraimport\GPU\video_core/rasterizer.h"
-#include "citraimport\GPU\video_core/utils.h"
-#include "citraimport\GPU\video_core/debug_utils/debug_utils.h"
-#include "citraimport\GPU\video_core/shader/shader_interpreter.h"
+#include "citraimport/GPU/video_core/pica.h"
+#include "citraimport/GPU/video_core/rasterizer.h"
+#include "citraimport/GPU/video_core/utils.h"
+#include "citraimport/GPU/video_core/debug_utils/debug_utils.h"
+#include "citraimport/GPU/video_core/shader/shader_interpreter.h"
 
-#include "citraimport\GPU\HW\gpu.h"
+#include "citraimport/GPU/HW/gpu.h"
 
 u8* Mem_GetPhysicalPointer(u32 addr);
 
@@ -439,7 +439,7 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0,
                 if (!texture.enabled)
                     continue;
 
-                assert(0 != texture.config.address);
+                ASSERT(0 != texture.config.address);
 
                 int s = (int)(uv[i].u() * float24::FromFloat32(static_cast<float>(texture.config.width))).ToFloat32();
                 int t = (int)(uv[i].v() * float24::FromFloat32(static_cast<float>(texture.config.height))).ToFloat32();

diff --git a/source/citraimport/GPU/video_core/renderer_base.h b/source/citraimport/GPU/video_core/renderer_base.h
index a18e056c708bfe64ff6b2e683a5298d0d9347938..9d8fc48c12c3138f7f4824298a64ffb1ad976e89 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_base.h
+++ b/source/citraimport/GPU/video_core/renderer_base.h
@@ -6,9 +6,9 @@
 
 #include <memory>
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
-#include "citraimport\GPU\video_core/hwrasterizer_base.h"
+#include "citraimport/GPU/video_core/hwrasterizer_base.h"
 
 class EmuWindow;
 

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.cpp b/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.cpp
index 26e4954c5f140447752935c8b7a3dab85ca3ac4d..d49f437aa3e95604e63efe7eb00c77743614a96d 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -7,20 +7,20 @@
 
 //#include <glad/glad.h>
 
-#include "citraimport\common/color.h"
-#include "citraimport\common/math_util.h"
-#include "citraimport\common/microprofile.h"
-#include "citraimport\common/profiler.h"
+#include "citraimport/common/color.h"
+#include "citraimport/common/math_util.h"
+#include "citraimport/common/microprofile.h"
+#include "citraimport/common/profiler.h"
 
 
-#include "citraimport\GPU\video_core/pica.h"
-#include "citraimport\GPU\video_core/utils.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_rasterizer.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_shaders.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_shader_util.h"
-#include "citraimport\GPU\video_core/renderer_opengl/pica_to_gl.h"
+#include "citraimport/GPU/video_core/pica.h"
+#include "citraimport/GPU/video_core/utils.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_shaders.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_shader_util.h"
+#include "citraimport/GPU/video_core/renderer_opengl/pica_to_gl.h"
 
-#include "citraimport\settings.h"
+#include "citraimport/settings.h"
 
 u8* Mem_GetPhysicalPointer(u32 addr);
 
@@ -146,7 +146,7 @@ void RasterizerOpenGL::InitObjects() {
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fb_color_texture.texture.handle, 0);
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, fb_depth_texture.texture.handle, 0);
 
-    assert(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE,
+    ASSERT_MSG(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE,
                "OpenGL rasterizer framebuffer setup failed, status %X", glCheckFramebufferStatus(GL_FRAMEBUFFER));
 }
 

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.h b/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.h
index bce5101a4eac0a60d1cd22c878926957186c62de..7669ea2cbaebab20017fc5d4f943c922204eac85 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.h
+++ b/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.h
@@ -6,12 +6,12 @@
 
 #include <vector>
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
-#include "citraimport\GPU\video_core/hwrasterizer_base.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_rasterizer_cache.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_state.h"
-#include "citraimport\GPU\video_core/shader/shader_interpreter.h"
+#include "citraimport/GPU/video_core/hwrasterizer_base.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_rasterizer_cache.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_state.h"
+#include "citraimport/GPU/video_core/shader/shader_interpreter.h"
 
 class RasterizerOpenGL : public HWRasterizer {
 public:

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index 0129efa192cb96ea9211496895eccff6bf826325..699b20709ee1f885a6213e860c8eb0f5bb944c74 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -4,15 +4,15 @@
 
 #define NOMINMAX
 
-#include "citraimport\common/hash.h"
-#include "citraimport\common/make_unique.h"
-#include "citraimport\common/math_util.h"
-#include "citraimport\common/microprofile.h"
-#include "citraimport\common/vector_math.h"
-
-#include "citraimport\GPU\video_core/debug_utils/debug_utils.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_rasterizer_cache.h"
-#include "citraimport\GPU\video_core/renderer_opengl/pica_to_gl.h"
+#include "citraimport/common/hash.h"
+#include "citraimport/common/make_unique.h"
+#include "citraimport/common/math_util.h"
+#include "citraimport/common/microprofile.h"
+#include "citraimport/common/vector_math.h"
+
+#include "citraimport/GPU/video_core/debug_utils/debug_utils.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_rasterizer_cache.h"
+#include "citraimport/GPU/video_core/renderer_opengl/pica_to_gl.h"
 
 u8* Mem_GetPhysicalPointer(u32 addr);
 

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer_cache.h b/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer_cache.h
index be7ac4413cf689574ae2d9305fcbcb03e9b68802..7c8b912e3e61053a1421a7cb2a9997688d60e0b9 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer_cache.h
+++ b/source/citraimport/GPU/video_core/renderer_opengl/gl_rasterizer_cache.h
@@ -7,10 +7,10 @@
 #include <map>
 #include <memory>
 
-#include "citraimport\GPU\video_core/pica.h"
-#include "citraimport\GPU\video_core/debug_utils/debug_utils.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_resource_manager.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_state.h"
+#include "citraimport/GPU/video_core/pica.h"
+#include "citraimport/GPU/video_core/debug_utils/debug_utils.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_resource_manager.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_state.h"
 
 class RasterizerCacheOpenGL : NonCopyable {
 public:

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/gl_resource_manager.h b/source/citraimport/GPU/video_core/renderer_opengl/gl_resource_manager.h
index d12de840e9015e534247abf7cb9e02d76bf012d4..77fc9989c620c6104033a5e025551b712120f21e 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/gl_resource_manager.h
+++ b/source/citraimport/GPU/video_core/renderer_opengl/gl_resource_manager.h
@@ -6,12 +6,12 @@
 
 #include <utility>
 
-#include <citraimport\glad\include\glad/glad.h>
+#include <citraimport/glad/include/glad/glad.h>
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
-#include "citraimport\GPU\video_core/renderer_opengl/gl_shader_util.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_state.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_shader_util.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_state.h"
 
 class OGLTexture : private NonCopyable {
 public:

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/gl_shader_util.cpp b/source/citraimport/GPU/video_core/renderer_opengl/gl_shader_util.cpp
index 56b5fb319b0718a1d95a61c397a45ae460d4967a..add75e4bc8bd90ead71a6568feb85b3e92ac3b25 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/gl_shader_util.cpp
+++ b/source/citraimport/GPU/video_core/renderer_opengl/gl_shader_util.cpp
@@ -5,9 +5,9 @@
 #include <algorithm>
 #include <vector>
 
-#include "log.h"
+#include "Log.h"
 
-#include "citraimport\GPU\video_core/renderer_opengl/gl_shader_util.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_shader_util.h"
 
 namespace ShaderUtil {
 

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/gl_shader_util.h b/source/citraimport/GPU/video_core/renderer_opengl/gl_shader_util.h
index 678fc1610d4bde536ecf5dcb59da3eae36cdd937..53ef942848a86e3a033580a1bee2d0341dd801d9 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/gl_shader_util.h
+++ b/source/citraimport/GPU/video_core/renderer_opengl/gl_shader_util.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <citraimport\glad\include\glad/glad.h>
+#include <citraimport/glad/include/glad/glad.h>
 
 namespace ShaderUtil {
 

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/gl_state.cpp b/source/citraimport/GPU/video_core/renderer_opengl/gl_state.cpp
index 2b669da13c68dad34e0b91d735d1a23ffafc1d29..0d83ac1415fc3b8d6418dcd2160a41c4b3c1c95b 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/gl_state.cpp
+++ b/source/citraimport/GPU/video_core/renderer_opengl/gl_state.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citraimport\GPU\video_core/pica.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_state.h"
+#include "citraimport/GPU/video_core/pica.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_state.h"
 
 OpenGLState OpenGLState::cur_state;
 

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/gl_state.h b/source/citraimport/GPU/video_core/renderer_opengl/gl_state.h
index da805010a22017217209d42998aa3c0315b0c410..a09ee4cae33ad9a1446e13bddf18eb5767183ac2 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/gl_state.h
+++ b/source/citraimport/GPU/video_core/renderer_opengl/gl_state.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <citraimport\glad\include\glad/glad.h>
+#include <citraimport/glad/include/glad/glad.h>
 
 class OpenGLState {
 public:

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/pica_to_gl.h b/source/citraimport/GPU/video_core/renderer_opengl/pica_to_gl.h
index 44786cc2c05145453001027a279a894c08d8e490..c9e03683d34ea6e3e53c59ffa8b22027a17372c6 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/pica_to_gl.h
+++ b/source/citraimport/GPU/video_core/renderer_opengl/pica_to_gl.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include <citraimport\glad\include/glad/glad.h>
+#include <citraimport/glad/include/glad/glad.h>
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
-#include "citraimport\GPU\video_core/pica.h"
+#include "citraimport/GPU/video_core/pica.h"
 
 namespace PicaToGL {
 

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/renderer_opengl.cpp b/source/citraimport/GPU/video_core/renderer_opengl/renderer_opengl.cpp
index af12efab29d09ba53e389a55bd2dc03a84438863..0da85252498a80b625c79a9ef5f6bad7fa710d64 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/source/citraimport/GPU/video_core/renderer_opengl/renderer_opengl.cpp
@@ -12,22 +12,22 @@ using namespace std;
 
 #include <cassert>
 
-#include "citraimport\common/assert.h"
-#include "citraimport\common/emu_window.h"
-#include "citraimport\common/logging/log.h"
-#include "citraimport\common/profiler_reporting.h"
-
-#include "citraimport\GPU\video_core/video_core.h"
-#include "citraimport\GPU\video_core/debug_utils/debug_utils.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_rasterizer.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_shader_util.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_shaders.h"
-#include "citraimport\GPU\video_core/renderer_opengl/renderer_opengl.h"
-
-#include "citraimport\settings.h"
-
-#include "citraimport\GPU\HW\lcd.h"
-#include "citraimport\GPU\HW\hw.h"
+#include "citraimport/common/assert.h"
+#include "citraimport/common/emu_window.h"
+#include "citraimport/common/logging/log.h"
+#include "citraimport/common/profiler_reporting.h"
+
+#include "citraimport/GPU/video_core/video_core.h"
+#include "citraimport/GPU/video_core/debug_utils/debug_utils.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_rasterizer.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_shader_util.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_shaders.h"
+#include "citraimport/GPU/video_core/renderer_opengl/renderer_opengl.h"
+
+#include "citraimport/settings.h"
+
+#include "citraimport/GPU/HW/lcd.h"
+#include "citraimport/GPU/HW/hw.h"
 
 //import
 u8* Mem_GetPhysicalPointer(u32 addr);

diff --git a/source/citraimport/GPU/video_core/renderer_opengl/renderer_opengl.h b/source/citraimport/GPU/video_core/renderer_opengl/renderer_opengl.h
index a3bfcdfb890a1fe5dfc654bc851dc8ecceb644bc..fa58cf49745f456726cb4e0d89aedc0ba0e8fc34 100644 (file)
--- a/source/citraimport/GPU/video_core/renderer_opengl/renderer_opengl.h
+++ b/source/citraimport/GPU/video_core/renderer_opengl/renderer_opengl.h
@@ -9,10 +9,10 @@
 //#include <glad/glad.h>
 
 
-#include "citraimport\GPU\video_core/renderer_base.h"
-#include "citraimport\GPU\video_core/renderer_opengl/gl_state.h"
+#include "citraimport/GPU/video_core/renderer_base.h"
+#include "citraimport/GPU/video_core/renderer_opengl/gl_state.h"
 
-#include "citraimport\GPU\HW/gpu.h"
+#include "citraimport/GPU/HW/gpu.h"
 
 class EmuWindow;
 

diff --git a/source/citraimport/GPU/video_core/shader/shader.cpp b/source/citraimport/GPU/video_core/shader/shader.cpp
index f110f5ff7f5ad0561d374670e2ede62f74bec9a4..c8fc8d44984ae06056c80568657993b30884dc60 100644 (file)
--- a/source/citraimport/GPU/video_core/shader/shader.cpp
+++ b/source/citraimport/GPU/video_core/shader/shader.cpp
@@ -3,18 +3,19 @@
 // Refer to the license.txt file included.
 
 #include <memory>
+#include <cstring>
 #include <unordered_map>
 
 //#include <boost/range/algorithm/fill.hpp>
 
-#include "citraimport\common/hash.h"
-#include "citraimport\common/make_unique.h"
-#include "citraimport\common/microprofile.h"
-#include "citraimport\common/profiler.h"
+#include "citraimport/common/hash.h"
+#include "citraimport/common/make_unique.h"
+#include "citraimport/common/microprofile.h"
+#include "citraimport/common/profiler.h"
 
-#include "citraimport\GPU\video_core/debug_utils/debug_utils.h"
-#include "citraimport\GPU\video_core/pica.h"
-#include "citraimport\GPU\video_core/video_core.h"
+#include "citraimport/GPU/video_core/debug_utils/debug_utils.h"
+#include "citraimport/GPU/video_core/pica.h"
+#include "citraimport/GPU/video_core/video_core.h"
 
 #include "shader.h"
 #include "shader_interpreter.h"

diff --git a/source/citraimport/GPU/video_core/shader/shader.h b/source/citraimport/GPU/video_core/shader/shader.h
index 3cb7eba74e3df6ef227d2706b4b73c2f513de697..85de6a121f9a8afae6c465c975d0241f122b31f4 100644 (file)
--- a/source/citraimport/GPU/video_core/shader/shader.h
+++ b/source/citraimport/GPU/video_core/shader/shader.h
@@ -8,13 +8,13 @@
 
 //#include <boost/container/static_vector.hpp>
 
-#include <citraimport\nihstro/shader_binary.h>
+#include <citraimport/nihstro/shader_binary.h>
 
-#include "citraimport\common/common_funcs.h"
-#include "citraimport\common/common_types.h"
-#include "citraimport\common/vector_math.h"
+#include "citraimport/common/common_funcs.h"
+#include "citraimport/common/common_types.h"
+#include "citraimport/common/vector_math.h"
 
-#include "citraimport\GPU\video_core/pica.h"
+#include "citraimport/GPU/video_core/pica.h"
 
 using nihstro::RegisterType;
 using nihstro::SourceRegister;

diff --git a/source/citraimport/GPU/video_core/shader/shader_interpreter.cpp b/source/citraimport/GPU/video_core/shader/shader_interpreter.cpp
index 984addd6a11f1b7d88445fb91f43111e2e587f7c..83ff02ce42706df637d026ae24c76afd606bf890 100644 (file)
--- a/source/citraimport/GPU/video_core/shader/shader_interpreter.cpp
+++ b/source/citraimport/GPU/video_core/shader/shader_interpreter.cpp
@@ -2,13 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <citraimport\common/file_util.h>
+#include <citraimport/common/file_util.h>
 
-#include <citraimport\nihstro/shader_bytecode.h>
+#include <citraimport/nihstro/shader_bytecode.h>
 
-#include "citraimport\GPU\video_core/pica.h"
-#include "citraimport\GPU\video_core/shader/shader.h"
-#include "citraimport\GPU\video_core/shader/shader_interpreter.h"
+#include "citraimport/GPU/video_core/pica.h"
+#include "citraimport/GPU/video_core/shader/shader.h"
+#include "citraimport/GPU/video_core/shader/shader_interpreter.h"
 
 using nihstro::OpCode;
 using nihstro::Instruction;

diff --git a/source/citraimport/GPU/video_core/shader/shader_interpreter.h b/source/citraimport/GPU/video_core/shader/shader_interpreter.h
index a36e220d68efe4e929fd9cc593c96edcfc6cfc4d..df75a4c8864a67fa64033b09587b557bb3e34b64 100644 (file)
--- a/source/citraimport/GPU/video_core/shader/shader_interpreter.h
+++ b/source/citraimport/GPU/video_core/shader/shader_interpreter.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "citraimport\GPU\video_core/shader/shader.h"
+#include "citraimport/GPU/video_core/shader/shader.h"
 
 namespace Pica {
 

diff --git a/source/citraimport/GPU/video_core/shader/shader_jit_x64.cpp b/source/citraimport/GPU/video_core/shader/shader_jit_x64.cpp
index 332f2258756cd604af766ae9dc21be3febc01ad0..9b2926eb6f39ff834f31b9828381ac1036c492c1 100644 (file)
--- a/source/citraimport/GPU/video_core/shader/shader_jit_x64.cpp
+++ b/source/citraimport/GPU/video_core/shader/shader_jit_x64.cpp
@@ -4,9 +4,9 @@
 
 #include <smmintrin.h>
 
-#include "citraimport\common/x64/abi.h"
-#include "citraimport\common/x64/cpu_detect.h"
-#include "citraimport\common/x64/emitter.h"
+#include "citraimport/common/x64/abi.h"
+#include "citraimport/common/x64/cpu_detect.h"
+#include "citraimport/common/x64/emitter.h"
 
 #include "shader.h"
 #include "shader_jit_x64.h"

diff --git a/source/citraimport/GPU/video_core/shader/shader_jit_x64.h b/source/citraimport/GPU/video_core/shader/shader_jit_x64.h
index d9e1e47e09fc63891f3505af9dc8bcae89f57c1e..cb94aea94bb0a7d86fc441b21aad3e623d093ac7 100644 (file)
--- a/source/citraimport/GPU/video_core/shader/shader_jit_x64.h
+++ b/source/citraimport/GPU/video_core/shader/shader_jit_x64.h
@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include <citraimport\nihstro/shader_bytecode.h>
+#include <citraimport/nihstro/shader_bytecode.h>
 
-#include "citraimport\common/x64/emitter.h"
+#include "citraimport/common/x64/emitter.h"
 
-#include "citraimport\GPU\video_core/pica.h"
-#include "citraimport\GPU\video_core/shader/shader.h"
+#include "citraimport/GPU/video_core/pica.h"
+#include "citraimport/GPU/video_core/shader/shader.h"
 
 using nihstro::Instruction;
 using nihstro::OpCode;

diff --git a/source/citraimport/GPU/video_core/utils.cpp b/source/citraimport/GPU/video_core/utils.cpp
index 407c62d5d1d8b510b6e705897c450e5c926af29b..ca3f936c25f56f75ac4bbd569dc6ad56544f17ac 100644 (file)
--- a/source/citraimport/GPU/video_core/utils.cpp
+++ b/source/citraimport/GPU/video_core/utils.cpp
@@ -5,7 +5,7 @@
 #include <cstdio>
 #include <cstring>
 
-#include "citraimport\GPU\video_core/utils.h"
+#include "citraimport/GPU/video_core/utils.h"
 
 namespace VideoCore {
 

diff --git a/source/citraimport/GPU/video_core/utils.h b/source/citraimport/GPU/video_core/utils.h
index bb03cc537b7a0b9506c12386fba9afa6e17584a3..13e6a11e63a0c65e35cf5850739648279bec95ca 100644 (file)
--- a/source/citraimport/GPU/video_core/utils.h
+++ b/source/citraimport/GPU/video_core/utils.h
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
 namespace VideoCore {
 

diff --git a/source/citraimport/GPU/video_core/video_core.cpp b/source/citraimport/GPU/video_core/video_core.cpp
index 0c71c6bcbea4ca1651f8b16e03d61c7013d8a717..bae49dfe33da965ab7bdd2616fcb62187193a7c2 100644 (file)
--- a/source/citraimport/GPU/video_core/video_core.cpp
+++ b/source/citraimport/GPU/video_core/video_core.cpp
@@ -3,10 +3,10 @@
 // Refer to the license.txt file included.
 
 
-#include "citraimport\GPU\video_core/pica.h"
-#include "citraimport\GPU\video_core/renderer_base.h"
-#include "citraimport\GPU\video_core/video_core.h"
-#include "citraimport\GPU\video_core/renderer_opengl/renderer_opengl.h"
+#include "citraimport/GPU/video_core/pica.h"
+#include "citraimport/GPU/video_core/renderer_base.h"
+#include "citraimport/GPU/video_core/video_core.h"
+#include "citraimport/GPU/video_core/renderer_opengl/renderer_opengl.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Video Core namespace

diff --git a/source/citraimport/GPU/window/emu_window.h b/source/citraimport/GPU/window/emu_window.h
index 38c2fc8fb34ca0b9eacf0dc050581d643ef59fc1..290789063a5c7689cad6be535399368825582eb1 100644 (file)
--- a/source/citraimport/GPU/window/emu_window.h
+++ b/source/citraimport/GPU/window/emu_window.h
@@ -7,8 +7,8 @@
 #include <tuple>
 #include <utility>
 
-#include "citraimport\math_util.h"
-#include "common.h"
+#include "citraimport/math_util.h"
+#include "Common.h"
 
 /*#include "common/common_types.h"
 #include "common/math_util.h"

diff --git a/source/citraimport/common/assert.h b/source/citraimport/common/assert.h
index 4ff43c09a99bf6e5653a6c3846bf6a5eefd07d32..ede9961a60c1fe7b97e736e6425bb2ba41adc302 100644 (file)
--- a/source/citraimport/common/assert.h
+++ b/source/citraimport/common/assert.h
@@ -6,8 +6,8 @@
 
 #include <cstdlib>
 
-#include "citraimport\common/common_funcs.h"
-#include "citraimport\common/logging/log.h"
+#include "citraimport/common/common_funcs.h"
+#include "citraimport/common/logging/log.h"
 
 // For asserts we'd like to keep all the junk executed when an assert happens away from the
 // important code in the function. One way of doing this is to put all the relevant code inside a

diff --git a/source/citraimport/common/bit_field.h b/source/citraimport/common/bit_field.h
index ab05ce3ed30530d4dba4e24140e4678c3bc8555c..6f88f1f693b825923f1ffef9c13543bf8bd21483 100644 (file)
--- a/source/citraimport/common/bit_field.h
+++ b/source/citraimport/common/bit_field.h
@@ -36,7 +36,7 @@
 #include <limits>
 #include <type_traits>
 
-#include "citraimport\common/common_funcs.h"
+#include "citraimport/common/common_funcs.h"
 
 /*
  * Abstract bitfield class

diff --git a/source/citraimport/common/bit_set.h b/source/citraimport/common/bit_set.h
index 30d3fbae622ef1aac4e4b91e5d668e8ca6757319..a2c2471b0e6557417567a26840a19c266ff89663 100644 (file)
--- a/source/citraimport/common/bit_set.h
+++ b/source/citraimport/common/bit_set.h
@@ -8,7 +8,7 @@
 #endif
 #include <initializer_list>
 #include <type_traits>
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
 // namespace avoids conflict with OS X Carbon; don't use BitSet<T> directly
 namespace Common {

diff --git a/source/citraimport/common/break_points.cpp b/source/citraimport/common/break_points.cpp
index 6372c2233aa373c8dcdfe9dcd58c193dce9f2cc1..b1eb55358bc2811a727d2c59b38be1ac9d13307a 100644 (file)
--- a/source/citraimport/common/break_points.cpp
+++ b/source/citraimport/common/break_points.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citraimport\common/break_points.h"
-#include "citraimport\common/logging/log.h"
+#include "citraimport/common/break_points.h"
+#include "citraimport/common/logging/log.h"
 
 #include <sstream>
 #include <algorithm>

diff --git a/source/citraimport/common/break_points.h b/source/citraimport/common/break_points.h
index 6febdd8d4581670080123dde4b79913c5d73a62a..d719f0f5bf64e686eb38c44147ffdbbc1d172283 100644 (file)
--- a/source/citraimport/common/break_points.h
+++ b/source/citraimport/common/break_points.h
@@ -7,7 +7,7 @@
 #include <vector>
 #include <string>
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
 class DebugInterface;
 

diff --git a/source/citraimport/common/citra_timer.cpp b/source/citraimport/common/citra_timer.cpp
index a5389f61599cdb477ddec84b2702d8b8d2682848..360cbffed58d8b8f5b774624ece4f72c4b2b1149 100644 (file)
--- a/source/citraimport/common/citra_timer.cpp
+++ b/source/citraimport/common/citra_timer.cpp
@@ -12,9 +12,9 @@
 #include <sys/time.h>
 #endif
 
-#include "citraimport\common\common_types.h"
-#include "citraimport\common/string_util.h"
-#include "citraimport\common/timer.h"
+#include "citraimport/common/common_types.h"
+#include "citraimport/common/string_util.h"
+#include "citraimport/common/timer.h"
 
 /*namespace Common
 {

diff --git a/source/citraimport/common/color.h b/source/citraimport/common/color.h
index f3cbc1cd65380abb2c936419acdba160cbbd0dfd..eeb3b20c48455b1ade3332b18c2b1d60374b6eac 100644 (file)
--- a/source/citraimport/common/color.h
+++ b/source/citraimport/common/color.h
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "citraimport\common/common_types.h"
-#include "citraimport\common/swap.h"
-#include "citraimport\common/vector_math.h"
+#include "citraimport/common/common_types.h"
+#include "citraimport/common/swap.h"
+#include "citraimport/common/vector_math.h"
 
 namespace Color {
 

diff --git a/source/citraimport/common/emu_window.h b/source/citraimport/common/emu_window.h
index 8ce34efc23e203a564fdf05e1d9c4af5d0db449d..1a3cf4f4537d36e4f407ea14c6f1d99a246ef4e5 100644 (file)
--- a/source/citraimport/common/emu_window.h
+++ b/source/citraimport/common/emu_window.h
@@ -7,8 +7,8 @@
 #include <tuple>
 #include <utility>
 
-#include "citraimport\common/common_types.h"
-#include "citraimport\common/math_util.h"
+#include "citraimport/common/common_types.h"
+#include "citraimport/common/math_util.h"
 
 namespace KeyMap {
 struct HostDeviceKey;

diff --git a/source/citraimport/common/file_util.cpp b/source/citraimport/common/file_util.cpp
index 43d9c2afeacd3f16ffa380698a8f4bce29dd5275..490728a1180a9eca167c7c55ccf3c53bd4c99841 100644 (file)
--- a/source/citraimport/common/file_util.cpp
+++ b/source/citraimport/common/file_util.cpp
@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citraimport\common/assert.h"
-#include "citraimport\common/common_funcs.h"
-#include "citraimport\common/common_paths.h"
-#include "citraimport\common/file_util.h"
-#include "citraimport\common/logging/log.h"
+#include "citraimport/common/assert.h"
+#include "citraimport/common/common_funcs.h"
+#include "citraimport/common/common_paths.h"
+#include "citraimport/common/file_util.h"
+#include "citraimport/common/logging/log.h"
 
 #ifdef _WIN32
     #include <windows.h>
@@ -17,7 +17,7 @@
     #include <direct.h> // getcwd
     #include <tchar.h>
 
-    #include "citraimport\common/string_util.h"
+    #include "citraimport/common/string_util.h"
 
     // 64 bit offsets for windows
     #define fseeko _fseeki64

diff --git a/source/citraimport/common/file_util.h b/source/citraimport/common/file_util.h
index 3a3262999772c644c9f84a68a910ebb43e79c3fd..d8de6d94bd1989786adf1372fa39255eee110e30 100644 (file)
--- a/source/citraimport/common/file_util.h
+++ b/source/citraimport/common/file_util.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
 // User directory indices for GetUserPath
 enum {

diff --git a/source/citraimport/common/hash.h b/source/citraimport/common/hash.h
index 27498b959a5e8cf3c706c95bff2b7f3ca1f01925..9ba319f7bb5547c6912b2f9d727329810dc8fe56 100644 (file)
--- a/source/citraimport/common/hash.h
+++ b/source/citraimport/common/hash.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
 namespace Common {
 

diff --git a/source/citraimport/common/logging/backend.cpp b/source/citraimport/common/logging/backend.cpp
index 0fa1db2fc4be0390319cf64cf30506109a87ef05..2405fd56f899a1e84ebe2901565af7419ca66c38 100644 (file)
--- a/source/citraimport/common/logging/backend.cpp
+++ b/source/citraimport/common/logging/backend.cpp
@@ -6,12 +6,12 @@
 #include <array>
 #include <cstdio>
 
-#include "citraimport\common/assert.h"
-#include "citraimport\common/common_funcs.h" // snprintf compatibility define
-#include "citraimport\common/logging/backend.h"
-#include "citraimport\common/logging/filter.h"
-#include "citraimport\common/logging/log.h"
-#include "citraimport\common/logging/text_formatter.h"
+#include "citraimport/common/assert.h"
+#include "citraimport/common/common_funcs.h" // snprintf compatibility define
+#include "citraimport/common/logging/backend.h"
+#include "citraimport/common/logging/filter.h"
+#include "citraimport/common/logging/log.h"
+#include "citraimport/common/logging/text_formatter.h"
 
 namespace Log {
 

diff --git a/source/citraimport/common/logging/backend.h b/source/citraimport/common/logging/backend.h
index 8b46c327d798cf73f48a8302032b9c469740babd..6b5777c22786846c29272f6c3dfcbe69d253387f 100644 (file)
--- a/source/citraimport/common/logging/backend.h
+++ b/source/citraimport/common/logging/backend.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <utility>
 
-#include "citraimport\common/logging/log.h"
+#include "citraimport/common/logging/log.h"
 
 namespace Log {
 

diff --git a/source/citraimport/common/logging/filter.cpp b/source/citraimport/common/logging/filter.cpp
index 9e7f06dae7b8e6eb9fd45b08b5272488a0b5e2b6..681d4fe0c9b14d95d4be01b83bfadd82bf594b21 100644 (file)
--- a/source/citraimport/common/logging/filter.cpp
+++ b/source/citraimport/common/logging/filter.cpp
@@ -4,9 +4,9 @@
 
 #include <algorithm>
 
-#include "citraimport\common/logging/filter.h"
-#include "citraimport\common/logging/backend.h"
-#include "citraimport\common/string_util.h"
+#include "citraimport/common/logging/filter.h"
+#include "citraimport/common/logging/backend.h"
+#include "citraimport/common/string_util.h"
 
 namespace Log {
 

diff --git a/source/citraimport/common/logging/filter.h b/source/citraimport/common/logging/filter.h
index 9fd8c899b136634a9113c68b99897f7659f7c2ff..faf516f21f6bb3aee2e3ac667e2689123c51b9eb 100644 (file)
--- a/source/citraimport/common/logging/filter.h
+++ b/source/citraimport/common/logging/filter.h
@@ -8,7 +8,7 @@
 #include <cstddef>
 #include <string>
 
-#include "citraimport\common/logging/log.h"
+#include "citraimport/common/logging/log.h"
 
 namespace Log {
 

diff --git a/source/citraimport/common/logging/log.h b/source/citraimport/common/logging/log.h
index b1579dbb62371dc5f9c61ff5bfb890ab10c1f330..2ef98464246e073fe66a0d4c524b2addd0d733b8 100644 (file)
--- a/source/citraimport/common/logging/log.h
+++ b/source/citraimport/common/logging/log.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
 namespace Log {
 

diff --git a/source/citraimport/common/logging/text_formatter.cpp b/source/citraimport/common/logging/text_formatter.cpp
index cf9b58fec930c659a8c837c5e66600f7c198de05..08c8df831445cf69b88f23e8259d4dd0e286e28e 100644 (file)
--- a/source/citraimport/common/logging/text_formatter.cpp
+++ b/source/citraimport/common/logging/text_formatter.cpp
@@ -10,13 +10,13 @@
 #   include <Windows.h>
 #endif
 
-#include "citraimport\common/logging/backend.h"
-#include "citraimport\common/logging/log.h"
-#include "citraimport\common/logging/text_formatter.h"
+#include "citraimport/common/logging/backend.h"
+#include "citraimport/common/logging/log.h"
+#include "citraimport/common/logging/text_formatter.h"
 
-#include "citraimport\common/assert.h"
-#include "citraimport\common/common_funcs.h"
-#include "citraimport\common/string_util.h"
+#include "citraimport/common/assert.h"
+#include "citraimport/common/common_funcs.h"
+#include "citraimport/common/string_util.h"
 
 namespace Log {
 

diff --git a/source/citraimport/common/memory_util.cpp b/source/citraimport/common/memory_util.cpp
index e95ef8a748ce0b4ff6cfb3e389373fea4183e6c1..c750a63b0bcbca0ab9d7fbf173bf17624280d697 100644 (file)
--- a/source/citraimport/common/memory_util.cpp
+++ b/source/citraimport/common/memory_util.cpp
@@ -3,14 +3,14 @@
 // Refer to the license.txt file included.
 
 
-#include "citraimport\common/logging/log.h"
-#include "citraimport\common/memory_util.h"
+#include "citraimport/common/logging/log.h"
+#include "citraimport/common/memory_util.h"
 
 #ifdef _WIN32
     #include <windows.h>
     #include <psapi.h>
-    #include "citraimport\common/common_funcs.h"
-    #include "citraimport\common/string_util.h"
+    #include "citraimport/common/common_funcs.h"
+    #include "citraimport/common/string_util.h"
 #else
     #include <cstdlib>
     #include <sys/mman.h>

diff --git a/source/citraimport/common/microprofile.cpp b/source/citraimport/common/microprofile.cpp
index 0ffe7048346cbca1d79fb24b7d043958b518cc37..689f0972f9807831faaec8e6e550ca5c27bbbf27 100644 (file)
--- a/source/citraimport/common/microprofile.cpp
+++ b/source/citraimport/common/microprofile.cpp
@@ -4,4 +4,4 @@
 
 // Includes the MicroProfile implementation in this file for compilation
 #define MICROPROFILE_IMPL 1
-#include "citraimport\common/microprofile.h"
+#include "citraimport/common/microprofile.h"

diff --git a/source/citraimport/common/profiler.cpp b/source/citraimport/common/profiler.cpp
index c2a6f7752b6809fe50b486361d8e7c1fd5d8fe12..345ce1771a1c1280a2d311ac1dea2d69ca65cffc 100644 (file)
--- a/source/citraimport/common/profiler.cpp
+++ b/source/citraimport/common/profiler.cpp
@@ -8,10 +8,10 @@
 #include <cstddef>
 #include <vector>
 
-#include "citraimport\common/assert.h"
-#include "citraimport\common/profiler.h"
-#include "citraimport\common/profiler_reporting.h"
-#include "citraimport\common/synchronized_wrapper.h"
+#include "citraimport/common/assert.h"
+#include "citraimport/common/profiler.h"
+#include "citraimport/common/profiler_reporting.h"
+#include "citraimport/common/synchronized_wrapper.h"
 
 #if defined(_MSC_VER) && _MSC_VER <= 1800 // MSVC 2013.
     #define WIN32_LEAN_AND_MEAN

diff --git a/source/citraimport/common/profiler.h b/source/citraimport/common/profiler.h
index 6b37ffea812b0547dfb9696c75798f4fb427a784..7fab4d8e0e74bf32cd9c214dfc0a828eb0b626e2 100644 (file)
--- a/source/citraimport/common/profiler.h
+++ b/source/citraimport/common/profiler.h
@@ -7,8 +7,8 @@
 #include <atomic>
 #include <chrono>
 
-#include "citraimport\common/assert.h"
-#include "citraimport\common/thread.h"
+#include "citraimport/common/assert.h"
+#include "citraimport/common/thread.h"
 
 namespace Common {
 namespace Profiling {

diff --git a/source/citraimport/common/profiler_reporting.h b/source/citraimport/common/profiler_reporting.h
index 826728fa06f54eff70bba402f39ba289ccf51ea5..2bc166b6a67038f5561195d0155babe3ead95757 100644 (file)
--- a/source/citraimport/common/profiler_reporting.h
+++ b/source/citraimport/common/profiler_reporting.h
@@ -7,8 +7,8 @@
 #include <cstddef>
 #include <vector>
 
-#include "citraimport\common/profiler.h"
-#include "citraimport\common/synchronized_wrapper.h"
+#include "citraimport/common/profiler.h"
+#include "citraimport/common/synchronized_wrapper.h"
 
 namespace Common {
 namespace Profiling {

diff --git a/source/citraimport/common/string_util.cpp b/source/citraimport/common/string_util.cpp
index 0741834536e5225c5ec3fbe2602ad731d2451532..d2756e09ae649a7701cac04ba92eca2160884694 100644 (file)
--- a/source/citraimport/common/string_util.cpp
+++ b/source/citraimport/common/string_util.cpp
@@ -9,14 +9,14 @@
 #include <cstring>
 //#include <boost/range/algorithm/transform.hpp>
 
-#include "citraimport\common/common_paths.h"
-#include "citraimport\common/logging/log.h"
-#include "citraimport\common/string_util.h"
+#include "citraimport/common/common_paths.h"
+#include "citraimport/common/logging/log.h"
+#include "citraimport/common/string_util.h"
 
 #ifdef _MSC_VER
     #include <Windows.h>
     #include <codecvt>
-    #include "citraimport\common/common_funcs.h"
+    #include "citraimport/common/common_funcs.h"
 #else
     #include <iconv.h>
 #endif

diff --git a/source/citraimport/common/string_util.h b/source/citraimport/common/string_util.h
index 726eddeb3a26de0d5d6705195bf110b67fc5ee74..71a13bdb09c049353ddb7766d5629a46b6719419 100644 (file)
--- a/source/citraimport/common/string_util.h
+++ b/source/citraimport/common/string_util.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
 namespace Common {
 

diff --git a/source/citraimport/common/swap.h b/source/citraimport/common/swap.h
index 16c2e1f4a4016c71c868da78f9512a85305ba05a..42ef96117605900cd7c7c3ff8d1fa3fe1291eb91 100644 (file)
--- a/source/citraimport/common/swap.h
+++ b/source/citraimport/common/swap.h
@@ -25,7 +25,7 @@
     #include <sys/endian.h>
 #endif
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
 // GCC 4.6+
 #if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)

diff --git a/source/citraimport/common/symbols.cpp b/source/citraimport/common/symbols.cpp
index febc0f8e6253e7b8f81cfa82f17109672fe40376..9222a1f2ed14cd3287117baab40054c43ff0cfbb 100644 (file)
--- a/source/citraimport/common/symbols.cpp
+++ b/source/citraimport/common/symbols.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "citraimport\common/symbols.h"
+#include "citraimport/common/symbols.h"
 
 TSymbolsMap g_symbols;
 

diff --git a/source/citraimport/common/symbols.h b/source/citraimport/common/symbols.h
index eccecf5a1a9cf86c5dcc099fb6334f7ff8a8feb5..f349f1c462e2c5c794d3294348cccada5571000c 100644 (file)
--- a/source/citraimport/common/symbols.h
+++ b/source/citraimport/common/symbols.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <utility>
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 
 struct TSymbol
 {

diff --git a/source/citraimport/common/timer.h b/source/citraimport/common/timer.h
index 424e9b81a45f2bdaa98cc5a1a28fa55a4bbd4d45..9c8b93b2ed3d9974ada59accd900833272c8e347 100644 (file)
--- a/source/citraimport/common/timer.h
+++ b/source/citraimport/common/timer.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "citraimport\common/common_types.h"
+#include "citraimport/common/common_types.h"
 #include <string>
 
 namespace Common

diff --git a/source/citraimport/common/x64/abi.h b/source/citraimport/common/x64/abi.h
index 5c37524d33b593b8400f4db443f55547a01a28ed..9bc325bc12bc2d1bcd3fa6d155240a80d1cc1073 100644 (file)
--- a/source/citraimport/common/x64/abi.h
+++ b/source/citraimport/common/x64/abi.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "citraimport\common/bit_set.h"
+#include "citraimport/common/bit_set.h"
 #include "emitter.h"
 
 // x64 ABI:s, and helpers to help follow them when JIT-ing code.

diff --git a/source/citraimport/common/x64/emitter.h b/source/citraimport/common/x64/emitter.h
index 80ed472476ec42c94d147523d845dfc2b2acdb64..7cab6eb0088fa9e33d38f418b1a16512b0f69c2f 100644 (file)
--- a/source/citraimport/common/x64/emitter.h
+++ b/source/citraimport/common/x64/emitter.h
@@ -17,10 +17,10 @@
 
 #pragma once
 
-#include "citraimport\common/assert.h"
-#include "citraimport\common/bit_set.h"
-#include "citraimport\common/common_types.h"
-#include "citraimport\common/code_block.h"
+#include "citraimport/common/assert.h"
+#include "citraimport/common/bit_set.h"
+#include "citraimport/common/common_types.h"
+#include "citraimport/common/code_block.h"
 
 #if defined(ARCHITECTURE_x86_64) && !defined(_ARCH_64)
 #define _ARCH_64

diff --git a/source/citraimport/emu_window.cpp b/source/citraimport/emu_window.cpp
index 9ae8f43d47187985427965e016da81a1c484dffb..f0fa67c4199f3e91477b67718eefb54a773cf1fa 100644 (file)
--- a/source/citraimport/emu_window.cpp
+++ b/source/citraimport/emu_window.cpp
@@ -6,7 +6,7 @@
 #include <cmath>
 
 
-#include "citraimport\GPU\window\emu_window.h"
+#include "citraimport/GPU/window/emu_window.h"
 
 /* //hid todo
 void EmuWindow::KeyPressed(KeyMap::HostDeviceKey key) {

diff --git a/source/citraimport/glad/include/glad/glad.h b/source/citraimport/glad/include/glad/glad.h
index 74d974346ce37f97d6816ed4317b8b6a3d4faf3f..ee8fda9101a59430ca3cd19dc0ae9ba8a7702bd1 100644 (file)
--- a/source/citraimport/glad/include/glad/glad.h
+++ b/source/citraimport/glad/include/glad/glad.h
@@ -77,7 +77,7 @@ GLAPI int gladLoadGLLoader(GLADloadproc);
 GLAPI int gladLoadGLES2Loader(GLADloadproc);
 
 #include <stddef.h>
-#include <citraimport\glad\include\KHR/khrplatform.h>
+#include <citraimport/glad/include/KHR/khrplatform.h>
 #ifndef GLEXT_64_TYPES_DEFINED
 /* This code block is duplicated in glxext.h, so must be protected */
 #define GLEXT_64_TYPES_DEFINED

diff --git a/source/citraimport/glad/src/glad.c b/source/citraimport/glad/src/glad.c
index f46bdc4c5391cb5cb8e1a49f3fdb656be7230640..9540c4fc6db6da11c361f34bdf5ef1d798df809d 100644 (file)
--- a/source/citraimport/glad/src/glad.c
+++ b/source/citraimport/glad/src/glad.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <citraimport\glad\include\glad/glad.h>
+#include <citraimport/glad/include/glad/glad.h>
 
 static void* get_proc(const char *namez);