From f734599629ca30866fcefcc1cfea72a2d77462c3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 29 Sep 2015 12:44:30 +0200 Subject: unify handling of library prefixes and extensions make sure that all specs define QMAKE_{PREFIX,EXTENSION}_{SH,STATIC}LIB, and adjust the code to make halfways consistent use of these variables, in particular on windows; Win32MakefileGenerator::getLibTarget() is gone as a result, as is QMAKE_CYGWIN_SHLIB. still, tons of hardcoded "lib" references remain in the unix generator, because no-one cares. Change-Id: I6ccf37cc562f6584221c94fa27b2834412e4e4ca Reviewed-by: Joerg Bornemann --- mkspecs/cygwin-g++/qmake.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs/cygwin-g++') diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf index 95dcf8ee32..a4f64d9c66 100644 --- a/mkspecs/cygwin-g++/qmake.conf +++ b/mkspecs/cygwin-g++/qmake.conf @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = cygwin unix posix -CONFIG += incremental +CONFIG += incremental unversioned_libname QMAKE_INCREMENTAL_STYLE = sublib QMAKE_COMPILER = gcc @@ -56,7 +56,6 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, QMAKE_LFLAGS_THREAD = QMAKE_LFLAGS_RPATH = -Wl,-rpath, -QMAKE_CYGWIN_SHLIB = 1 QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl @@ -64,6 +63,7 @@ QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_THREAD = -lpthread QMAKE_PREFIX_SHLIB = lib +QMAKE_EXTENSION_SHLIB = dll QMAKE_PREFIX_STATICLIB = lib QMAKE_EXTENSION_STATICLIB = a -- cgit v1.2.3