[Wxlua-commit] wxLua/build/bakefiles options.bkl, 1.12, 1.13 wxlua.bkl, 1.41, 1.42

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

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

Modified Files:
	options.bkl wxlua.bkl 
Log Message:
Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything.
configure has been updated to add the option --enable-monolithic-luamodule

Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl


Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/options.bkl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** options.bkl	18 Jan 2008 03:42:59 -0000	1.12
--- options.bkl	19 Jan 2008 21:37:09 -0000	1.13
***************
*** 159,165 ****
      </if>
  
-     <!-- FIXME this var is stripped with forcing it -->
-     <set var="VARS_DONT_ELIMINATE" append="1">THREADING</set>
- 
      <if cond="TARGETING_IDE=='1'">
  
--- 159,162 ----

Index: wxlua.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** wxlua.bkl	16 Jan 2008 19:54:25 -0000	1.41
--- wxlua.bkl	19 Jan 2008 21:37:09 -0000	1.42
***************
*** 30,34 ****
  
              <!-- global options -->
!             USE_SYSTEM_LUA LUA_INCLUDE_DIR LUA_LIB_DIR RUNTIME_LIBS
  
              <!-- wxWidgets build selection options -->
--- 30,34 ----
  
              <!-- global options -->
!             USE_SYSTEM_LUA LUA_INCLUDE_DIR LUA_LIB_DIR RUNTIME_LIBS THREADING
  
              <!-- wxWidgets build selection options -->
***************
*** 41,45 ****
              USE_WXBINDADV USE_WXBINDAUI USE_WXBINDBASE USE_WXBINDCORE USE_WXBINDGL USE_WXBINDHTML
              USE_WXBINDMEDIA USE_WXBINDNET USE_WXBINDRICHTEXT USE_WXBINDSTC USE_WXBINDXML USE_WXBINDXRC
!             USE_WXLUADEBUG USE_WXLUASOCKET USE_LUAMODULE INSTALL_CUSTOM_WXBIND
          </set>
      </if>
--- 41,45 ----
              USE_WXBINDADV USE_WXBINDAUI USE_WXBINDBASE USE_WXBINDCORE USE_WXBINDGL USE_WXBINDHTML
              USE_WXBINDMEDIA USE_WXBINDNET USE_WXBINDRICHTEXT USE_WXBINDSTC USE_WXBINDXML USE_WXBINDXRC
!             USE_WXLUADEBUG USE_WXLUASOCKET USE_LUAMODULE MONOLITHIC_LUAMODULE INSTALL_CUSTOM_WXBIND
          </set>
      </if>