Browse Source

Merge pull request #46 from archshift/citrah

Removed unused citra.h
bunnei 12 years ago
parent
commit
c3c66ad34d
5 changed files with 3 additions and 14 deletions
  1. 1 2
      src/citra/CMakeLists.txt
  2. 0 2
      src/citra/citra.cpp
  3. 0 6
      src/citra/citra.h
  4. 1 2
      src/citra/citra.vcxproj
  5. 1 2
      src/citra/citra.vcxproj.filters

+ 1 - 2
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)

+ 0 - 2
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();

+ 0 - 6
src/citra/citra.h

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

+ 1 - 2
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>
+</Project>

+ 1 - 2
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>
+</Project>