- new documentation

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 1d436c90c984ed7211bade48e5733ce201192ff0..1aa414edfb3b03a54e8f5a638fff91ce78b66289 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -419,6 +419,10 @@ if platform_name == 'win32':
     else:
         env.Tool('mingw')
         env.AppendUnique(CPPPATH = ['#c:/MinGW/include'])
+        # fix a scons winres bug (there is a missing space between ${RCINCPREFIX} and ${SOURCE.dir}
+        # in version 0.96.93
+        env['RCCOM'] = '$RC $_CPPDEFFLAGS $RCINCFLAGS ${RCINCPREFIX} ${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET'
+    
 
 # we differentiate between hard-coded options and default options
 # hard-coded options are required and will always be there
@@ -1319,7 +1323,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();')