[Wxlua-commit] wxLua/build/bakefiles wxluabase.bkl,1.42,1.43

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

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

Modified Files:
	wxluabase.bkl 
Log Message:
Updated bakefiles and autoconf to find the wxWidgets libs that exist on the system and link to those
Also create only the wxLua bind libs for the existing wxWidgets libs
Done by using $(WXLUA_LIBS) for autoconf like $(WX_LIBS) for the wxlua-lib tag
   and adding wxluamodule-lib to allow explicitly specifying the wxLua libs to 
   link to for the modules.


Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** wxluabase.bkl	31 Jul 2007 23:15:12 -0000	1.42
--- wxluabase.bkl	10 Jan 2008 17:04:25 -0000	1.43
***************
*** 40,44 ****
      -->
  
!     <set var="WXLUA_RELEASE">4</set>
  
      <!-- The default version of wxWidgets which is used by wxLua;
--- 40,44 ----
      -->
  
!     <set var="WXLUA_RELEASE">7</set>
  
      <!-- The default version of wxWidgets which is used by wxLua;
***************
*** 110,124 ****
           Trying to use an invalid name will generate an error at bake-time.
      -->
!     <define-tag name="wxlua-lib" rules="exe,dll,module">
!         <if cond="value not in [ 'wxluasocket', 'wxluadebug', 'wxlua', 'wxbindadv', 'wxbindaui', 'wxbindbase', 'wxbindcore', 'wxbindgl', 'wxbindhtml', 'wxbindmedia', 'wxbindnet', 'wxbindrichtext', 'wxbindstc', 'wxbindxml', 'wxbindxrc', 'lua' ]">
!             <error>Invalid wxlua-lib value !</error>
!         </if>
!         <if cond="value=='lua'">
!             <sys-lib>lua5.1</sys-lib>
!         </if>
!         <if cond="value!='lua'">
!             <wxlike-lib prefix="wxlua">$(value)</wxlike-lib>
!         </if>
!     </define-tag>
  
      <!-- shortcut for including *all* wxLua libraries, even CONTRIB wrappers -->
--- 110,150 ----
           Trying to use an invalid name will generate an error at bake-time.
      -->
! 
!     <set var="WXLUA_LIB_LIST">
!         wxluasocket wxluadebug wxlua wxbindadv wxbindaui wxbindbase wxbindcore wxbindgl wxbindhtml wxbindmedia wxbindnet wxbindrichtext wxbindstc wxbindxml wxbindxrc lua
!     </set>
! 
!     <if cond="FORMAT=='autoconf'">
!         <option name="WXLUA_LIBS"/>
! 
!         <define-tag name="wxlua-lib" rules="exe,dll,module">
!             <if cond="value not in WXLUA_LIB_LIST.split()">
!                 <error>Unknown wxLua library given in the wxlib-lib tag</error>
!             </if>
! 
!             <if cond="value=='lua'">
!                 <!-- all wxlua-dependent libraries should have been already listed
!                      thus we can now add WX_LIBS to the linker line -->
!                 <ldlibs>$(WXLUA_LIBS)</ldlibs>
!             </if>
!         </define-tag>
! 
!     </if>
! 
!     <if cond="FORMAT not in ['autoconf']">
! 
!         <define-tag name="wxlua-lib" rules="exe,dll,module">
!             <if cond="value not in WXLUA_LIB_LIST.split()">
!                 <error>Unknown wxLua library given in the wxlib-lib tag</error>
!             </if>
! 
!             <if cond="value=='lua'">
!                 <sys-lib>lua5.1</sys-lib>
!             </if>
!             <if cond="value!='lua'">
!                 <wxlike-lib prefix="wxlua">$(value)</wxlike-lib>
!             </if>
!         </define-tag>
!     </if>
  
      <!-- shortcut for including *all* wxLua libraries, even CONTRIB wrappers -->
***************
*** 141,145 ****
  
          <wxlua-lib>wxlua</wxlua-lib>
!         <wxlua-lib>lua</wxlua-lib>
      </define-tag>
  
--- 167,171 ----
  
          <wxlua-lib>wxlua</wxlua-lib>
!         <wxlua-lib>lua</wxlua-lib>                  <!-- MUST BE LAST! -->
      </define-tag>
  
***************
*** 163,167 ****
  
          <wxlua-lib>wxlua</wxlua-lib>
!         <wxlua-lib>lua</wxlua-lib>
      </define-tag>
  
--- 189,193 ----
  
          <wxlua-lib>wxlua</wxlua-lib>
!         <wxlua-lib>lua</wxlua-lib>                  <!-- MUST BE LAST! -->
      </define-tag>