From b1c7fc3e4f535447cb06469d0e6c87ce6901df1d Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Fri, 5 Jan 2007 06:29:18 +0000 Subject: [PATCH] Scons: fix two mingw bugs git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16522 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/SConstruct | 2 +- development/scons/scons_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 1d436c90c9..9db0173ff3 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -1319,7 +1319,7 @@ if frontend == 'qt4': if not succ: # Under linux, I can test the following perfectly # Under windows, lib names need to passed as libXXX4.a ... - if platform_name == 'win32' and use_vc: + if platform_name == 'win32': succ = conf.CheckLibWithHeader('QtCore4', 'QtGui/QApplication', 'c++', 'QApplication qapp();') else: succ = conf.CheckLibWithHeader('QtCore', 'QtGui/QApplication', 'c++', 'QApplication qapp();') diff --git a/development/scons/scons_utils.py b/development/scons/scons_utils.py index 14c0b10152..e377be94be 100644 --- a/development/scons/scons_utils.py +++ b/development/scons/scons_utils.py @@ -86,7 +86,7 @@ def createResFromIcon(env, icon_file, rc_file): rc = open(rc_name, 'w') print >> rc, 'IDI_ICON1 ICON DISCARDABLE "%s"' % \ os.path.join(env.Dir('$TOP_SRCDIR').abspath, 'development', 'win32', - 'packaging', 'icons', icon_file) + 'packaging', 'icons', icon_file).replace('\\', '\\\\') rc.close() return env.RES(rc_name) else: -- 2.39.2