From b254127b3a6b27c4c13135d3d5027e8baedb2ea6 Mon Sep 17 00:00:00 2001 From: Tvangeste Date: Sun, 11 Aug 2013 09:30:43 +0200 Subject: [PATCH] Handle MSVC++ x64 --- goldendict.pro | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/goldendict.pro b/goldendict.pro index f10af87d..faf26ba6 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -40,11 +40,17 @@ win32 { win32-msvc* { VERSION = 1.5.0 # More complicated things cause errors during compilation under MSVC++ DEFINES += __WIN32 _CRT_SECURE_NO_WARNINGS + contains(QMAKE_TARGET.arch, x86_64) { + DEFINES += NOMINMAX __WIN64 + LIBS += -L$${PWD}/winlibs/lib/msvc/x64 + } else { + LIBS += -L$${PWD}/winlibs/lib/msvc + } QMAKE_CXXFLAGS += /wd4290 # silence the warning C4290: C++ exception specification ignored QMAKE_LFLAGS_RELEASE += /LTCG /OPT:REF /OPT:ICF - QMAKE_CXXFLAGS_RELEASE += /GL + # QMAKE_CXXFLAGS_RELEASE += /GL # slows down the linking significantly LIBS += -lshell32 -luser32 -lsapi -lole32 -lhunspell - LIBS += -L$${PWD}/winlibs/lib/msvc + HUNSPELL_LIB = hunspell } else { LIBS += -lhunspell-1.3.2 LIBS += -L$${PWD}/winlibs/lib