From 70c2cce963264678b5ba5b6aa17c2653bf459e61 Mon Sep 17 00:00:00 2001 From: bunnei <ericbunnie@gmail.com> Date: Thu, 17 Apr 2014 23:48:23 -0400 Subject: [PATCH] renamed hw_lcd module to just lcd --- src/core/core.vcxproj | 4 ++-- src/core/core.vcxproj.filters | 12 ++++++------ src/core/hle/syscall.cpp | 2 -- src/core/hw/hw.cpp | 2 +- src/core/hw/{hw_lcd.cpp => lcd.cpp} | 2 +- src/core/hw/{hw_lcd.h => lcd.h} | 0 src/video_core/renderer_opengl/renderer_opengl.cpp | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) rename src/core/hw/{hw_lcd.cpp => lcd.cpp} (97%) rename src/core/hw/{hw_lcd.h => lcd.h} (100%) diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 80bd75eebb..b6fc604c68 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -160,7 +160,7 @@ <ClCompile Include="hle\service\srv.cpp" /> <ClCompile Include="hle\syscall.cpp" /> <ClCompile Include="hw\hw.cpp" /> - <ClCompile Include="hw\hw_lcd.cpp" /> + <ClCompile Include="hw\lcd.cpp" /> <ClCompile Include="hw\ndma.cpp" /> <ClCompile Include="loader.cpp" /> <ClCompile Include="mem_map.cpp" /> @@ -199,7 +199,7 @@ <ClInclude Include="hle\service\srv.h" /> <ClInclude Include="hle\syscall.h" /> <ClInclude Include="hw\hw.h" /> - <ClInclude Include="hw\hw_lcd.h" /> + <ClInclude Include="hw\lcd.h" /> <ClInclude Include="hw\ndma.h" /> <ClInclude Include="loader.h" /> <ClInclude Include="mem_map.h" /> diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 61cb6e4050..ff7877feb6 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -69,9 +69,6 @@ <ClCompile Include="hw\hw.cpp"> <Filter>hw</Filter> </ClCompile> - <ClCompile Include="hw\hw_lcd.cpp"> - <Filter>hw</Filter> - </ClCompile> <ClCompile Include="elf\elf_reader.cpp"> <Filter>elf</Filter> </ClCompile> @@ -105,6 +102,9 @@ <ClCompile Include="hw\ndma.cpp"> <Filter>hw</Filter> </ClCompile> + <ClCompile Include="hw\lcd.cpp"> + <Filter>hw</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="arm\disassembler\arm_disasm.h"> @@ -161,9 +161,6 @@ <ClInclude Include="hw\hw.h"> <Filter>hw</Filter> </ClInclude> - <ClInclude Include="hw\hw_lcd.h"> - <Filter>hw</Filter> - </ClInclude> <ClInclude Include="elf\elf_reader.h"> <Filter>elf</Filter> </ClInclude> @@ -205,6 +202,9 @@ <ClInclude Include="hw\ndma.h"> <Filter>hw</Filter> </ClInclude> + <ClInclude Include="hw\lcd.h"> + <Filter>hw</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <Text Include="CMakeLists.txt" /> diff --git a/src/core/hle/syscall.cpp b/src/core/hle/syscall.cpp index 0cb563955a..e5533a7412 100644 --- a/src/core/hle/syscall.cpp +++ b/src/core/hle/syscall.cpp @@ -6,8 +6,6 @@ #include "core/mem_map.h" -#include "core/hw/hw_lcd.h" - #include "core/hle/function_wrappers.h" #include "core/hle/syscall.h" #include "core/hle/service/service.h" diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp index 1f240f09c4..16bd701254 100644 --- a/src/core/hw/hw.cpp +++ b/src/core/hw/hw.cpp @@ -6,7 +6,7 @@ #include "common/log.h" #include "core/hw/hw.h" -#include "core/hw/hw_lcd.h" +#include "core/hw/lcd.h" #include "core/hw/ndma.h" namespace HW { diff --git a/src/core/hw/hw_lcd.cpp b/src/core/hw/lcd.cpp similarity index 97% rename from src/core/hw/hw_lcd.cpp rename to src/core/hw/lcd.cpp index 9fb485bacc..3013673f84 100644 --- a/src/core/hw/hw_lcd.cpp +++ b/src/core/hw/lcd.cpp @@ -6,7 +6,7 @@ #include "common/log.h" #include "core/core.h" -#include "core/hw/hw_lcd.h" +#include "core/hw/lcd.h" #include "video_core/video_core.h" diff --git a/src/core/hw/hw_lcd.h b/src/core/hw/lcd.h similarity index 100% rename from src/core/hw/hw_lcd.h rename to src/core/hw/lcd.h diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 168de9253c..35804aee1d 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "core/hw/hw_lcd.h" +#include "core/hw/lcd.h" #include "video_core/video_core.h" #include "video_core/renderer_opengl/renderer_opengl.h"