Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 1372332 ] Support for WX_RESCOMP to allow MSYS+wx-config to work

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-03-11 14:51:45 +00:00
parent 32ceccf56f
commit 692ebda6c7
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
build/bakefiles/wxpresets/presets/wx_unix.bkl
View File

@@ -30,6 +30,7 @@ Format-specific notes:
<option name="WX_CXXFLAGS"/>
<option name="WX_CPPFLAGS"/>
<option name="WX_LIBS"/>
<option name="WX_RESCOMP"/>
</if>
<!-- ============================================================== -->
@@ -57,6 +58,10 @@ Format-specific notes:
<default-value>`$(DOLLAR)(WX_CONFIG) --libs`</default-value>
<description>wxWidgets libraries to link against</description>
</option>
<option name="WX_RESCOMP">
<default-value>`$(DOLLAR)(WX_CONFIG) --rescomp`</default-value>
<description>wxWidgets resource compiler and flags</description>
</option>
<!-- we need this but the trick used in default-values above
prevents bakefile from detecting it: -->
@@ -73,6 +78,24 @@ Format-specific notes:
</error>
</if>
<!--
We need to re-define the resource compiler, used by bakefile when compiling
resources, to the resource compiler returned by 'wx-config --rescomp' since
'wx-config --rescomp' returns both the name of the resource compiler to use
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
using this bakefile, is used on Windows with MSYS (when using Cygwin, resources
are not compiled at all).
NOTE: overwriting the RESCOMP variable we modify the entire Bakefile behaviour
for resource compilation; this could be a problem if the bakefile which
includes this file needs the standard Bakefile resource compiler to
build a non wx-based application.
-->
<set var="RESCOMP">$(WX_RESCOMP)</set>
<template id="wx-lib">
<cxxflags>$(WX_CXXFLAGS)</cxxflags>
<cflags>$(WX_CFLAGS)</cflags>