From 0496407296e8ae1c3144fb94b1b19239026d4a69 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 2 Jan 2010 13:52:38 -0700 Subject: [PATCH] ... --- setup/build_environment.py | 1 + setup/installer/windows/freeze.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/build_environment.py b/setup/build_environment.py index 0921730d85..ae6d1c23e1 100644 --- a/setup/build_environment.py +++ b/setup/build_environment.py @@ -33,6 +33,7 @@ if iswindows: if 'SDK' in p: MT = os.path.join(os.path.dirname(p), 'bin', 'mt.exe') MT = os.path.join(SDK, 'bin', 'mt.exe') + os.environ['QMAKESPEC'] = 'win32-msvc' QMAKE = '/Volumes/sw/qt/bin/qmake' if isosx else 'qmake' if find_executable('qmake-qt4'): diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py index 4fa90fea28..0b04cc11cc 100644 --- a/setup/installer/windows/freeze.py +++ b/setup/installer/windows/freeze.py @@ -13,7 +13,7 @@ from setup import Command, modules, functions, basenames, __version__, \ from setup.build_environment import msvc, MT, RC from setup.installer.windows.wix import WixMixIn -QT_DIR = 'Q:\\Qt\\4.6.0' +QT_DIR = 'C:\\Qt\\4.6.0' QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns'] LIBUSB_DIR = 'C:\\libusb' LIBUNRAR = 'C:\\Program Files\\UnrarDLL\\unrar.dll'