mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 05:25:26 +00:00
Scons: fix two mingw bugs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16522 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
1cdbdc1bdc
commit
b1c7fc3e4f
@ -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();')
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user