[Wxlua-commit] wxLua/modules/build/bakefiles modules.bkl,1.9,1.10 options.bkl,1.2,1.3 sources.bkl,1.6,1.7

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

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

Modified Files:
	modules.bkl options.bkl sources.bkl 
Log Message:
formatting for bakfiles
added USE_WXLUAAPP, USE_WXLUAEDITAPP


Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** options.bkl	12 Jun 2005 21:21:10 -0000	1.2
--- options.bkl	24 Nov 2005 21:34:16 -0000	1.3
***************
*** 5,40 ****
  
  
! <!--                                                                -->
! <!--                 WXLUA MODULES OPTIONS BAKEFILE                 -->
! <!--                                                                -->
  
! <makefile>  
  
!     <!--                                                                     -->
!     <!--                The list of wxLua OPTIONS DEFAULTS                   -->
!     <!--                                                                     -->
  
      <!-- module enable/disable option defaults -->
!     <set var="USE_WXLUADEBUG_DEFAULT">1</set>
!     <set var="USE_WXLUASOCKET_DEFAULT">1</set>
!    
!         
!         
  
!     <!--                                                                     -->
!     <!--                        The list of wxLua OPTIONS                    -->
!     <!--                                                                     -->
  
      <!-- module enable/disable options -->
      <if cond="TARGETING_IDE=='0'">
!         <option name="USE_WXLUADEBUG">
              <values>0,1</values>
!             <default-value>$(USE_WXLUADEBUG_DEFAULT)</default-value>
              <description>Does the wxLua debug support need to be compiled ?</description>
          </option>
!         
!         <option name="USE_WXLUASOCKET">
              <values>0,1</values>
!             <default-value>$(USE_WXLUASOCKET_DEFAULT)</default-value>
              <description>Does the wxLua socket support need to be compiled ?</description>
          </option>
--- 5,38 ----
  
  
! <!-- ====================================================================== -->
! <!--                 WXLUA MODULES OPTIONS BAKEFILE                         -->
! <!-- ====================================================================== -->
  
! <makefile>
  
!     <!-- ================================================================== -->
!     <!--                The list of wxLua module OPTIONS DEFAULTS           -->
!     <!-- ================================================================== -->
  
      <!-- module enable/disable option defaults -->
!     <set var="USE_WXLUADEBUGLIB_DEFAULT">1</set>
!     <set var="USE_WXLUASOCKETLIB_DEFAULT">1</set>
  
! 
!     <!-- ================================================================== -->
!     <!--                        The list of wxLua module OPTIONS            -->
!     <!-- ================================================================== -->
  
      <!-- module enable/disable options -->
      <if cond="TARGETING_IDE=='0'">
!         <option name="USE_WXLUADEBUGLIB">
              <values>0,1</values>
!             <default-value>$(USE_WXLUADEBUGLIB_DEFAULT)</default-value>
              <description>Does the wxLua debug support need to be compiled ?</description>
          </option>
! 
!         <option name="USE_WXLUASOCKETLIB">
              <values>0,1</values>
!             <default-value>$(USE_WXLUASOCKETLIB_DEFAULT)</default-value>
              <description>Does the wxLua socket support need to be compiled ?</description>
          </option>
***************
*** 42,54 ****
      </if>
      <if cond="TARGETING_IDE=='1'">
!         
          <!-- here we are forced to use all '1' because otherwise Bakefile would simply
               skip some target and do not generate DSP files for that one.
               We don't want this: we want to generate DSP for all modules: the choice
               of the modules to compile will be left to the user... -->
!         <set var="USE_WXLUADEBUG">1</set>
!         <set var="USE_WXLUASOCKET">1</set>
      </if>
!     
!     
  </makefile>
--- 40,52 ----
      </if>
      <if cond="TARGETING_IDE=='1'">
! 
          <!-- here we are forced to use all '1' because otherwise Bakefile would simply
               skip some target and do not generate DSP files for that one.
               We don't want this: we want to generate DSP for all modules: the choice
               of the modules to compile will be left to the user... -->
!         <set var="USE_WXLUADEBUGLIB">1</set>
!         <set var="USE_WXLUASOCKETLIB">1</set>
      </if>
! 
! 
  </makefile>

Index: sources.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/sources.bkl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sources.bkl	23 Nov 2005 20:33:15 -0000	1.6
--- sources.bkl	24 Nov 2005 21:34:16 -0000	1.7
***************
*** 1,153 ****
! <?xml version="1.0" ?>     	
! <makefile>                 	
!  					
!     <!--                                        -->	
!     <!--               build module                -->	
!     <!--                                        -->	
!     <set var="build_src">					
!     </set>                    				
!  								
!     <set var="build_hdr">       				
!     </set>                    				
!  								
!  								
!     <!--                                        -->	
!     <!--               lua module                -->	
!     <!--                                        -->	
!     <set var="lua_src">					
!         lua/src/lapi.c 	
!         lua/src/lcode.c 	
!         lua/src/ldebug.c 	
  <!--         lua/src/ldllmain.c 	 -->
!         lua/src/ldo.c 	
!         lua/src/ldump.c 	
!         lua/src/lfunc.c 	
!         lua/src/lgc.c 	
!         lua/src/llex.c 	
!         lua/src/lmem.c 	
!         lua/src/lobject.c 	
!         lua/src/lopcodes.c 	
!         lua/src/lparser.c 	
!         lua/src/lstate.c 	
!         lua/src/lstring.c 	
!         lua/src/ltable.c 	
!         lua/src/ltests.c 	
!         lua/src/ltm.c 	
!         lua/src/lundump.c 	
!         lua/src/lvm.c 	
!         lua/src/lzio.c 	
!     </set>                    				
!  								
!     <set var="lua_hdr">       				
!          lua/include/lauxlib.h 
!          lua/include/lua.h 
!          lua/include/lualib.h 
!          lua/include/luathread.h 
!     </set>                    				
!  								
!  								
!     <!--                                        -->	
!     <!--               wxbind module                -->	
!     <!--                                        -->	
!     <set var="wxbind_src">					
!         wxbind/src/appframe.cpp 	
!         wxbind/src/clipdrag.cpp 	
!         wxbind/src/config.cpp 	
!         wxbind/src/controls.cpp 	
!         wxbind/src/data.cpp 	
!         wxbind/src/datetime.cpp 	
!         wxbind/src/defsutil.cpp 	
!         wxbind/src/dialogs.cpp 	
!         wxbind/src/event.cpp 	
!         wxbind/src/file.cpp 	
!         wxbind/src/fl.cpp 	
!         wxbind/src/gdi.cpp 	
!         wxbind/src/geometry.cpp 	
!         wxbind/src/grid.cpp 	
!         wxbind/src/help.cpp 	
!         wxbind/src/html.cpp 	
!         wxbind/src/image.cpp 	
!         wxbind/src/mdi.cpp 	
!         wxbind/src/menutool.cpp 	
!         wxbind/src/plot.cpp 	
!         wxbind/src/print.cpp 	
!         wxbind/src/regex.cpp 	
!         wxbind/src/sizer.cpp 	
!         wxbind/src/socket.cpp 	
!         wxbind/src/stc.cpp 	
!         wxbind/src/thread.cpp 	
!         wxbind/src/wave.cpp 	
!         wxbind/src/windows.cpp 	
!         wxbind/src/wxlhtmlwin.cpp 	
!         wxbind/src/wxlprint.cpp 	
!         wxbind/src/wxlua.cpp 	
!         wxbind/src/wx_builtin.cpp 	
!         wxbind/src/wx_class.cpp 	
!         wxbind/src/wx_define.cpp 	
!         wxbind/src/wx_event.cpp 	
!         wxbind/src/wx_object.cpp 	
!         wxbind/src/xml.cpp 	
!     </set>                    				
!  								
!     <set var="wxbind_hdr">       				
!          wxbind/include/wxbind.h 
!          wxbind/include/wxlhtmlwin.h 
!          wxbind/include/wxlprint.h 
!     </set>                    				
!  								
!  								
!     <!--                                        -->	
!     <!--               wxlua module                -->	
!     <!--                                        -->	
!     <set var="wxlua_src">					
!         wxlua/src/internal.cpp 	
!         wxlua/src/interp.cpp 	
!         wxlua/src/library.cpp 	
!     </set>                    				
!  								
!     <set var="wxlua_hdr">       				
!          wxlua/include/callback.h 
!          wxlua/include/defs.h 
!          wxlua/include/internal.h 
!          wxlua/include/interp.h 
!          wxlua/include/library.h 
!          wxlua/include/wxlua.h 
!     </set>                    				
!  								
!  								
!     <!--                                        -->	
!     <!--               wxluadebug module                -->	
!     <!--                                        -->	
!     <set var="wxluadebug_src">					
!         wxluadebug/src/debug.cpp 	
!         wxluadebug/src/splttree.cpp 	
!         wxluadebug/src/staktree.cpp 	
!     </set>                    				
!  								
!     <set var="wxluadebug_hdr">       				
!          wxluadebug/include/debug.h 
!          wxluadebug/include/splttree.h 
!          wxluadebug/include/staktree.h 
!     </set>                    				
!  								
!  								
!     <!--                                        -->	
!     <!--               wxluasocket module                -->	
!     <!--                                        -->	
!     <set var="wxluasocket_src">					
!         wxluasocket/src/debugio.cpp 	
!         wxluasocket/src/dserver.cpp 	
!         wxluasocket/src/dtarget.cpp 	
!         wxluasocket/src/socket.cpp 	
!     </set>                    				
!  								
!     <set var="wxluasocket_hdr">       				
!          wxluasocket/include/debugio.h 
!          wxluasocket/include/dserver.h 
!          wxluasocket/include/dtarget.h 
!          wxluasocket/include/socket.h 
!     </set>                    				
!  								
!  								
!  
! </makefile>               
--- 1,175 ----
! <?xml version="1.0" ?>
! 
! <!-- ====================================================================== -->
! <!--                    WXLUA MODULES SOURCES BAKEFILE                      -->
! <!-- ====================================================================== -->
! 
! 
! <makefile>
! 
!     <!-- ================================================================== -->
!     <!--               build module                                         -->
!     <!-- ================================================================== -->
!     <set var="build_src">
!     </set>
! 
!     <set var="build_hdr">
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- lua module : wxLua/modules/lua                                     -->
!     <!-- ================================================================== -->
!     <set var="lua_src">
!         lua/src/lapi.c
!         lua/src/lcode.c
!         lua/src/ldebug.c
  <!--         lua/src/ldllmain.c 	 -->
!         lua/src/ldo.c
!         lua/src/ldump.c
!         lua/src/lfunc.c
!         lua/src/lgc.c
!         lua/src/llex.c
!         lua/src/lmem.c
!         lua/src/lobject.c
!         lua/src/lopcodes.c
!         lua/src/lparser.c
!         lua/src/lstate.c
!         lua/src/lstring.c
!         lua/src/ltable.c
!         lua/src/ltests.c
!         lua/src/ltm.c
!         lua/src/lundump.c
!         lua/src/lvm.c
!         lua/src/lzio.c
!     </set>
! 
!     <set var="lua_hdr">
!          lua/include/lauxlib.h
!          lua/include/lua.h
!          lua/include/lualib.h
!          lua/include/luathread.h
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- lua module : wxLua/modules/lua                                     -->
!     <!-- ================================================================== -->
!     <set var="lualib_src">
!         lua/src/lib/lauxlib.c
!         lua/src/lib/lbaselib.c
!         lua/src/lib/ldblib.c
!         lua/src/lib/liolib.c
!         lua/src/lib/lmathlib.c
!         lua/src/lib/loadlib.c
!         lua/src/lib/lstrlib.c
!         lua/src/lib/ltablib.c
!     </set>
! 
!     <set var="lualib_hdr">
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- wxbind module : wxLua/modules/wxbind                               -->
!     <!-- ================================================================== -->
!     <set var="wxbind_src">
!         wxbind/src/appframe.cpp
!         wxbind/src/clipdrag.cpp
!         wxbind/src/config.cpp
!         wxbind/src/controls.cpp
!         wxbind/src/data.cpp
!         wxbind/src/datetime.cpp
!         wxbind/src/defsutil.cpp
!         wxbind/src/dialogs.cpp
!         wxbind/src/event.cpp
!         wxbind/src/file.cpp
!         wxbind/src/fl.cpp
!         wxbind/src/gdi.cpp
!         wxbind/src/geometry.cpp
!         wxbind/src/grid.cpp
!         wxbind/src/help.cpp
!         wxbind/src/html.cpp
!         wxbind/src/image.cpp
!         wxbind/src/mdi.cpp
!         wxbind/src/menutool.cpp
!         wxbind/src/plot.cpp
!         wxbind/src/print.cpp
!         wxbind/src/regex.cpp
!         wxbind/src/sizer.cpp
!         wxbind/src/socket.cpp
!         wxbind/src/stc.cpp
!         wxbind/src/thread.cpp
!         wxbind/src/wave.cpp
!         wxbind/src/windows.cpp
!         wxbind/src/wxlhtmlwin.cpp
!         wxbind/src/wxlprint.cpp
!         wxbind/src/wxlua.cpp
!         wxbind/src/wx_builtin.cpp
!         wxbind/src/wx_class.cpp
!         wxbind/src/wx_define.cpp
!         wxbind/src/wx_event.cpp
!         wxbind/src/wx_object.cpp
!         wxbind/src/xml.cpp
!     </set>
! 
!     <set var="wxbind_hdr">
!          wxbind/include/wxbind.h
!          wxbind/include/wxlhtmlwin.h
!          wxbind/include/wxlprint.h
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- wxlua module : wxLua/modules/wxlua                                 -->
!     <!-- ================================================================== -->
!     <set var="wxlua_src">
!         wxlua/src/internal.cpp
!         wxlua/src/interp.cpp
!         wxlua/src/library.cpp
!     </set>
! 
!     <set var="wxlua_hdr">
!          wxlua/include/callback.h
!          wxlua/include/defs.h
!          wxlua/include/internal.h
!          wxlua/include/interp.h
!          wxlua/include/library.h
!          wxlua/include/wxlua.h
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- wxluadebug module : wxLua/modules/wxluadebug                       -->
!     <!-- ================================================================== -->
!     <set var="wxluadebug_src">
!         wxluadebug/src/debug.cpp
!         wxluadebug/src/splttree.cpp
!         wxluadebug/src/staktree.cpp
!     </set>
! 
!     <set var="wxluadebug_hdr">
!          wxluadebug/include/debug.h
!          wxluadebug/include/splttree.h
!          wxluadebug/include/staktree.h
!     </set>
! 
! 
!     <!-- ================================================================== -->
!     <!-- wxluasocket module : wxLua/modules/wxluasocket                     -->
!     <!-- ================================================================== -->
!     <set var="wxluasocket_src">
!         wxluasocket/src/debugio.cpp
!         wxluasocket/src/dserver.cpp
!         wxluasocket/src/dtarget.cpp
!         wxluasocket/src/socket.cpp
!     </set>
! 
!     <set var="wxluasocket_hdr">
!          wxluasocket/include/debugio.h
!          wxluasocket/include/dserver.h
!          wxluasocket/include/dtarget.h
!          wxluasocket/include/socket.h
!     </set>
! 
! </makefile>

Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** modules.bkl	23 Nov 2005 20:33:15 -0000	1.9
--- modules.bkl	24 Nov 2005 21:34:16 -0000	1.10
***************
*** 5,15 ****
  
  
! <!--                                                                -->
! <!--                    WXLUA BAKEFILE                              -->
! <!--                                                                -->
! <!--    The bakefile used to build all the modules.                 -->
! <!--                                                                -->
  
! <makefile>  
  
      <!-- This is a bakefile, that is, a generic template used to    -->
--- 5,15 ----
  
  
! <!-- ====================================================================== -->
! <!--                    WXLUA BAKEFILE                                      -->
! <!--                                                                        -->
! <!--    The bakefile used to build all the modules.                         -->
! <!-- ====================================================================== -->
  
! <makefile>
  
      <!-- This is a bakefile, that is, a generic template used to    -->
***************
*** 23,82 ****
  
  
  
-     <!--                                                                     -->
-     <!--                               SOURCE LIST                           -->
-     <!--                                                                     -->
-     
      <!-- This one contains the lists of all source & header files   -->
      <include file="sources.bkl"/>
-   
-     <set var="lualib_src">            
-     lua/src/lib/lauxlib.c 
-     lua/src/lib/lbaselib.c 
-     lua/src/lib/ldblib.c 
-     lua/src/lib/liolib.c 
-     lua/src/lib/lmathlib.c 
-     lua/src/lib/loadlib.c 
-     lua/src/lib/lstrlib.c 
-     lua/src/lib/ltablib.c 
-     </set>       
-     <set var="lualib_hdr"/>      
- 
  
  
!     <!--                                                                     -->
!     <!--                               VARIABLES                             -->
!     <!--                                                                     -->
! 
  
!     <!-- All the source files & header files linked above are relative to our base dir -->  
      <if cond="FORMAT!='autoconf'"><set var="WXLUA_MODULEDIR">..$(DIRSEP)..</set></if>
      <if cond="FORMAT=='autoconf'"><set var="WXLUA_MODULEDIR">.</set></if>
      <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)$(DIRSEP)..</set>
!     
      <!-- Put all the objects files generated by         -->
      <!-- the compilation in a subfolder of BUILD        -->
!     <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if> 
! 
!     
  
  
  
-     <!--                                                                     -->
-     <!--                        The list of wxLua OPTIONS                    -->
-     <!--                                                                     -->
-     
      <!-- modules-specific options -->
      <include file="options.bkl"/>
-     
- 
  
  
  
-     <!--                                                                     -->
-     <!--                             NEW RULES                               -->
-     <!--  with these ones, each module/sample target takes few lines only    -->
-     <!--                                                                     -->
-     
      <define-rule name="wxlua_lib" extends="lib">
          <template>
--- 23,61 ----
  
  
+     <!-- ================================================================== -->
+     <!--                               SOURCE LIST                          -->
+     <!-- ================================================================== -->
  
      <!-- This one contains the lists of all source & header files   -->
      <include file="sources.bkl"/>
  
  
!     <!-- ================================================================== -->
!     <!--                               VARIABLES                            -->
!     <!-- ================================================================== -->
  
!     <!-- All the source files & header files linked above are relative to our base dir -->
      <if cond="FORMAT!='autoconf'"><set var="WXLUA_MODULEDIR">..$(DIRSEP)..</set></if>
      <if cond="FORMAT=='autoconf'"><set var="WXLUA_MODULEDIR">.</set></if>
      <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)$(DIRSEP)..</set>
! 
      <!-- Put all the objects files generated by         -->
      <!-- the compilation in a subfolder of BUILD        -->
!     <if cond="FORMAT!='autoconf'"><set var="BUILDDIR">$(FORMAT)$(WXLUA_LIBPOSTFIX)</set></if>
  
  
+     <!-- ================================================================== -->
+     <!--                        The list of wxLua OPTIONS                   -->
+     <!-- ================================================================== -->
  
      <!-- modules-specific options -->
      <include file="options.bkl"/>
  
  
+     <!-- ================================================================== -->
+     <!--                             NEW RULES                              -->
+     <!--  with these ones, each module/sample target takes few lines only   -->
+     <!-- ================================================================== -->
  
      <define-rule name="wxlua_lib" extends="lib">
          <template>
***************
*** 87,116 ****
              <set var="__modname">$(value)</set>
              <set var="__modnamelow">$(__modname.lower())</set>
!             
!             <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set>            
!             <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set>            
  
              <libname>$(__modnamelow)</libname>
              <sources>$(__modsrc)</sources>
!             <headers>$(__modhdr)</headers>            
! 			
  			<!-- This is required because wxbind.h refers to wx contrib section, too -->
  			<if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if>
!             
              <!-- to make MSVC6PRJ output look better... -->
              <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group>
              <msvc-file-group>$(__modname) headers:*.h</msvc-file-group>
!         </define-tag>        
      </define-rule>
!     
      <define-rule name="wxlua_dll" extends="dll">
          <template>
              <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dirname>
!             
              <!-- The DLL version -->
              <version>$(WXLUA_VERSION)</version>
              <so_version>$(WXLUA_SOVERSION)</so_version>
!             <mac_version>$(WXLUA_MACVERSION)</mac_version>    
!             
              <!-- Libraries must be put in the right order ! -->
              <wxlua-req-libs/>
--- 66,95 ----
              <set var="__modname">$(value)</set>
              <set var="__modnamelow">$(__modname.lower())</set>
! 
!             <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set>
!             <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set>
  
              <libname>$(__modnamelow)</libname>
              <sources>$(__modsrc)</sources>
!             <headers>$(__modhdr)</headers>
! 
  			<!-- This is required because wxbind.h refers to wx contrib section, too -->
  			<if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if>
! 
              <!-- to make MSVC6PRJ output look better... -->
              <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group>
              <msvc-file-group>$(__modname) headers:*.h</msvc-file-group>
!         </define-tag>
      </define-rule>
! 
      <define-rule name="wxlua_dll" extends="dll">
          <template>
              <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dirname>
! 
              <!-- The DLL version -->
              <version>$(WXLUA_VERSION)</version>
              <so_version>$(WXLUA_SOVERSION)</so_version>
!             <mac_version>$(WXLUA_MACVERSION)</mac_version>
! 
              <!-- Libraries must be put in the right order ! -->
              <wxlua-req-libs/>
***************
*** 118,122 ****
              <wx-lib>xml</wx-lib>           <!-- in case we're using the XML layout load/save system -->
              <wx-lib>core</wx-lib>
!             <wx-lib>base</wx-lib>   
  
              <set var="__modname"/>
--- 97,101 ----
              <wx-lib>xml</wx-lib>           <!-- in case we're using the XML layout load/save system -->
              <wx-lib>core</wx-lib>
!             <wx-lib>base</wx-lib>
  
              <set var="__modname"/>
***************
*** 125,136 ****
              <set var="__modname">$(value)</set>
              <set var="__modnamelow">$(__modname.lower())</set>
!             
!             <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set>            
!             <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set>            
  
              <libname>$(__modnamelow)</libname>
              <sources>$(__modsrc)</sources>
              <headers>$(__modhdr)</headers>
! 			
  			<!-- This is required because wxbind.h refers to wx contrib section, too -->
  			<if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if>
--- 104,115 ----
              <set var="__modname">$(value)</set>
              <set var="__modnamelow">$(__modname.lower())</set>
! 
!             <set var="__modsrc">$(mk.evalExpr('$(' + __modnamelow + '_src)'))</set>
!             <set var="__modhdr">$(mk.evalExpr('$(' + __modnamelow + '_hdr)'))</set>
  
              <libname>$(__modnamelow)</libname>
              <sources>$(__modsrc)</sources>
              <headers>$(__modhdr)</headers>
! 
  			<!-- This is required because wxbind.h refers to wx contrib section, too -->
  			<if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if>
***************
*** 139,158 ****
              <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group>
              <msvc-file-group>$(__modname) headers:*.h</msvc-file-group>
!             
              <!-- now, shared stuff -->
!             <define>A2D$(__modname)MAKINGDLL</define>            
          </define-tag>
      </define-rule>
-     
  
!     
!     
!     
!     <!--                                                                     -->
!     <!--                            AUXILIARY TARGETS                        -->
!     <!--                                                                     -->
! 	
  	<if cond="TARGETING_IDE=='0' and TARGETING_WIN32=='1'">
! 	
      	<!-- the two folders where output will be stored -->
          <mkdir id="setuplibdir">
--- 118,134 ----
              <msvc-file-group>$(__modname) sources:*.cpp</msvc-file-group>
              <msvc-file-group>$(__modname) headers:*.h</msvc-file-group>
! 
              <!-- now, shared stuff -->
!             <define>A2D$(__modname)MAKINGDLL</define>
          </define-tag>
      </define-rule>
  
! 
!     <!-- ================================================================== -->
!     <!--                            AUXILIARY TARGETS                       -->
!     <!-- ================================================================== -->
! 
  	<if cond="TARGETING_IDE=='0' and TARGETING_WIN32=='1'">
! 
      	<!-- the two folders where output will be stored -->
          <mkdir id="setuplibdir">
***************
*** 168,175 ****
  
  
! 
!    
!     
!     <!--                                                                     -->
      <!--                        The list of wxLua MODULES                    -->
  	<!--                                                                     -->
--- 144,148 ----
  
  
!     <!-- ==================================================================  -->
      <!--                        The list of wxLua MODULES                    -->
  	<!--                                                                     -->
***************
*** 178,186 ****
  	<!-- is a module, what is an app (since app bakefile uses 'app_' prefix) -->
  	<!-- and what is a util...                                               -->
!     <!--                                                                     -->
!     
      <!-- all the sources listed into sources.bkl contain path relative to our MODULES dir -->
      <set var="SRCDIR">$(WXLUA_MODULEDIR)</set>
!     
      <!-- lua must always be built inconditionally in static mode
           NOTE: we won't use the lua_lib rule since the LUA module does not follow
--- 151,159 ----
  	<!-- is a module, what is an app (since app bakefile uses 'app_' prefix) -->
  	<!-- and what is a util...                                               -->
!     <!-- ==================================================================  -->
! 
      <!-- all the sources listed into sources.bkl contain path relative to our MODULES dir -->
      <set var="SRCDIR">$(WXLUA_MODULEDIR)</set>
! 
      <!-- lua must always be built inconditionally in static mode
           NOTE: we won't use the lua_lib rule since the LUA module does not follow
***************
*** 194,203 ****
          <libname>lua</libname>
      </lib>
!     
      <!-- this is the lua app
           NOTE: like for lua_lib we don't use any wxLua-project-specific rule here -->
      <exe id="mod_lua">
          <library>mod_lua_lib</library>
!         <sources>lua/src/lua/lua.c</sources>        
          <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include>
          <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
--- 167,176 ----
          <libname>lua</libname>
      </lib>
! 
      <!-- this is the lua app
           NOTE: like for lua_lib we don't use any wxLua-project-specific rule here -->
      <exe id="mod_lua">
          <library>mod_lua_lib</library>
!         <sources>lua/src/lua/lua.c</sources>
          <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include>
          <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname>
***************
*** 212,235 ****
      <!-- the wxLua lib & dll -->
      <wxlua_lib id="wxlua_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
!         <module-name>WXLUA</module-name>        
      </wxlua_lib>
      <wxlua_dll id="wxlua_dll" template="wxlua" cond="WX_SHARED=='1'">
!         <module-name>WXLUA</module-name>        
      </wxlua_dll>
  
      <!-- the wxBind lib & dll -->
      <wxlua_lib id="wxbind_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
!         <module-name>WXBIND</module-name>        
      </wxlua_lib>
      <wxlua_dll id="wxbind_dll" template="wxlua" cond="WX_SHARED=='1'">
!         <module-name>WXBIND</module-name>        
      </wxlua_dll>
! 	
      <!-- the wxLuaDebug lib & dll -->
      <wxlua_lib id="wxluadebug_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
!         <module-name>WXLUADEBUG</module-name>        
      </wxlua_lib>
      <wxlua_dll id="wxluadebug_dll" template="wxlua" cond="WX_SHARED=='1'">
!         <module-name>WXLUADEBUG</module-name>        
      </wxlua_dll>
  
--- 185,208 ----
      <!-- the wxLua lib & dll -->
      <wxlua_lib id="wxlua_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
!         <module-name>WXLUA</module-name>
      </wxlua_lib>
      <wxlua_dll id="wxlua_dll" template="wxlua" cond="WX_SHARED=='1'">
!         <module-name>WXLUA</module-name>
      </wxlua_dll>
  
      <!-- the wxBind lib & dll -->
      <wxlua_lib id="wxbind_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
!         <module-name>WXBIND</module-name>
      </wxlua_lib>
      <wxlua_dll id="wxbind_dll" template="wxlua" cond="WX_SHARED=='1'">
!         <module-name>WXBIND</module-name>
      </wxlua_dll>
! 
      <!-- the wxLuaDebug lib & dll -->
      <wxlua_lib id="wxluadebug_lib" template="wxlua-lib" cond="WX_SHARED=='0'">
!         <module-name>WXLUADEBUG</module-name>
      </wxlua_lib>
      <wxlua_dll id="wxluadebug_dll" template="wxlua" cond="WX_SHARED=='1'">
!         <module-name>WXLUADEBUG</module-name>
      </wxlua_dll>
  
***************
*** 241,246 ****
          <module-name>WXLUASOCKET</module-name>
      </wxlua_dll>
!     
!     
      <!-- since all the previous targets would generate each one a different DSP project
           (i.e. a lot of project files), we instead tell Bakefile to merge the LIBS & DLLS
--- 214,219 ----
          <module-name>WXLUASOCKET</module-name>
      </wxlua_dll>
! 
! 
      <!-- since all the previous targets would generate each one a different DSP project
           (i.e. a lot of project files), we instead tell Bakefile to merge the LIBS & DLLS
***************
*** 254,258 ****
  		mod_wxluasocket=wxluasocket_lib+wxluasocket_dll
      </set>
!     
!     
  </makefile>
--- 227,231 ----
  		mod_wxluasocket=wxluasocket_lib+wxluasocket_dll
      </set>
! 
! 
  </makefile>