Scons: fix two mingw bugs

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16522 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 1d436c90c984ed7211bade48e5733ce201192ff0..9db0173ff3944d3a3f439c5c6c4eb127fc158c34 100644 (file)
--- 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 14c0b101529cd86e383a00cbaae7d0f1cc17e7eb..e377be94be5e5bf88a43eb095bd4f5e38d23b856 100644 (file)
--- 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: