Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-30 21:30:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #46 from archshift/citrah

Browse source 
Removed unused citra.h
This commit is contained in:
bunnei 2014-08-21 18:27:54 -04:00
commit c3c66ad34d
5 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/citra/CMakeLists.txt
View file

@ -1,7 +1,6 @@
set(SRCS citra.cpp set(SRCS citra.cpp
emu_window/emu_window_glfw.cpp) emu_window/emu_window_glfw.cpp)
set(HEADERS citra.h set(HEADERS resource.h)
resource.h)
# NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
if (NOT X11_xf86vmode_LIB) if (NOT X11_xf86vmode_LIB)

2
src/citra/citra.cpp
View file

@ -12,8 +12,6 @@
#include "citra/emu_window/emu_window_glfw.h" #include "citra/emu_window/emu_window_glfw.h"
#include "citra/citra.h"
/// Application entry point /// Application entry point
int __cdecl main(int argc, char **argv) { int __cdecl main(int argc, char **argv) {
LogManager::Init(); LogManager::Init();

6
src/citra/citra.h
View file

@ -1,6 +0,0 @@
// Copyright 2014 Citra Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
#pragma once

3
src/citra/citra.vcxproj
View file

@ -203,7 +203,6 @@
<ClCompile Include="emu_window\emu_window_glfw.cpp" /> <ClCompile Include="emu_window\emu_window_glfw.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="citra.h" />
<ClInclude Include="emu_window\emu_window_glfw.h" /> <ClInclude Include="emu_window\emu_window_glfw.h" />
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
</ItemGroup> </ItemGroup>
@ -213,4 +212,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

3
src/citra/citra.vcxproj.filters
View file

@ -12,7 +12,6 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="citra.h" />
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
<ClInclude Include="emu_window\emu_window_glfw.h"> <ClInclude Include="emu_window\emu_window_glfw.h">
<Filter>emu_window</Filter> <Filter>emu_window</Filter>
@ -21,4 +20,4 @@
<ItemGroup> <ItemGroup>
<Text Include="CMakeLists.txt" /> <Text Include="CMakeLists.txt" />
</ItemGroup> </ItemGroup>
</Project> </Project>