|
From: John L. <jla...@gm...> - 2008-01-16 19:27:43
|
On Jan 16, 2008 1:50 PM, Francesco Montorsi <f18...@ya...> wrote:
> John Labenski ha scritto:
> > On Jan 16, 2008 7:07 AM, Leslie Newell <les...@fm...> wrote:
> >> The GL lib is separate even in monolithic builds. The lines should read:
> > Hopefully they're both fixed in the current CVS.
> Thanks. I'll make sure the fix is committed also upstream in wx.
>
Sorry I had meant to alert you to that change, but forgot.
================
Is the code below equivalent? Is generates a lot less code in the msw
makefiles. (see wx_win32.bkl)
This
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and
WX_DEBUG=='0'">wxbase$(WX_VERSION)</if>
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and
WX_DEBUG=='1'">wxbase$(WX_VERSION)d</if>
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and
WX_DEBUG=='0'">wxbase$(WX_VERSION)u</if>
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and
WX_DEBUG=='1'">wxbase$(WX_VERSION)ud</if>
is same as
<if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</if>
================
And this
<if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and
WX_DEBUG=='0'">wx$(WX_PORT)$(WX_VERSION)</if>
<if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='0' and
WX_DEBUG=='1'">wx$(WX_PORT)$(WX_VERSION)d</if>
<if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and
WX_DEBUG=='0'">wx$(WX_PORT)$(WX_VERSION)u</if>
<if cond="WX_MONOLITHIC=='1' and WX_UNICODE=='1' and
WX_DEBUG=='1'">wx$(WX_PORT)$(WX_VERSION)ud</if>
is same as
<if cond="WX_MONOLITHIC=='0'">wx$(WX_VERSION)$(WXLIBPOSTFIX)</if>
================
This
<define-global-tag name="define-wxbase-lib-name">
<set var="WXLIB_$(value.upper())_NAME">
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">
wxbase$(WX_VERSION)_$(value)
</if>
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">
wxbase$(WX_VERSION)d_$(value)
</if>
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">
wxbase$(WX_VERSION)u_$(value)
</if>
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">
wxbase$(WX_VERSION)ud_$(value)
</if>
</set>
</define-global-tag>
is same as
<define-global-tag name="define-wxbase-lib-name">
<set var="WXLIB_$(value.upper())_NAME">
<if cond="WX_MONOLITHIC=='0'">
wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
</if>
</set>
</define-global-tag>
================
And finally
<define-global-tag name="define-wxlib-name">
<set var="WXLIB_$(value.upper())_NAME">
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='0'">
wx$(WX_PORT)$(WX_VERSION)_$(value)
</if>
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='0' and WX_DEBUG=='1'">
wx$(WX_PORT)$(WX_VERSION)d_$(value)
</if>
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='0'">
wx$(WX_PORT)$(WX_VERSION)u_$(value)
</if>
<if cond="WX_MONOLITHIC=='0' and WX_UNICODE=='1' and WX_DEBUG=='1'">
wx$(WX_PORT)$(WX_VERSION)ud_$(value)
</if>
</set>
</define-global-tag>
is same as
<define-global-tag name="define-wxlib-name">
<set var="WXLIB_$(value.upper())_NAME">
<if cond="WX_MONOLITHIC=='0'">
wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
</if>
</set>
</define-global-tag>
Regards,
John
|