From 45976da975a21359cfcc9a05c575ed8b07575612 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 23 Aug 2014 22:22:05 -0300 Subject: CMake cleanup Several cleanups to the buildsystem: - Do better factoring of common libs between platforms. - Add support to building on Windows. - Remove Qt4 support. - Re-sort file lists and add missing headers. --- src/CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e0227dc5..cb09f3cd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,9 +1,12 @@ +# Enable modules to include each other's files +include_directories(.) + add_subdirectory(common) add_subdirectory(core) add_subdirectory(video_core) -add_subdirectory(citra) -add_subdirectory(citra_qt) - -if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4) - #add_subdirectory(citra_qt) +if (ENABLE_GLFW) + add_subdirectory(citra) +endif() +if (ENABLE_QT) + add_subdirectory(citra_qt) endif() -- cgit v1.2.3