FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Keep winres flags in subsequent detections #1908

This commit is contained in:
Thomas Nagy 2017-02-11 23:33:57 +01:00
parent 27cba45b5f
commit ef3b1bdcbf
No known key found for this signature in database
GPG Key ID: 49B4C67C05277AAA
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
waflib/Tools/winres.py
View File

@ -65,10 +65,6 @@ def configure(conf):
Detects the programs RC or windres, depending on the C/C++ compiler in use
"""
v = conf.env
v.WINRC_TGT_F = '-o'
v.WINRC_SRC_F = '-i'
# find rc.exe
if not v.WINRC:
if v.CC_NAME == 'msvc':
conf.find_program('RC', var='WINRC', path_list=v.PATH)
@ -76,6 +72,6 @@ def configure(conf):
v.WINRC_SRC_F = ''
else:
conf.find_program('windres', var='WINRC', path_list=v.PATH)
if not v.WINRC:
conf.fatal('winrc was not found!')
v.WINRC_TGT_F = '-o'
v.WINRC_SRC_F = '-i'