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:
@@ -3,15 +3,20 @@
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<option name="wxUSE_LIBJPEG"/>
|
||||
<set var="LIB_JPEG">
|
||||
<if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
|
||||
wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
</if>
|
||||
</set>
|
||||
</if>
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
<set var="wxUSE_LIBJPEG">builtin</set>
|
||||
<set var="LIB_JPEG">
|
||||
<if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
|
||||
wxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(HOST_SUFFIX)
|
||||
</if>
|
||||
</set>
|
||||
</if>
|
||||
<set var="LIB_JPEG">
|
||||
<if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
|
||||
wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
</if>
|
||||
</set>
|
||||
<set var="INC_JPEG">
|
||||
<if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)src/jpeg</if>
|
||||
</set>
|
||||
|
Reference in New Issue
Block a user