[Wxlua-commit] wxLua/build/bakefiles wxluabase.bkl,1.47,1.48

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/build/bakefiles
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10385/wxLua/build/bakefiles

Modified Files:
	wxluabase.bkl 
Log Message:
For some reason this doesn't work

<set var="DEF_wxLUA_USEBINDING_WXADV">
   <if cond="USE_WXBINDADV='0'">
      wxLUA_USEBINDING_WXADV=0
   </if>
</set>

but this does.
<define>wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV)</define>

Change is in wxluabase.bkl.


Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** wxluabase.bkl	16 Jan 2008 19:54:25 -0000	1.47
--- wxluabase.bkl	17 Jan 2008 00:37:37 -0000	1.48
***************
*** 100,131 ****
  
      <!-- ================================================================== -->
-     <!-- Variables for defining wxLUA_USEBINDING_WXXXX=0 when the           -->
-     <!-- makefile's USE_BINDINGWXXXX=0 (must be after options.bkl)          -->
-     <!-- ================================================================== -->
- 
-     <define-global-tag name="define-usewxbind-def">
-         <set var="DEF_wxLUA_USEBINDING_WX$(value.upper())">
-             <if cond="USE_WXBIND$(value.upper())=='0'">
-                 wxLUA_USEBINDING_WX$(value.upper())=0
-             </if>
-         </set>
-     </define-global-tag>
- 
-     <define-usewxbind-def>adv</define-usewxbind-def>
-     <define-usewxbind-def>aui</define-usewxbind-def>
-     <define-usewxbind-def>base</define-usewxbind-def>
-     <define-usewxbind-def>core</define-usewxbind-def>
-     <define-usewxbind-def>gl</define-usewxbind-def>
-     <define-usewxbind-def>html</define-usewxbind-def>
-     <define-usewxbind-def>media</define-usewxbind-def>
-     <define-usewxbind-def>net</define-usewxbind-def>
-     <define-usewxbind-def>richtext</define-usewxbind-def>
-     <define-usewxbind-def>stc</define-usewxbind-def>
-     <define-usewxbind-def>xml</define-usewxbind-def>
-     <define-usewxbind-def>xrc</define-usewxbind-def>
- 
- 
- 
-     <!-- ================================================================== -->
      <!--                          TEMPLATES                                 -->
      <!-- ================================================================== -->
--- 100,103 ----
***************
*** 283,299 ****
                  $(WXLUA_BASEDIR)/lib/$(COMPILER)_$(_DIRNAME_SHARED_SUFFIX)
              </set>
- 
-             <define>DEF_wxLUA_USEBINDING_WXADV</define>
-             <define>DEF_wxLUA_USEBINDING_WXAUI</define>
-             <define>DEF_wxLUA_USEBINDING_WXBASE</define>
-             <define>DEF_wxLUA_USEBINDING_WXCORE</define>
-             <define>DEF_wxLUA_USEBINDING_WXGL</define>
-             <define>DEF_wxLUA_USEBINDING_WXHTML</define>
-             <define>DEF_wxLUA_USEBINDING_WXMEDIA</define>
-             <define>DEF_wxLUA_USEBINDING_WXNET</define>
-             <define>DEF_wxLUA_USEBINDING_WXRICHTEXT</define>
-             <define>DEF_wxLUA_USEBINDING_WXSTC</define>
-             <define>DEF_wxLUA_USEBINDING_WXXML</define>
-             <define>DEF_wxLUA_USEBINDING_WXXRC</define>
          </if>
          <if cond="FORMAT=='autoconf'">
--- 255,258 ----
***************
*** 312,316 ****
--- 271,295 ----
      </template>
  
+     <!-- a template for wxLua-based exe/dll targets -->
+     <template id="wxlua_with_bindings" template="wxlua">
+ 
+         <if cond="FORMAT!='autoconf'">
+ 
+             <define>wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV)</define>
+             <define>wxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI)</define>
+             <define>wxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE)</define>
+             <define>wxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE)</define>
+             <define>wxLUA_USEBINDING_WXGL=$(USE_WXBINDGL)</define>
+             <define>wxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML)</define>
+             <define>wxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA)</define>
+             <define>wxLUA_USEBINDING_WXNET=$(USE_WXBINDNET)</define>
+             <define>wxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT)</define>
+             <define>wxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC)</define>
+             <define>wxLUA_USEBINDING_WXXML=$(USE_WXBINDXML)</define>
+             <define>wxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC)</define>
  
+         </if>
+ 
+     </template>
  
      <!-- ================================================================== -->