From 6b83509a7ebe42126068c3500e638cb64b1e32e8 Mon Sep 17 00:00:00 2001
From: bunnei <ericbunnie@gmail.com>
Date: Wed, 9 Apr 2014 23:09:05 -0400
Subject: updated CMakeLists

---
 CMakeLists.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80acc1cb7..0adc5e6f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,9 +37,7 @@ include_directories(${SDL2_INCLUDE_DIR})
 include_directories(${OPENGL_INCLUDE_DIR})
     
 # internal includes
-include_directories(src/common/src)
-include_directories(src/core/src)
-include_directories(src/citra/src)
+include_directories(src)
 
 # process subdirectories
 if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4)
-- 
cgit v1.2.3


From 9527fc74add2584de861a3a40fb313304c0108a7 Mon Sep 17 00:00:00 2001
From: bunnei <user@ubuntu.(none)>
Date: Wed, 9 Apr 2014 20:28:43 -0700
Subject: fixed a bunch of errors in CMakeLists

---
 CMakeLists.txt | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0adc5e6f4..6f886b21b 100644
--- a/CMakeLists.txt
+++ b/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()
-
+include_directories(${GLFW_INCLUDE_DIRS})
 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
-- 
cgit v1.2.3