summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-08-22 00:27:54 +0200
committerbunnei <bunneidev@gmail.com>2014-08-22 00:27:54 +0200
commitc3c66ad34d36b0ae3105d1e043a37193b5997e31 (patch)
tree6aef1abdc63dad402bc7f8ab610594cac81303b9
parentMerge pull request #58 from lioncash/clamp (diff)
parentRemoved unused citra.h (diff)
downloadyuzu-c3c66ad34d36b0ae3105d1e043a37193b5997e31.tar
yuzu-c3c66ad34d36b0ae3105d1e043a37193b5997e31.tar.gz
yuzu-c3c66ad34d36b0ae3105d1e043a37193b5997e31.tar.bz2
yuzu-c3c66ad34d36b0ae3105d1e043a37193b5997e31.tar.lz
yuzu-c3c66ad34d36b0ae3105d1e043a37193b5997e31.tar.xz
yuzu-c3c66ad34d36b0ae3105d1e043a37193b5997e31.tar.zst
yuzu-c3c66ad34d36b0ae3105d1e043a37193b5997e31.zip
Diffstat (limited to '')
-rw-r--r--src/citra/CMakeLists.txt3
-rw-r--r--src/citra/citra.cpp2
-rw-r--r--src/citra/citra.h6
-rw-r--r--src/citra/citra.vcxproj3
-rw-r--r--src/citra/citra.vcxproj.filters3
5 files changed, 3 insertions, 14 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 @@
set(SRCS citra.cpp
emu_window/emu_window_glfw.cpp)
-set(HEADERS citra.h
- resource.h)
+set(HEADERS resource.h)
# NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
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 @@
#include "citra/emu_window/emu_window_glfw.h"
-#include "citra/citra.h"
-
/// Application entry point
int __cdecl main(int argc, char **argv) {
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 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once
-
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 @@
<ClCompile Include="emu_window\emu_window_glfw.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="citra.h" />
<ClInclude Include="emu_window\emu_window_glfw.h" />
<ClInclude Include="resource.h" />
</ItemGroup>
@@ -213,4 +212,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project> \ No newline at end of file
+</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 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="citra.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="emu_window\emu_window_glfw.h">
<Filter>emu_window</Filter>
@@ -21,4 +20,4 @@
<ItemGroup>
<Text Include="CMakeLists.txt" />
</ItemGroup>
-</Project> \ No newline at end of file
+</Project>