From a2cd7f79031ed14b98420ede645376fe71182a1c Mon Sep 17 00:00:00 2001 From: Andy Shaw <andy.shaw@digia.com> Date: Wed, 20 Mar 2013 14:19:21 +0100 Subject: [PATCH] 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> --- config.tests/libmng/libmng.pro | 4 +++- config.tests/libtiff/libtiff.pro | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro index ee57ecd6..7a458252 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 60ba7d11..47a8437a 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 -- GitLab