Limit the influence of flavour more strictly to autoconf format.
Remove '-' and '.' from the $release tag for non autoconf platform. This may like slightly finer tuning than that for some people. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
cc3388ae63
commit
a1bf307a46
147 changed files with 1155 additions and 1073 deletions
|
|
@ -3,6 +3,11 @@
|
|||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<option name="wxUSE_LIBTIFF"/>
|
||||
<set var="LIB_TIFF">
|
||||
<if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
|
||||
wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
</if>
|
||||
</set>
|
||||
</if>
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
<set var="wxUSE_LIBTIFF">
|
||||
|
|
@ -10,12 +15,12 @@
|
|||
<if cond="FORMAT=='msevc4prj'">no</if>
|
||||
<if cond="FORMAT!='msevc4prj'">builtin</if>
|
||||
</set>
|
||||
<set var="LIB_TIFF">
|
||||
<if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
|
||||
wxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX)
|
||||
</if>
|
||||
</set>
|
||||
</if>
|
||||
<set var="LIB_TIFF">
|
||||
<if cond="wxUSE_LIBTIFF=='builtin' and USE_GUI=='1'">
|
||||
wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
</if>
|
||||
</set>
|
||||
<set var="INC_TIFF">
|
||||
<if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>
|
||||
</set>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue