summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2013-03-20 14:19:21 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-02 07:53:49 +0200
commita2cd7f79031ed14b98420ede645376fe71182a1c (patch)
treeb5175d5e300ecc2f516435c30431c3b19a888d9d
parent50731469be7b7c0ed18768789604e13955a8b2f7 (diff)
Fix the config.tests to correctly detect the 3rd party libraries
When building with Visual C++ it would not detect the 3rd party libraries because it does not include the lib prefix. So this now accounts for this. Additionally console is added to the CONFIG line so there is no need for a WinMain() function. Change-Id: I5be0114ef609e19ce1da612cac7781aaf748f552 Reviewed-by: aavit <eirik.aavitsland@digia.com>
-rw-r--r--config.tests/libmng/libmng.pro4
-rw-r--r--config.tests/libtiff/libtiff.pro4
2 files changed, 6 insertions, 2 deletions
diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro
index ee57ecd..7a45825 100644
--- a/config.tests/libmng/libmng.pro
+++ b/config.tests/libmng/libmng.pro
@@ -1,4 +1,6 @@
SOURCES = libmng.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
-LIBS += -lmng
+win32:CONFIG += console
+unix|win32-g++*: LIBS += -lmng
+else:win32: LIBS += libmng.lib
diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro
index 60ba7d1..47a8437 100644
--- a/config.tests/libtiff/libtiff.pro
+++ b/config.tests/libtiff/libtiff.pro
@@ -1,4 +1,6 @@
SOURCES = libtiff.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
-LIBS += -ltiff
+win32:CONFIG += console
+unix|win32-g++*: LIBS += -ltiff
+else:win32: LIBS += libtiff.lib