From ce57982caeac1fa3248f4abe56eb75c103e7363a Mon Sep 17 00:00:00 2001 From: Thomas Edvalson Date: Sun, 6 Dec 2015 19:37:01 -0500 Subject: [PATCH] Fix path slashes and made filenames case-sensitive --- source/Main.cpp | 2 +- source/citraimport/GPU/HW/gpu.h | 8 ++--- source/citraimport/GPU/HW/hw.h | 2 +- source/citraimport/GPU/HW/lcd.h | 6 ++-- source/citraimport/GPU/citragpu.cpp | 29 +++++++++-------- .../GPU/video_core/command_processor.cpp | 20 ++++++------ .../GPU/video_core/command_processor.h | 4 +-- .../GPU/video_core/debug_utils/debug_utils.h | 4 +-- .../GPU/video_core/hwrasterizer_base.h | 2 +- source/citraimport/GPU/video_core/pica.cpp | 4 +-- source/citraimport/GPU/video_core/pica.h | 12 +++---- .../GPU/video_core/primitive_assembly.cpp | 8 ++--- .../GPU/video_core/primitive_assembly.h | 2 +- .../citraimport/GPU/video_core/rasterizer.cpp | 24 +++++++------- .../GPU/video_core/renderer_base.h | 4 +-- .../renderer_opengl/gl_rasterizer.cpp | 24 +++++++------- .../renderer_opengl/gl_rasterizer.h | 10 +++--- .../renderer_opengl/gl_rasterizer_cache.cpp | 18 +++++------ .../renderer_opengl/gl_rasterizer_cache.h | 8 ++--- .../renderer_opengl/gl_resource_manager.h | 8 ++--- .../renderer_opengl/gl_shader_util.cpp | 4 +-- .../renderer_opengl/gl_shader_util.h | 2 +- .../video_core/renderer_opengl/gl_state.cpp | 4 +-- .../GPU/video_core/renderer_opengl/gl_state.h | 2 +- .../video_core/renderer_opengl/pica_to_gl.h | 6 ++-- .../renderer_opengl/renderer_opengl.cpp | 32 +++++++++---------- .../renderer_opengl/renderer_opengl.h | 6 ++-- .../GPU/video_core/shader/shader.cpp | 15 +++++---- .../GPU/video_core/shader/shader.h | 10 +++--- .../video_core/shader/shader_interpreter.cpp | 10 +++--- .../video_core/shader/shader_interpreter.h | 2 +- .../GPU/video_core/shader/shader_jit_x64.cpp | 6 ++-- .../GPU/video_core/shader/shader_jit_x64.h | 8 ++--- source/citraimport/GPU/video_core/utils.cpp | 2 +- source/citraimport/GPU/video_core/utils.h | 2 +- .../citraimport/GPU/video_core/video_core.cpp | 8 ++--- source/citraimport/GPU/window/emu_window.h | 4 +-- source/citraimport/common/assert.h | 4 +-- source/citraimport/common/bit_field.h | 2 +- source/citraimport/common/bit_set.h | 2 +- source/citraimport/common/break_points.cpp | 4 +-- source/citraimport/common/break_points.h | 2 +- source/citraimport/common/citra_timer.cpp | 6 ++-- source/citraimport/common/color.h | 6 ++-- source/citraimport/common/emu_window.h | 4 +-- source/citraimport/common/file_util.cpp | 12 +++---- source/citraimport/common/file_util.h | 2 +- source/citraimport/common/hash.h | 2 +- source/citraimport/common/logging/backend.cpp | 12 +++---- source/citraimport/common/logging/backend.h | 2 +- source/citraimport/common/logging/filter.cpp | 6 ++-- source/citraimport/common/logging/filter.h | 2 +- source/citraimport/common/logging/log.h | 2 +- .../common/logging/text_formatter.cpp | 12 +++---- source/citraimport/common/memory_util.cpp | 8 ++--- source/citraimport/common/microprofile.cpp | 2 +- source/citraimport/common/profiler.cpp | 8 ++--- source/citraimport/common/profiler.h | 4 +-- .../citraimport/common/profiler_reporting.h | 4 +-- source/citraimport/common/string_util.cpp | 8 ++--- source/citraimport/common/string_util.h | 2 +- source/citraimport/common/swap.h | 2 +- source/citraimport/common/symbols.cpp | 2 +- source/citraimport/common/symbols.h | 2 +- source/citraimport/common/timer.h | 2 +- source/citraimport/common/x64/abi.h | 2 +- source/citraimport/common/x64/emitter.h | 8 ++--- source/citraimport/emu_window.cpp | 2 +- source/citraimport/glad/include/glad/glad.h | 2 +- source/citraimport/glad/src/glad.c | 2 +- 70 files changed, 233 insertions(+), 231 deletions(-) diff --git a/source/Main.cpp b/source/Main.cpp index 9e2d42b..c12dee5 100644 --- 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 acbd656..416169a 100644 --- a/source/citraimport/GPU/HW/gpu.h +++ b/source/citraimport/GPU/HW/gpu.h @@ -7,10 +7,10 @@ #include #include -#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 48c37c8..161ebd4 100644 --- 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 95efbf7..ed87cd6 100644 --- a/source/citraimport/GPU/HW/lcd.h +++ b/source/citraimport/GPU/HW/lcd.h @@ -7,9 +7,9 @@ #include #include -#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 90fa507..9bebe47 100644 --- a/source/citraimport/GPU/citragpu.cpp +++ b/source/citraimport/GPU/citragpu.cpp @@ -6,27 +6,28 @@ extern bool novideo; #include #include +#include #include -#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 a328cce..565547c 100644 --- a/source/citraimport/GPU/video_core/command_processor.cpp +++ b/source/citraimport/GPU/video_core/command_processor.cpp @@ -10,16 +10,16 @@ #include -#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 9439423..84c88a0 100644 --- a/source/citraimport/GPU/video_core/command_processor.h +++ b/source/citraimport/GPU/video_core/command_processor.h @@ -6,8 +6,8 @@ #include -#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 1dff5b1..c0832d7 100644 --- 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 #include -#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 c11f3d2..1d33510 100644 --- 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 0288194..a19d2e5 100644 --- a/source/citraimport/GPU/video_core/pica.cpp +++ b/source/citraimport/GPU/video_core/pica.cpp @@ -5,8 +5,8 @@ #include #include -#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 6864e3f..0ede180 100644 --- a/source/citraimport/GPU/video_core/pica.h +++ b/source/citraimport/GPU/video_core/pica.h @@ -9,12 +9,12 @@ #include #include -#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 6909f59..ce7701b 100644 --- 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 84aae52..969e2c6 100644 --- a/source/citraimport/GPU/video_core/primitive_assembly.h +++ b/source/citraimport/GPU/video_core/primitive_assembly.h @@ -6,7 +6,7 @@ #include -#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 6960cd9..c3eaefa 100644 --- a/source/citraimport/GPU/video_core/rasterizer.cpp +++ b/source/citraimport/GPU/video_core/rasterizer.cpp @@ -7,19 +7,19 @@ #include #include -#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(texture.config.width))).ToFloat32(); int t = (int)(uv[i].v() * float24::FromFloat32(static_cast(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 a18e056..9d8fc48 100644 --- a/source/citraimport/GPU/video_core/renderer_base.h +++ b/source/citraimport/GPU/video_core/renderer_base.h @@ -6,9 +6,9 @@ #include -#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 26e4954..d49f437 100644 --- 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 -#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 bce5101..7669ea2 100644 --- 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 -#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 0129efa..699b207 100644 --- 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 be7ac44..7c8b912 100644 --- 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 #include -#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 d12de84..77fc998 100644 --- 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 -#include +#include -#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 56b5fb3..add75e4 100644 --- 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 #include -#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 678fc16..53ef942 100644 --- 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 +#include 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 2b669da..0d83ac1 100644 --- 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 da80501..a09ee4c 100644 --- 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 +#include 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 44786cc..c9e0368 100644 --- 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 +#include -#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 af12efa..0da8525 100644 --- 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 -#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 a3bfcdf..fa58cf4 100644 --- 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 -#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 f110f5f..c8fc8d4 100644 --- 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 +#include #include //#include -#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 3cb7eba..85de6a1 100644 --- a/source/citraimport/GPU/video_core/shader/shader.h +++ b/source/citraimport/GPU/video_core/shader/shader.h @@ -8,13 +8,13 @@ //#include -#include +#include -#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 984addd..83ff02c 100644 --- 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 +#include -#include +#include -#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 a36e220..df75a4c 100644 --- 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 332f225..9b2926e 100644 --- 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 -#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 d9e1e47..cb94aea 100644 --- 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 +#include -#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 407c62d..ca3f936 100644 --- a/source/citraimport/GPU/video_core/utils.cpp +++ b/source/citraimport/GPU/video_core/utils.cpp @@ -5,7 +5,7 @@ #include #include -#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 bb03cc5..13e6a11 100644 --- a/source/citraimport/GPU/video_core/utils.h +++ b/source/citraimport/GPU/video_core/utils.h @@ -6,7 +6,7 @@ #include -#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 0c71c6b..bae49df 100644 --- 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 38c2fc8..2907890 100644 --- a/source/citraimport/GPU/window/emu_window.h +++ b/source/citraimport/GPU/window/emu_window.h @@ -7,8 +7,8 @@ #include #include -#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 4ff43c0..ede9961 100644 --- a/source/citraimport/common/assert.h +++ b/source/citraimport/common/assert.h @@ -6,8 +6,8 @@ #include -#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 ab05ce3..6f88f1f 100644 --- a/source/citraimport/common/bit_field.h +++ b/source/citraimport/common/bit_field.h @@ -36,7 +36,7 @@ #include #include -#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 30d3fba..a2c2471 100644 --- a/source/citraimport/common/bit_set.h +++ b/source/citraimport/common/bit_set.h @@ -8,7 +8,7 @@ #endif #include #include -#include "citraimport\common/common_types.h" +#include "citraimport/common/common_types.h" // namespace avoids conflict with OS X Carbon; don't use BitSet directly namespace Common { diff --git a/source/citraimport/common/break_points.cpp b/source/citraimport/common/break_points.cpp index 6372c22..b1eb553 100644 --- 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 #include diff --git a/source/citraimport/common/break_points.h b/source/citraimport/common/break_points.h index 6febdd8..d719f0f 100644 --- a/source/citraimport/common/break_points.h +++ b/source/citraimport/common/break_points.h @@ -7,7 +7,7 @@ #include #include -#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 a5389f6..360cbff 100644 --- a/source/citraimport/common/citra_timer.cpp +++ b/source/citraimport/common/citra_timer.cpp @@ -12,9 +12,9 @@ #include #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 f3cbc1c..eeb3b20 100644 --- 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 8ce34ef..1a3cf4f 100644 --- a/source/citraimport/common/emu_window.h +++ b/source/citraimport/common/emu_window.h @@ -7,8 +7,8 @@ #include #include -#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 43d9c2a..490728a 100644 --- 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 @@ -17,7 +17,7 @@ #include // getcwd #include - #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 3a32629..d8de6d9 100644 --- a/source/citraimport/common/file_util.h +++ b/source/citraimport/common/file_util.h @@ -12,7 +12,7 @@ #include #include -#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 27498b9..9ba319f 100644 --- 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 0fa1db2..2405fd5 100644 --- a/source/citraimport/common/logging/backend.cpp +++ b/source/citraimport/common/logging/backend.cpp @@ -6,12 +6,12 @@ #include #include -#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 8b46c32..6b5777c 100644 --- a/source/citraimport/common/logging/backend.h +++ b/source/citraimport/common/logging/backend.h @@ -9,7 +9,7 @@ #include #include -#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 9e7f06d..681d4fe 100644 --- a/source/citraimport/common/logging/filter.cpp +++ b/source/citraimport/common/logging/filter.cpp @@ -4,9 +4,9 @@ #include -#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 9fd8c89..faf516f 100644 --- a/source/citraimport/common/logging/filter.h +++ b/source/citraimport/common/logging/filter.h @@ -8,7 +8,7 @@ #include #include -#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 b1579db..2ef9846 100644 --- 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 cf9b58f..08c8df8 100644 --- a/source/citraimport/common/logging/text_formatter.cpp +++ b/source/citraimport/common/logging/text_formatter.cpp @@ -10,13 +10,13 @@ # include #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 e95ef8a..c750a63 100644 --- 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 #include - #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 #include diff --git a/source/citraimport/common/microprofile.cpp b/source/citraimport/common/microprofile.cpp index 0ffe704..689f097 100644 --- 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 c2a6f77..345ce17 100644 --- a/source/citraimport/common/profiler.cpp +++ b/source/citraimport/common/profiler.cpp @@ -8,10 +8,10 @@ #include #include -#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 6b37ffe..7fab4d8 100644 --- a/source/citraimport/common/profiler.h +++ b/source/citraimport/common/profiler.h @@ -7,8 +7,8 @@ #include #include -#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 826728f..2bc166b 100644 --- a/source/citraimport/common/profiler_reporting.h +++ b/source/citraimport/common/profiler_reporting.h @@ -7,8 +7,8 @@ #include #include -#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 0741834..d2756e0 100644 --- a/source/citraimport/common/string_util.cpp +++ b/source/citraimport/common/string_util.cpp @@ -9,14 +9,14 @@ #include //#include -#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 #include - #include "citraimport\common/common_funcs.h" + #include "citraimport/common/common_funcs.h" #else #include #endif diff --git a/source/citraimport/common/string_util.h b/source/citraimport/common/string_util.h index 726edde..71a13bd 100644 --- a/source/citraimport/common/string_util.h +++ b/source/citraimport/common/string_util.h @@ -11,7 +11,7 @@ #include #include -#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 16c2e1f..42ef961 100644 --- a/source/citraimport/common/swap.h +++ b/source/citraimport/common/swap.h @@ -25,7 +25,7 @@ #include #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 febc0f8..9222a1f 100644 --- 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 eccecf5..f349f1c 100644 --- a/source/citraimport/common/symbols.h +++ b/source/citraimport/common/symbols.h @@ -8,7 +8,7 @@ #include #include -#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 424e9b8..9c8b93b 100644 --- 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 namespace Common diff --git a/source/citraimport/common/x64/abi.h b/source/citraimport/common/x64/abi.h index 5c37524..9bc325b 100644 --- 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 80ed472..7cab6eb 100644 --- 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 9ae8f43..f0fa67c 100644 --- a/source/citraimport/emu_window.cpp +++ b/source/citraimport/emu_window.cpp @@ -6,7 +6,7 @@ #include -#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 74d9743..ee8fda9 100644 --- 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 -#include +#include #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 f46bdc4..9540c4f 100644 --- a/source/citraimport/glad/src/glad.c +++ b/source/citraimport/glad/src/glad.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include static void* get_proc(const char *namez); -- 2.39.5