[Wxlua-commit] wxLua/modules/build/bakefiles modules.bkl, 1.50, 1.51 options.bkl, 1.15, 1.16

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

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

Modified Files:
	modules.bkl options.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/modules/build/bakefiles/options.bkl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** options.bkl	16 Jul 2007 19:34:32 -0000	1.15
--- options.bkl	19 Jan 2008 21:37:10 -0000	1.16
***************
*** 36,39 ****
--- 36,40 ----
      <set var="USE_WXLUASOCKET_DEFAULT">1</set>
      <set var="USE_LUAMODULE_DEFAULT">1</set>
+     <set var="MONOLITHIC_LUAMODULE_DEFAULT">0</set>
  
  
***************
*** 137,140 ****
--- 138,147 ----
          </option>
  
+         <option name="MONOLITHIC_LUAMODULE">
+             <values>0,1</values>
+             <default-value>$(MONOLITHIC_LUAMODULE_DEFAULT)</default-value>
+             <description>Build a monolithic Lua module ?</description>
+         </option>
+ 
          <if cond="TARGETING_UNIX=='1'">
              <option name="INSTALL_CUSTOM_WXBIND">
***************
*** 167,170 ****
--- 174,178 ----
          <set var="USE_WXLUASOCKET">1</set>
          <set var="USE_LUAMODULE">1</set>
+         <set var="MONOLITHIC_LUAMODULE">1</set>
  
          <set var="INSTALL_CUSTOM_WXBIND">0</set>

Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** modules.bkl	15 Jan 2008 00:03:02 -0000	1.50
--- modules.bkl	19 Jan 2008 21:37:10 -0000	1.51
***************
*** 299,303 ****
  
      <!-- the luamodule: for lots of reasons it can be built only when SHARED==1 -->
!     <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'">
          <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname>
  
--- 299,303 ----
  
      <!-- the luamodule: for lots of reasons it can be built only when SHARED==1 -->
!     <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1' and MONOLITHIC_LUAMODULE=='0'">
          <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname>
  
***************
*** 305,310 ****
          <install-to>$(LIBDIR)/lua/5.1</install-to>
  
-         <sources>$(LUAMODULE_SRC)</sources>
          <headers>$(LUAMODULE_HDR)</headers>
          <define>WXMAKINGDLL_LUAMODULE</define>
  
--- 305,310 ----
          <install-to>$(LIBDIR)/lua/5.1</install-to>
  
          <headers>$(LUAMODULE_HDR)</headers>
+         <sources>$(LUAMODULE_SRC)</sources>
          <define>WXMAKINGDLL_LUAMODULE</define>
  
***************
*** 336,339 ****
--- 336,381 ----
      </module>
  
+     <!-- the luamodule: for lots of reasons it can be built only when SHARED==1 -->
+     <module id="mod_luamodule_mono" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1' and MONOLITHIC_LUAMODULE=='1'">
+         <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname>
+ 
+         <!-- $libdir/lua/5.1 looks to be the standard folder for lua modules... -->
+         <install-to>$(LIBDIR)/lua/5.1</install-to>
+ 
+         <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include>
+ 
+         <headers>$(LUAMODULE_HDR)</headers>
+         <define>WXMAKINGDLL_LUAMODULE</define>
+ 
+         <sources>
+             $(LUAMODULE_SRC)
+             $(WXBINDADV_SRC)
+             $(WXBINDAUI_SRC)
+             $(WXBINDBASE_SRC)
+             $(WXBINDCORE_SRC)
+             $(WXBINDGL_SRC)
+             $(WXBINDHTML_SRC)
+             $(WXBINDMEDIA_SRC)
+             $(WXBINDNET_SRC)
+             $(WXBINDRICHTEXT_SRC)
+             $(WXBINDSTC_SRC)
+             $(WXBINDXML_SRC)
+             $(WXBINDXRC_SRC)
+             $(WXLUASOCKET_SRC)
+             $(WXLUADEBUG_SRC)
+             $(WXLUA_SRC)
+         </sources>
+ 
+         <!-- It's important to keep the module name 'wx' to make require("wx") work -->
+         <dllname>wx</dllname>
+ 
+         <!-- we won't use <wxlua-allstdlibs> because it links to the non-verbatim
+              version of lua, while we need the verbatim one (lua5.1.so/.dll) -->
+ 
+         <wxlua-lib>lua</wxlua-lib>
+ 
+         <wx-alllibs-req-bywxlua/>
+     </module>
+ 
  
      <!-- since all the previous targets would generate each one a different DSP project