[Wxlua-commit] wxLua/build/bakefiles wxhacks.bkl,1.3,1.4 wxluabase.bkl,1.9,1.10

[Francesco M. <fr...@us...>]

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

Modified Files:
	wxhacks.bkl wxluabase.bkl 
Log Message:
updated bakefiles for new wxbindstc module

Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** wxluabase.bkl	29 Jan 2006 15:45:40 -0000	1.9
--- wxluabase.bkl	2 Feb 2006 18:46:43 -0000	1.10
***************
*** 124,135 ****
      <define-tag name="__wxlua-req-libs-point" rules="exe,dll,module"/>
  
!     <!-- our <wxlua-lib> tag accepts the following values:
! 
!                  'wxluasocket', 'wxluadebug', 'wxlua', 'wxbind', 'lua'
! 
!          as these are the modules built by this project.
      -->
      <define-tag name="wxlua-lib" rules="exe,dll,module">
!         <if cond="value not in [ 'wxluasocket', 'wxluadebug', 'wxlua', 'wxbind', 'lua' ]">
              <error>Invalid wxlua-lib value !</error>
          </if>
--- 124,132 ----
      <define-tag name="__wxlua-req-libs-point" rules="exe,dll,module"/>
  
!     <!-- the <wxlua-lib> tag accepts only those values which refer to a wxLua module name.
!          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', 'wxbindstc', 'wxbind', 'lua' ]">
              <error>Invalid wxlua-lib value !</error>
          </if>
***************
*** 142,145 ****
--- 139,152 ----
      </define-tag>
  
+     <!-- shortcut for including *all* wxLua libraries -->
+     <define-tag name="wxlua-alllibs" rules="exe,dll,module">
+         <wxlua-lib>wxluasocket</wxlua-lib>
+         <wxlua-lib>wxluadebug</wxlua-lib>
+         <wxlua-lib>wxlua</wxlua-lib>
+         <wxlua-lib>wxbindstc</wxlua-lib>
+         <wxlua-lib>wxbind</wxlua-lib>
+         <wxlua-lib>lua</wxlua-lib>
+     </define-tag>
+ 
      <!-- this tag includes the wxLua required libraries, it will be defined
          later in options.bkl -->
***************
*** 172,176 ****
      <!-- a template for wxLua-based exe/dll targets -->
      <template id="wxlua" template="wx,wxlua-base">
!         <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path>
  
          <!-- same technique used by wx_win32.bkl: this is a placeholder
--- 179,189 ----
      <!-- a template for wxLua-based exe/dll targets -->
      <template id="wxlua" template="wx,wxlua-base">
!         <if cond="TARGETING_WIN32=='1'">
!             <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path>
!         </if>
!         <if cond="TARGETING_WIN32=='0'">
!             <lib-path>$(top_builddir)$(WXLUA_OUTPUT_FOLDER)</lib-path>
!         </if>
! 
  
          <!-- same technique used by wx_win32.bkl: this is a placeholder

Index: wxhacks.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxhacks.bkl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxhacks.bkl	28 Jan 2006 21:01:07 -0000	1.3
--- wxhacks.bkl	2 Feb 2006 18:46:43 -0000	1.4
***************
*** 113,116 ****
--- 113,130 ----
  
  
+     <!-- A simple tag which acts as shortcut for including in the list of libraries to link
+          *all* wxWidgets libraries. -->
+     <define-tag name="wx-alllibs" rules="exe,dll,module">
+         <wx-lib>xrc</wx-lib>
+         <wx-lib>html</wx-lib>
+         <wx-lib>media</wx-lib>
+         <wx-lib>adv</wx-lib>
+         <wx-lib>net</wx-lib>
+         <wx-lib>xml</wx-lib>
+         <wx-lib>core</wx-lib>
+         <wx-lib>base</wx-lib>
+     </define-tag>
+ 
+ 
      <!-- A simple tag which helps you to define a library name using the same rules used
           by wxWidgets. Use the 'prefix' attribute to add your lib's prefix.