[Wxlua-commit] wxLua/build/bakefiles wxlua.bkl, 1.40, 1.41 wxluabase.bkl, 1.46, 1.47

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

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

Modified Files:
	wxlua.bkl wxluabase.bkl 
Log Message:
Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX
so that if you specify that binding to not be built 
-DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't
get a linking error from the missing symbol.


Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** wxluabase.bkl	15 Jan 2008 18:37:27 -0000	1.46
--- wxluabase.bkl	16 Jan 2008 19:54:25 -0000	1.47
***************
*** 54,58 ****
  
  
- 
      <!-- ================================================================== -->
      <!--                            VARIABLES                               -->
--- 54,57 ----
***************
*** 86,91 ****
      </if>
  
- 
- 
      <!-- ================================================================== -->
      <!--                            OPTIONS                                 -->
--- 85,88 ----
***************
*** 95,98 ****
--- 92,127 ----
      <include file="options.bkl" once="1"/>
  
+     <!-- This file contains the list of MODULES options             -->
+     <include file="../../modules/build/bakefiles/options.bkl" once="1"/>
+ 
+     <!-- This file contains the list of APPS options                -->
+     <include file="../../apps/build/bakefiles/options.bkl" once="1"/>
+ 
+ 
+     <!-- ================================================================== -->
+     <!-- 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>
  
  
***************
*** 254,257 ****
--- 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'">

Index: wxlua.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** wxlua.bkl	15 Jan 2008 18:37:27 -0000	1.40
--- wxlua.bkl	16 Jan 2008 19:54:25 -0000	1.41
***************
*** 17,26 ****
      <include file="wxluabase.bkl"/>
  
-     <!-- This file contains the list of MODULES options             -->
-     <include file="../../modules/build/bakefiles/options.bkl"/>
- 
-     <!-- This file contains the list of APPS options                -->
-     <include file="../../apps/build/bakefiles/options.bkl"/>
- 
  
      <if cond="TARGETING_WIN32=='1'">
--- 17,20 ----