[Wxlua-commit] wxLua/modules/build/bakefiles modules.bkl,1.33,1.34

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

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

Modified Files:
	modules.bkl 
Log Message:
changed luamodule to link against verbatim lua and output result in DLL dir

Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** modules.bkl	20 May 2006 14:17:44 -0000	1.33
--- modules.bkl	20 May 2006 20:17:56 -0000	1.34
***************
*** 44,51 ****
      <!-- ==================================================================  -->
  
!     <!-- the VERBATIM lua lib & dll -->
      <wxlua_stdlib id="verbatimlua_lib" cond="SHARED=='0'">
          <module-name>LUA</module-name>
!         <!-- WE WANT THE VERBATIM VERSION: <define>WXLUA_LUA_NEWTHREAD</define> -->
          <libname>lua5.1</libname>
  
--- 44,58 ----
      <!-- ==================================================================  -->
  
!     <!-- the VERBATIM lua lib & dll: these are needed for linking the "mod_luamodule"
!          (see below); in fact, trying to link statically "mod_luamodule" with lua core
!          is not a Good Thing ! See http://lua-users.org/wiki/BuildingModules to understand
!          why (basically because lua core gets duplicated).
! 
!          Instead we need a verbatim lua DLL to create the "wx.so/.dll" DLL without any
!          dangerous duplication of code.
!     -->
      <wxlua_stdlib id="verbatimlua_lib" cond="SHARED=='0'">
          <module-name>LUA</module-name>
!         <!-- WE WANT THE VERBATIM VERSION: don't enable <define>WXLUA_LUA_NEWTHREAD</define> -->
          <libname>lua5.1</libname>
  
***************
*** 56,60 ****
      <wxlua_stddll id="verbatimlua_dll" cond="SHARED=='1'">
          <module-name>LUA</module-name>
!         <!-- WE WANT THE VERBATIM VERSION: <define>WXLUA_LUA_NEWTHREAD</define> -->
          <libname>lua5.1</libname>
          <dllname>lua5.1</dllname>
--- 63,67 ----
      <wxlua_stddll id="verbatimlua_dll" cond="SHARED=='1'">
          <module-name>LUA</module-name>
!         <!-- WE WANT THE VERBATIM VERSION: don't enable <define>WXLUA_LUA_NEWTHREAD</define> -->
          <libname>lua5.1</libname>
          <dllname>lua5.1</dllname>
***************
*** 96,103 ****
--- 103,112 ----
      <wxlua_stdlib id="wxlua_lib" cond="SHARED=='0'">
          <module-name>WXLUA</module-name>
+         <define>WXLUA_LUA_NEWTHREAD</define>
      </wxlua_stdlib>
      <wxlua_stddll id="wxlua_dll" cond="SHARED=='1'">
          <module-name>WXLUA</module-name>
          <wxlua-lib>lua</wxlua-lib>
+         <define>WXLUA_LUA_NEWTHREAD</define>
      </wxlua_stddll>
  
***************
*** 147,151 ****
      <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'">
          <srcdir>$(WXLUA_SOURCEDIR)</srcdir>
!         <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname>
  
          <!-- $libdir/lua/5.1 looks to be the standard folder for lua modules... -->
--- 156,160 ----
      <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'">
          <srcdir>$(WXLUA_SOURCEDIR)</srcdir>
!         <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname>
  
          <!-- $libdir/lua/5.1 looks to be the standard folder for lua modules... -->
***************
*** 158,162 ****
          <dllname>wx</dllname>
  
!         <wxlua-allstdlibs/>
          <wx-alllibs-req-bywxlua/>
      </module>
--- 167,178 ----
          <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>wxlua</wxlua-lib>
!         <wxlua-lib>wxbind</wxlua-lib>
!         <wxlua-lib>wxluasocket</wxlua-lib>
!         <wxlua-lib>wxluadebug</wxlua-lib>
!         <sys-lib>lua5.1</sys-lib>
! 
          <wx-alllibs-req-bywxlua/>
      </module>