[Wxlua-commit] wxLua/build/bakefiles options.bkl, 1.3, 1.4 wxlua.bkl, 1.31, 1.32

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

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

Modified Files:
	options.bkl wxlua.bkl 
Log Message:
win32 build fix after last commit

Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/options.bkl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** options.bkl	19 Dec 2006 21:11:59 -0000	1.3
--- options.bkl	19 Dec 2006 21:28:20 -0000	1.4
***************
*** 17,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>
  
  
--- 17,26 ----
      <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>
  
  

Index: wxlua.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wxlua.bkl	19 Dec 2006 21:11:59 -0000	1.31
--- wxlua.bkl	19 Dec 2006 21:28:20 -0000	1.32
***************
*** 34,39 ****
              <!-- generic options -->
              SHARED BUILD UNICODE
  
!             <!-- wxwidgets build selection options -->
              WX_DIR WX_VERSION WX_SHARED WX_MONOLITHIC
  
--- 34,42 ----
              <!-- generic options -->
              SHARED BUILD UNICODE
+             
+             <!-- global options -->
+             USE_SYSTEM_LUA LUA_DIR
  
!             <!-- wxWidgets build selection options -->
              WX_DIR WX_VERSION WX_SHARED WX_MONOLITHIC