From a1ba5568da6c57e8a0e4440913a6bda322620422 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 21 Jan 2011 16:29:27 +0200 Subject: Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs. Reviewed-by: axis --- mkspecs/common/symbian/symbian-makefile.conf | 3 --- mkspecs/common/symbian/symbian.conf | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index 364e91b..0360615 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -22,11 +22,8 @@ QMAKE_ELF2E32_FLAGS = --dlldata \ include(../../common/unix.conf) QMAKE_PREFIX_SHLIB = -QMAKE_EXTENSION_SHLIB = dll CONFIG *= no_plugin_name_prefix -QMAKE_EXTENSION_PLUGIN = dll QMAKE_PREFIX_STATICLIB = -QMAKE_EXTENSION_STATICLIB = lib QMAKE_SYMBIAN_SHLIB = 1 is_using_gnupoc { diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index ab94cfb..5619d4f 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -13,6 +13,9 @@ QMAKE_COMPILER_DEFINES += SYMBIAN QMAKE_EXT_OBJ = .o QMAKE_EXT_RES = _res.o +QMAKE_EXTENSION_SHLIB = dll +QMAKE_EXTENSION_PLUGIN = dll +QMAKE_EXTENSION_STATICLIB = lib QMAKE_LEX = flex QMAKE_LEXFLAGS = -- cgit v0.12