renamed RESCOMP to WINDRES due to bakefile changes (patch 1372332)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
daebb44c74
commit
67533115f9
@ -76,22 +76,23 @@ Format-specific notes:
|
|||||||
</if>
|
</if>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
We need to re-define the resource compiler, used by bakefile when compiling
|
We need to re-define the WINDRES resource compiler name to the resource compiler
|
||||||
resources, to the resource compiler returned by 'wx-config --rescomp' since
|
returned by 'wx-config - -rescomp' since this option returns both the name of the
|
||||||
'wx-config --rescomp' returns both the name of the resource compiler to use
|
resource compiler to use (windres) and the flags required for that compiler.
|
||||||
and the flags required for that compiler (rcflags are rccompiler-specific
|
|
||||||
and thus it would be wrong to use them with other resource compilers).
|
|
||||||
|
|
||||||
This line typically does something *only* when the Makefile.in generated
|
This line typically does something *only* when the Makefile.in generated
|
||||||
using this bakefile, is used on Windows with MSYS (when using Cygwin, resources
|
using this bakefile, is used on Windows with MSYS (when using Cygwin, resources
|
||||||
are not compiled at all).
|
are not compiled at all).
|
||||||
|
Without this line, in fact, when compiling with MSYS on Windows, the - -include-dir
|
||||||
|
option which tells windres to look in wxWidgets\include folder would be missing and
|
||||||
|
then windres would fail to find the wxMSW resources.
|
||||||
|
|
||||||
NOTE: overwriting the RESCOMP variable we modify the entire Bakefile behaviour
|
NOTE: overwriting the WINDRES variable we add wxWidgets resource flags to
|
||||||
for resource compilation; this could be a problem if the bakefile which
|
all targets which include this bakefile; this could be useless to those
|
||||||
includes this file needs the standard Bakefile resource compiler to
|
targets which are not wx-based eventually present in that bakefile but
|
||||||
build a non wx-based application.
|
in any case it shouldn't do any harm.
|
||||||
-->
|
-->
|
||||||
<set var="RESCOMP">$(WX_RESCOMP)</set>
|
<set var="WINDRES">$(WX_RESCOMP)</set>
|
||||||
|
|
||||||
<template id="wx-lib">
|
<template id="wx-lib">
|
||||||
<cxxflags>$(WX_CXXFLAGS)</cxxflags>
|
<cxxflags>$(WX_CXXFLAGS)</cxxflags>
|
||||||
|
Loading…
Reference in New Issue
Block a user