[Wxlua-commit] wxLua/build/bakefiles options.bkl, 1.10, 1.11 wxlua.bkl, 1.39, 1.40 wxluabase.bkl, 1.45, 1.46

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

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

Modified Files:
	options.bkl wxlua.bkl wxluabase.bkl 
Log Message:
Updated bakefiles to separate LUA_DIR to LUA_INCLUDE_DIR and LUA_LIB_DIR so
a system Lua's include path can be specified exactly.
Used bakefile-0.2.3


Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/options.bkl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** options.bkl	24 Apr 2007 14:39:52 -0000	1.10
--- options.bkl	15 Jan 2008 18:37:27 -0000	1.11
***************
*** 21,30 ****
      <set var="USE_APPS_DEFAULT">1</set>
      <set var="USE_SYSTEM_LUA_DEFAULT">0</set>
!     
      <!-- don't touch this default! it's used also when using USE_SYSTEM_LUA==0
           and thus it's very important to keep it set so that the built-in lua
           is used
      -->
!     <set var="LUA_DIR_DEFAULT">..\..\..\modules\lua</set>
  
  
--- 21,31 ----
      <set var="USE_APPS_DEFAULT">1</set>
      <set var="USE_SYSTEM_LUA_DEFAULT">0</set>
! 
      <!-- don't touch this default! it's used also when using USE_SYSTEM_LUA==0
           and thus it's very important to keep it set so that the built-in lua
           is used
      -->
!     <set var="LUA_INCLUDE_DIR_DEFAULT">..\..\..\modules\lua\include</set>
!     <set var="LUA_LIB_DIR_DEFAULT">..\..\..\modules\lua\lib</set>
  
  
***************
*** 124,130 ****
          </option>
  
!         <option name="LUA_DIR" category="path">
!             <default-value>$(LUA_DIR_DEFAULT)</default-value>
!             <description>The path to the Lua library</description>
          </option>
  
--- 125,136 ----
          </option>
  
!         <option name="LUA_INCLUDE_DIR" category="path">
!             <default-value>$(LUA_INCLUDE_DIR_DEFAULT)</default-value>
!             <description>The path to the Lua library includes</description>
!         </option>
! 
!         <option name="LUA_LIB_DIR" category="path">
!             <default-value>$(LUA_LIB_DIR_DEFAULT)</default-value>
!             <description>The path to the Lua library libs</description>
          </option>
  
***************
*** 159,163 ****
          <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>
  
--- 165,170 ----
          <set var="USE_APPS">$(USE_APPS_DEFAULT)</set>
          <set var="USE_SYSTEM_LUA">$(USE_SYSTEM_LUA_DEFAULT)</set>
!         <set var="LUA_INCLUDE_DIR">$(LUA_INCLUDE_DIR_DEFAULT)</set>
!         <set var="LUA_LIB_DIR">$(LUA_LIB_DIR_DEFAULT)</set>
      </if>
  

Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** wxluabase.bkl	14 Jan 2008 23:30:20 -0000	1.45
--- wxluabase.bkl	15 Jan 2008 18:37:27 -0000	1.46
***************
*** 234,238 ****
  
          <!-- both when we use the system lua or our own lua we need an additional include path -->
!         <include>$(LUA_DIR)/include</include>
      </template>
  
--- 234,238 ----
  
          <!-- both when we use the system lua or our own lua we need an additional include path -->
!         <include>$(LUA_INCLUDE_DIR)</include>
      </template>
  
***************
*** 262,266 ****
          <!-- 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
--- 262,266 ----
          <!-- both in case we are using system's lua or our own lua,
               we need yet another linker path -->
!         <lib-path>$(LUA_LIB_DIR)</lib-path>
  
          <!-- same technique used by wx_win32.bkl: this is a placeholder
***************
*** 286,296 ****
          also before installing the component system-wide:
      -->
!     
      <if cond="FORMAT=='autoconf'">
          <option name="RPATH_FLAGS"/>
      </if>
!     
      <define-tag name="rpath-to" rules="exe,module">
!         
          <!-- for autoconf&gnu only (see comments above): -->
  
--- 286,296 ----
          also before installing the component system-wide:
      -->
! 
      <if cond="FORMAT=='autoconf'">
          <option name="RPATH_FLAGS"/>
      </if>
! 
      <define-tag name="rpath-to" rules="exe,module">
! 
          <!-- for autoconf&gnu only (see comments above): -->
  

Index: wxlua.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** wxlua.bkl	16 Jul 2007 19:34:28 -0000	1.39
--- wxlua.bkl	15 Jan 2008 18:37:27 -0000	1.40
***************
*** 36,40 ****
  
              <!-- global options -->
!             USE_SYSTEM_LUA LUA_DIR RUNTIME_LIBS
  
              <!-- wxWidgets build selection options -->
--- 36,40 ----
  
              <!-- global options -->
!             USE_SYSTEM_LUA LUA_INCLUDE_DIR LUA_LIB_DIR RUNTIME_LIBS
  
              <!-- wxWidgets build selection options -->