[Wxlua-commit] wxLua/build/bakefiles options.bkl, 1.2, 1.3 wxlua.bkl, 1.30, 1.31 wxluabase.bkl, 1.29, 1.30

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

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

Modified Files:
	options.bkl wxlua.bkl wxluabase.bkl 
Log Message:
now BUILDDIR is set exactly like the wxWidgets builddir
system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1
changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use 
external lua
Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting 
lua library (when installed).
Fixed the "samples" directory copy when srcdir==.



Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/options.bkl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** options.bkl	8 Mar 2006 00:06:17 -0000	1.2
--- options.bkl	19 Dec 2006 21:11:59 -0000	1.3
***************
*** 16,20 ****
  
      <set var="USE_APPS_DEFAULT">1</set>
! 
  
  
--- 16,21 ----
  
      <set var="USE_APPS_DEFAULT">1</set>
!     <set var="USE_SYSTEM_LUA_DEFAULT">0</set>
!     <set var="LUA_DIR_DEFAULT">modules$(DIRSEP)lua</set>
  
  
***************
*** 30,33 ****
--- 31,45 ----
              <description>Should the wxLua applications be compiled ?</description>
          </option>
+ 
+         <option name="USE_SYSTEM_LUA">
+             <values>0,1</values>
+             <default-value>$(USE_SYSTEM_LUA_DEFAULT)</default-value>
+             <description>Should wxLua use the system-wide Lua library ?</description>
+         </option>
+ 
+         <option name="LUA_DIR" category="path">
+             <default-value>$(LUA_DIR_DEFAULT)</default-value>
+             <description>The path to the Lua library</description>
+         </option>
      </if>
  
***************
*** 37,40 ****
--- 49,54 ----
               the default values -->
          <set var="USE_APPS">$(USE_APPS_DEFAULT)</set>
+         <set var="USE_SYSTEM_LUA">$(USE_SYSTEM_LUA_DEFAULT)</set>
+         <set var="LUA_DIR">$(LUA_DIR_DEFAULT)</set>
      </if>
  

Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** wxluabase.bkl	17 Dec 2006 11:32:21 -0000	1.29
--- wxluabase.bkl	19 Dec 2006 21:11:59 -0000	1.30
***************
*** 51,57 ****
  
  
!     <!-- This file contains the declaration of the WX & WX-LIB templates   -->
      <include file="wxhacks.bkl"/>
  
  
  
--- 51,64 ----
  
  
!     <!-- ================================================================== -->
!     <!--                            OPTIONS                                 -->
!     <!-- ================================================================== -->
! 
!     <!-- This file contains the declaration of the WX & WX-LIB templates and
!          of all WX_* options -->
      <include file="wxhacks.bkl"/>
  
+     <!-- the global options -->
+     <include file="options.bkl"/>
  
  
***************
*** 167,174 ****
              <error>Invalid wxlua-lib value !</error>
          </if>
!         <if cond="TARGETING_WIN32=='1'">
              <sys-lib>wxlua_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
          </if>
!         <if cond="TARGETING_WIN32=='0'">
              <sys-lib>wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib>
          </if>
--- 174,184 ----
              <error>Invalid wxlua-lib value !</error>
          </if>
!         <if cond="value=='lua'">
!             <sys-lib>lua5.1</sys-lib>
!         </if>
!         <if cond="value!='lua' and TARGETING_WIN32=='1'">
              <sys-lib>wxlua_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
          </if>
!         <if cond="value!='lua' and TARGETING_WIN32=='0'">
              <sys-lib>wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib>
          </if>
***************
*** 221,224 ****
--- 231,235 ----
           templates specific for wxlua-based apps -->
      <template id="wxlua-base" template="wxbase">
+ 
          <!-- an additional include & link path are required not only on win32 but also
               on *nix: when compiling the samples or the library the user has not
***************
*** 228,231 ****
--- 239,245 ----
          <!-- this is for art/* files; the ./ is a little hack to avoid formatIfEmpty errors -->
          <include>./$(WXLUA_BASEDIR)</include>
+ 
+         <!-- both when we use the system lua or our own lua we need an additional include path -->
+         <include>$(LUA_DIR)/include</include>
      </template>
  
***************
*** 244,247 ****
--- 258,264 ----
          </if>
  
+         <!-- both in case we are using system's lua or our own lua,
+              we need yet another linker path -->
+         <lib-path>$(LUA_DIR)/lib</lib-path>
  
          <!-- same technique used by wx_win32.bkl: this is a placeholder

Index: wxlua.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wxlua.bkl	17 Dec 2006 10:47:41 -0000	1.30
--- wxlua.bkl	19 Dec 2006 21:11:59 -0000	1.31
***************
*** 17,23 ****
      <include file="wxluabase.bkl"/>
  
-     <!-- This file contains the list of global WXLUA options        -->
-     <include file="options.bkl"/>
- 
      <!-- This file contains the list of MODULES options             -->
      <include file="../../modules/build/bakefiles/options.bkl"/>
--- 17,20 ----