diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/citra/citra.cpp | 2 | ||||
| -rw-r--r-- | src/citra/citra.h | 6 | ||||
| -rw-r--r-- | src/citra/citra.vcxproj | 3 | ||||
| -rw-r--r-- | src/citra/citra.vcxproj.filters | 3 | ||||
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 1 |
6 files changed, 3 insertions, 15 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 1ad607d76..b1ab67598 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | set(SRCS citra.cpp | 1 | set(SRCS citra.cpp |
| 2 | emu_window/emu_window_glfw.cpp) | 2 | emu_window/emu_window_glfw.cpp) |
| 3 | set(HEADERS citra.h | 3 | set(HEADERS resource.h) |
| 4 | resource.h) | ||
| 5 | 4 | ||
| 6 | # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) | 5 | # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) |
| 7 | if (NOT X11_xf86vmode_LIB) | 6 | if (NOT X11_xf86vmode_LIB) |
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 036af3735..9399ff296 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | #include "citra/emu_window/emu_window_glfw.h" | 13 | #include "citra/emu_window/emu_window_glfw.h" |
| 14 | 14 | ||
| 15 | #include "citra/citra.h" | ||
| 16 | |||
| 17 | /// Application entry point | 15 | /// Application entry point |
| 18 | int __cdecl main(int argc, char **argv) { | 16 | int __cdecl main(int argc, char **argv) { |
| 19 | LogManager::Init(); | 17 | LogManager::Init(); |
diff --git a/src/citra/citra.h b/src/citra/citra.h deleted file mode 100644 index b3b78a2dc..000000000 --- a/src/citra/citra.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | ||
| 2 | // Licensed under GPLv2 | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj index d81ac5bfc..bda1ed07d 100644 --- a/src/citra/citra.vcxproj +++ b/src/citra/citra.vcxproj | |||
| @@ -203,7 +203,6 @@ | |||
| 203 | <ClCompile Include="emu_window\emu_window_glfw.cpp" /> | 203 | <ClCompile Include="emu_window\emu_window_glfw.cpp" /> |
| 204 | </ItemGroup> | 204 | </ItemGroup> |
| 205 | <ItemGroup> | 205 | <ItemGroup> |
| 206 | <ClInclude Include="citra.h" /> | ||
| 207 | <ClInclude Include="emu_window\emu_window_glfw.h" /> | 206 | <ClInclude Include="emu_window\emu_window_glfw.h" /> |
| 208 | <ClInclude Include="resource.h" /> | 207 | <ClInclude Include="resource.h" /> |
| 209 | </ItemGroup> | 208 | </ItemGroup> |
| @@ -213,4 +212,4 @@ | |||
| 213 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 212 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 214 | <ImportGroup Label="ExtensionTargets"> | 213 | <ImportGroup Label="ExtensionTargets"> |
| 215 | </ImportGroup> | 214 | </ImportGroup> |
| 216 | </Project> \ No newline at end of file | 215 | </Project> |
diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters index b2685691f..78954670e 100644 --- a/src/citra/citra.vcxproj.filters +++ b/src/citra/citra.vcxproj.filters | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | </ClCompile> | 12 | </ClCompile> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <ClInclude Include="citra.h" /> | ||
| 16 | <ClInclude Include="resource.h" /> | 15 | <ClInclude Include="resource.h" /> |
| 17 | <ClInclude Include="emu_window\emu_window_glfw.h"> | 16 | <ClInclude Include="emu_window\emu_window_glfw.h"> |
| 18 | <Filter>emu_window</Filter> | 17 | <Filter>emu_window</Filter> |
| @@ -21,4 +20,4 @@ | |||
| 21 | <ItemGroup> | 20 | <ItemGroup> |
| 22 | <Text Include="CMakeLists.txt" /> | 21 | <Text Include="CMakeLists.txt" /> |
| 23 | </ItemGroup> | 22 | </ItemGroup> |
| 24 | </Project> \ No newline at end of file | 23 | </Project> |
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index f882a825e..02f524e03 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | #include "video_core/video_core.h" | 7 | #include "video_core/video_core.h" |
| 8 | 8 | ||
| 9 | #include "citra/citra.h" | ||
| 10 | #include "citra/emu_window/emu_window_glfw.h" | 9 | #include "citra/emu_window/emu_window_glfw.h" |
| 11 | 10 | ||
| 12 | static void OnKeyEvent(GLFWwindow* win, int key, int action) { | 11 | static void OnKeyEvent(GLFWwindow* win, int key, int action) { |