fixed a bunch of errors in CMakeLists

CMakeLists.txt

@@ -9,15 +9,9 @@ add_definitions(-DSINGLETHREADED)
 # dependency checking
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
 include(FindOpenGL REQUIRED)
-include(FindGLFW REQUIRED)
 include(FindX11 REQUIRED)
 
-if(NOT GLFW_FOUND)
-    message(FATAL_ERROR "glfw not found")
-else()
 include_directories(${GLFW_INCLUDE_DIRS})
-endif()
-
 option(DISABLE_QT4 "Disable Qt4 GUI" OFF)
 if(NOT DISABLE_QT4)
     include(FindQt4)
@@ -33,7 +27,6 @@ if(NOT DISABLE_QT4)
 endif()
 
 # external includes
-include_directories(${SDL2_INCLUDE_DIR})
 include_directories(${OPENGL_INCLUDE_DIR})
     
 # internal includes

src/citra/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(SRCS    citra.cpp
-            emuwindow/emuwindow_glfw.cpp)
+            emu_window/emu_window_glfw.cpp)
 
 # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
 if (NOT X11_xf86vmode_LIB)

src/core/CMakeLists.txt

@@ -15,7 +15,7 @@ set(SRCS    core.cpp
             arm/interpreter/thumbemu.cpp
             arm/mmu/arm1176jzf_s_mmu.cpp
             elf/elf_reader.cpp
-            file_sys/directory_file_system/cpp
+            file_sys/directory_file_system.cpp
             file_sys/meta_file_system.cpp
             hw/hw.cpp
             hw/hw_lcd.cpp)

src/video_core/CMakeLists.txt

@@ -1,5 +1,5 @@
-set(SRCS    src/video_core.cpp
-            src/utils.cpp
-            src/renderer_opengl/renderer_opengl.cpp)
+set(SRCS    video_core.cpp
+            utils.cpp
+            renderer_opengl/renderer_opengl.cpp)
 
 add_library(video_core STATIC ${SRCS})