summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-06-22 16:59:13 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-06-22 17:00:49 (GMT)
commit86e892137d512a11edde0aa7760fc1c15e598dad (patch)
tree92df4f3e82e1da6cf96d4490bd9bb5fdd98f6d38
parenta8698c4d671cf3c957f2d67a4e8cedde49dae8a3 (diff)
downloadswift-86e892137d512a11edde0aa7760fc1c15e598dad.zip
swift-86e892137d512a11edde0aa7760fc1c15e598dad.tar.bz2
Pick up configured libraries in Swift QMake build.
-rw-r--r--.gitignore1
-rw-r--r--Swift/QtUI/Swift.pro21
-rw-r--r--Swift/QtUI/config.pri.in1
-rw-r--r--configure.in3
4 files changed, 15 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 7de2cd3..6ecedad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,5 @@ Swift/QtUI/swift
Swift/QtUI/DefaultTheme.qrc
Swift/QtUI/*/Makefile
Swift/QtUI/Swiften.pri
+Swift/QtUI/config.pri
tools/coverage/results
diff --git a/Swift/QtUI/Swift.pro b/Swift/QtUI/Swift.pro
index 6221fa8..e9579d6 100644
--- a/Swift/QtUI/Swift.pro
+++ b/Swift/QtUI/Swift.pro
@@ -10,10 +10,12 @@ else {
DEPENDPATH += . ../.. ../../3rdParty/Boost
INCLUDEPATH += . ../.. ../../3rdParty/Boost
-win32 {
- CONFIG += console
-
- # Configuration
+exists(config.pri) {
+ LIBS += ../Controllers/Controllers.a ../../Swiften/Swiften.a
+ include(config.pri)
+}
+else {
+ # Legacy build type
HAVE_EXPAT=yes
USE_BUNDLED_EXPAT=yes
DEFINES += HAVE_EXPAT
@@ -24,13 +26,10 @@ win32 {
LIBS += -LF:/OpenSSL/lib/VC -llibeay32MT -lssleay32MT
include(Swiften.pri)
- LIBS += -ldnsapi -lws2_32 -lwsock32
}
-else {
- LIBS += ../Controllers/Controllers.a ../../Swiften/Swiften.a -lexpat -lssl -lcrypto
- unix {
- LIBS += -lresolv
- }
+
+win32 {
+ CONFIG += console
}
# Resources
@@ -79,7 +78,7 @@ SOURCES += \
QtStatusWidget.cpp \
QtSwift.cpp \
QtTreeWidget.cpp \
- QtChatView.cpp \
+ QtChatView.cpp \
QtChatTabs.cpp \
QtSystemTray.cpp \
ChatSnippet.cpp \
diff --git a/Swift/QtUI/config.pri.in b/Swift/QtUI/config.pri.in
new file mode 100644
index 0000000..45ecf87
--- /dev/null
+++ b/Swift/QtUI/config.pri.in
@@ -0,0 +1 @@
+LIBS += @CONFIG_LIBS@
diff --git a/configure.in b/configure.in
index 41ef7a7..ae1dc99 100644
--- a/configure.in
+++ b/configure.in
@@ -213,4 +213,7 @@ AC_SUBST(QMAKE)
AC_SUBST(BUILD_SWIFT)
AC_CONFIG_FILES([Makefile.config])
+if test "$BUILD_SWIFT" == "yes"; then
+ AC_CONFIG_FILES([Swift/QtUI/config.pri])
+fi
AC_OUTPUT