aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2015-08-11 09:20:00 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2015-08-11 09:20:00 +0000
commit6d7a30b9865407dddb4723b705e12e627fafc208 (patch)
tree4c3c14aa400fe92885932056d1fbd5263c20fe37
parent017d2d27bfbcd97ada407212e925b280ff3482b5 (diff)
downloadqmmp-6d7a30b9865407dddb4723b705e12e627fafc208.tar.gz
qmmp-6d7a30b9865407dddb4723b705e12e627fafc208.tar.bz2
qmmp-6d7a30b9865407dddb4723b705e12e627fafc208.zip
updated build scripts
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5368 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--CMakeLists.txt1
-rw-r--r--qmmp.pri1
-rw-r--r--src/plugins/Ui/CMakeLists.txt9
-rw-r--r--src/plugins/Ui/Ui.pro4
4 files changed, 13 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56bbec2b8..3de8cb74e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,6 +198,7 @@ PRINT_SUMMARY ("QMMP File Dialog .................." USE_QMMP_DIALOG 1)
MESSAGE("")
MESSAGE("Advanced:")
PRINT_SUMMARY ("Skinned user interface ............" USE_SKINNED X11_FOUND)
+PRINT_SUMMARY ("Simple user interface (QSUI) ......" USE_QSUI 1)
PRINT_SUMMARY ("Automatic charset detection ......." USE_ENCA ENCA_FOUND)
PRINT_SUMMARY ("Directory association ............." USE_DIR_ASSOC 1)
PRINT_SUMMARY ("Set RPATH in installed binaries ..." CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
diff --git a/qmmp.pri b/qmmp.pri
index 2acb6b4fb..ec7e3e37c 100644
--- a/qmmp.pri
+++ b/qmmp.pri
@@ -40,6 +40,7 @@ CONFIG += SID_PLUGIN
CONFIG += WITH_ENCA
CONFIG += WITH_PROJECTM20
CONFIG += WITH_SKINNED
+CONFIG += WITH_QSUI
CONFIG += WITH_NEW_JACK
#CONFIG += FFMPEG_LEGACY #uncomment for ffmpeg < 0.9 or libav < 0.8
diff --git a/src/plugins/Ui/CMakeLists.txt b/src/plugins/Ui/CMakeLists.txt
index 667d0763c..7fb7deeb9 100644
--- a/src/plugins/Ui/CMakeLists.txt
+++ b/src/plugins/Ui/CMakeLists.txt
@@ -1,5 +1,10 @@
SET(USE_SKINNED TRUE CACHE BOOL "enable/disable skinned user interface")
+SET(USE_QSUI TRUE CACHE BOOL "enable/disable simple user interface (qsui)")
-IF(USE_SKINNED)
+IF(USE_SKINNED AND X11_FOUND)
add_subdirectory(skinned)
-ENDIF(USE_SKINNED)
+ENDIF(USE_SKINNED AND X11_FOUND)
+
+IF(USE_QSUI)
+add_subdirectory(qsui)
+ENDIF(USE_QSUI)
diff --git a/src/plugins/Ui/Ui.pro b/src/plugins/Ui/Ui.pro
index 79e39ec62..52ec45666 100644
--- a/src/plugins/Ui/Ui.pro
+++ b/src/plugins/Ui/Ui.pro
@@ -6,3 +6,7 @@ contains(CONFIG, WITH_SKINNED){
SUBDIRS += skinned
}
+contains(CONFIG, WITH_QSUI){
+SUBDIRS += qsui
+}
+