mirror of https://gitlab.com/ita1024/waf.git
Keep winres flags in subsequent detections #1908
This commit is contained in:
parent
27cba45b5f
commit
ef3b1bdcbf
|
@ -65,10 +65,6 @@ def configure(conf):
|
||||||
Detects the programs RC or windres, depending on the C/C++ compiler in use
|
Detects the programs RC or windres, depending on the C/C++ compiler in use
|
||||||
"""
|
"""
|
||||||
v = conf.env
|
v = conf.env
|
||||||
v.WINRC_TGT_F = '-o'
|
|
||||||
v.WINRC_SRC_F = '-i'
|
|
||||||
|
|
||||||
# find rc.exe
|
|
||||||
if not v.WINRC:
|
if not v.WINRC:
|
||||||
if v.CC_NAME == 'msvc':
|
if v.CC_NAME == 'msvc':
|
||||||
conf.find_program('RC', var='WINRC', path_list=v.PATH)
|
conf.find_program('RC', var='WINRC', path_list=v.PATH)
|
||||||
|
@ -76,6 +72,6 @@ def configure(conf):
|
||||||
v.WINRC_SRC_F = ''
|
v.WINRC_SRC_F = ''
|
||||||
else:
|
else:
|
||||||
conf.find_program('windres', var='WINRC', path_list=v.PATH)
|
conf.find_program('windres', var='WINRC', path_list=v.PATH)
|
||||||
if not v.WINRC:
|
v.WINRC_TGT_F = '-o'
|
||||||
conf.fatal('winrc was not found!')
|
v.WINRC_SRC_F = '-i'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue