Menu
▾
▴
[Wxlua-commit] wxLua/build/bakefiles/presets wx.bkl, 1.2, 1.3 wx_unix.bkl, 1.1, 1.2 wx_win32.bkl, 1.3, 1.4
|
From: John L. <jr...@us...> - 2011-03-09 03:38:13
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles/presets
In directory vz-cvs-4.sog:/tmp/cvs-serv1424
Modified Files:
wx.bkl wx_unix.bkl wx_win32.bkl
Log Message:
Update version from wxCode
Index: wx_win32.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/presets/wx_win32.bkl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wx_win32.bkl 16 Jan 2008 16:46:11 -0000 1.3
--- wx_win32.bkl 9 Mar 2011 03:38:11 -0000 1.4
***************
*** 83,90 ****
<!-- All the possible mixes for the wx library names -->
<set var="WXLIB_BASE_NAME">
! <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>
<!--
--- 83,87 ----
<!-- All the possible mixes for the wx library names -->
<set var="WXLIB_BASE_NAME">
! <if cond="WX_MONOLITHIC=='0'">wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</if>
<!--
***************
*** 94,101 ****
monolithic library
-->
! <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>
</set>
--- 91,95 ----
monolithic library
-->
! <if cond="WX_MONOLITHIC=='1'">wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)</if>
</set>
***************
*** 104,120 ****
<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>
--- 98,105 ----
<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>
***************
*** 127,141 ****
<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>
--- 112,117 ----
<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>
***************
*** 149,158 ****
<define-wxlib-name>qa</define-wxlib-name>
<define-wxlib-name>dbgrid</define-wxlib-name>
<define-wxlib-name>aui</define-wxlib-name>
<define-wxlib-name>richtext</define-wxlib-name>
! <!-- The GL lib is not part of the monolithic build in 2.8, treat it as a contrib
! <define-wxlib-name>gl</define-wxlib-name>
! -->
--- 125,134 ----
<define-wxlib-name>qa</define-wxlib-name>
<define-wxlib-name>dbgrid</define-wxlib-name>
+ <define-wxlib-name>gl</define-wxlib-name>
<define-wxlib-name>aui</define-wxlib-name>
<define-wxlib-name>richtext</define-wxlib-name>
!
!
***************
*** 188,191 ****
--- 164,168 ----
<if cond="value=='html'"><sys-lib>$(WXLIB_HTML_NAME)</sys-lib></if>
<if cond="value=='adv'"><sys-lib>$(WXLIB_ADV_NAME)</sys-lib></if>
+ <if cond="value=='gl'"><sys-lib>$(WXLIB_GL_NAME)</sys-lib></if>
<if cond="value=='dbgrid'"><sys-lib>$(WXLIB_DBGRID_NAME)</sys-lib></if>
<if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if>
***************
*** 193,201 ****
<if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
- <!-- The GL lib isn't part of the monolithic build in 2.8, treat it as a contrib -->
- <if cond="value=='gl'">
- <sys-lib>wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
- </if>
-
<!-- wx-lib can be used also to link against contrib libraries
(which always have the same name, regardless of WX_MONOLITHIC value) -->
--- 170,173 ----
Index: wx.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/presets/wx.bkl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wx.bkl 24 Apr 2007 14:39:52 -0000 1.2
--- wx.bkl 9 Mar 2011 03:38:11 -0000 1.3
***************
*** 169,173 ****
<!-- 'gnu' format needs to redefine the following options later in wx_unix.bkl -->
! <if cond="FORMAT=='gnu'">
<set var="WX_UNICODE"/>
<set var="WX_DEBUG"/>
--- 169,173 ----
<!-- 'gnu' format needs to redefine the following options later in wx_unix.bkl -->
! <if cond="FORMAT=='gnu' or FORMAT=='xcode2'">
<set var="WX_UNICODE"/>
<set var="WX_DEBUG"/>
***************
*** 244,248 ****
<if cond="not isdefined('WX_DIR')">
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
! <option name="WX_DIR" category="path">
<default-value>$(WX_DIR_DEFAULT)</default-value>
<description>
--- 244,248 ----
<if cond="not isdefined('WX_DIR')">
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
! <option name="WX_DIR" category="path" never_empty="1">
<default-value>$(WX_DIR_DEFAULT)</default-value>
<description>
***************
*** 273,277 ****
<set var="__wx_included_impl">0</set>
! <if cond="FORMAT in ['autoconf','gnu']">
<include file="wx_unix.bkl"/>
<set var="__wx_included_impl">1</set>
--- 273,277 ----
<set var="__wx_included_impl">0</set>
! <if cond="FORMAT in ['autoconf','gnu','xcode2']">
<include file="wx_unix.bkl"/>
<set var="__wx_included_impl">1</set>
***************
*** 383,387 ****
<dirname>$(_DIRNAME)</dirname>
! <if cond="FORMAT_SUPPORTS_ACTIONS=='1'">
<set var="__mkdir_tgt">make_dir_$(id)</set>
--- 383,387 ----
<dirname>$(_DIRNAME)</dirname>
! <if cond="FORMAT_SUPPORTS_ACTIONS=='1' and FORMAT!='xcode2'">
<set var="__mkdir_tgt">make_dir_$(id)</set>
***************
*** 394,398 ****
if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
</command>
! </modify-target>
<!-- the following code is mostly equivalent to a:
--- 394,398 ----
if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
</command>
! </modify-target>
<!-- the following code is mostly equivalent to a:
***************
*** 424,428 ****
-->
<define-tag name="wxlike-paths" rules="exe,lib,dll,module">
! <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
<!-- WXLIBPATH is a path like "/lib/vc_lib"
NOTE: even if this template is going to be used for a "lib"
--- 424,428 ----
-->
<define-tag name="wxlike-paths" rules="exe,lib,dll,module">
! <if cond="FORMAT!='autoconf' and FORMAT!='gnu' and FORMAT!='xcode2'">
<!-- WXLIBPATH is a path like "/lib/vc_lib"
NOTE: even if this template is going to be used for a "lib"
Index: wx_unix.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/presets/wx_unix.bkl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wx_unix.bkl 24 Apr 2007 14:29:46 -0000 1.1
--- wx_unix.bkl 9 Mar 2011 03:38:11 -0000 1.2
***************
*** 60,64 ****
<!-- ============================================================== -->
! <if cond="FORMAT=='gnu'">
<!-- remove those WX_* vars which were created just to avoid the definition
--- 60,64 ----
<!-- ============================================================== -->
! <if cond="FORMAT=='gnu' or FORMAT=='xcode2'">
<!-- remove those WX_* vars which were created just to avoid the definition
***************
*** 80,84 ****
</set>
<option name="WX_PORT">
! <values>gtk1,gtk2,msw,x11,motif,mgl,mac,dfb</values>
<default-value force="1">$(WX_PORT_DEFAULT)</default-value>
<description>
--- 80,84 ----
</set>
<option name="WX_PORT">
! <values>gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb</values>
<default-value force="1">$(WX_PORT_DEFAULT)</default-value>
<description>
***************
*** 222,226 ****
<!-- ============================================================== -->
! <if cond="FORMAT not in ['gnu','autoconf']">
<error>
Don't include presets/wx_unix.bkl directly, use presets/wx.bkl.
--- 222,226 ----
<!-- ============================================================== -->
! <if cond="FORMAT not in ['gnu','autoconf','xcode2']">
<error>
Don't include presets/wx_unix.bkl directly, use presets/wx.bkl.
|
