diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-08-23 22:22:05 -0300 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-09-01 18:06:30 -0300 |
commit | 45976da975a21359cfcc9a05c575ed8b07575612 (patch) | |
tree | ac688d083cd597f12c42b5e424bb7a66cad50c45 /src/CMakeLists.txt | |
parent | 523385955c3c0af2dc2133546490f8ede0dd824f (diff) |
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.
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e0227dc53..cb09f3cd1 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() |