aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2015-01-07 12:00:08 +0100
committerJeremy Lainé <jeremy.laine@m4x.org>2015-01-07 12:00:08 +0100
commit2b5f93ba52d70ce7554f97df1c500950d8afff46 (patch)
tree09409989f6c65c8b18c26da7a04e504d2f8622ae
parent52432290b3b7a85affc54730ed41df56cc62ee26 (diff)
downloadqxmpp-2b5f93ba52d70ce7554f97df1c500950d8afff46.tar.gz
restore alphabetical order for QXMPP_* options
-rw-r--r--README.md2
-rw-r--r--qxmpp.pri10
2 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index dd50e95d..0c8228eb 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ You can pass the following arguments to qmake:
QXMPP_AUTOTEST_INTERNAL=1 to enabled internal autotests
QXMPP_LIBRARY_TYPE=staticlib to build a static version of QXmpp
QXMPP_USE_DOXYGEN=1 to build the HTML documentation
- QXMPP_USE_SPEEX=1 to enable speex audio codec
QXMPP_USE_OPUS=1 to enable opus audio codec
+ QXMPP_USE_SPEEX=1 to enable speex audio codec
QXMPP_USE_THEORA=1 to enable theora video codec
QXMPP_USE_VPX=1 to enable vpx video codec
diff --git a/qxmpp.pri b/qxmpp.pri
index b28304d4..3115ee93 100644
--- a/qxmpp.pri
+++ b/qxmpp.pri
@@ -33,16 +33,16 @@ android {
QXMPP_INTERNAL_LIBS = -ldnsapi -lws2_32
}
-!isEmpty(QXMPP_USE_SPEEX) {
- DEFINES += QXMPP_USE_SPEEX
- QXMPP_INTERNAL_LIBS += -lspeex
-}
-
!isEmpty(QXMPP_USE_OPUS) {
DEFINES += QXMPP_USE_OPUS
QXMPP_INTERNAL_LIBS += -lopus
}
+!isEmpty(QXMPP_USE_SPEEX) {
+ DEFINES += QXMPP_USE_SPEEX
+ QXMPP_INTERNAL_LIBS += -lspeex
+}
+
!isEmpty(QXMPP_USE_THEORA) {
DEFINES += QXMPP_USE_THEORA
QXMPP_INTERNAL_LIBS += -ltheoradec -ltheoraenc