[Wxlua-commit] wxLua/apps/build/bakefiles apps.bkl,1.41,1.42

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

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

Modified Files:
	apps.bkl 
Log Message:
Switched to latest patched bakefile (which only differs for option renaming feature).
Removed customized build of LUA interpreter: we now use vanilla lua.
Now BUILDDIR is set differently for shared and static builds to avoid clashes.


Index: apps.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** apps.bkl	21 May 2006 09:55:24 -0000	1.41
--- apps.bkl	8 Dec 2006 13:19:57 -0000	1.42
***************
*** 17,31 ****
      <!-- ================================================================== -->
  
-     <set var="FILELISTDIR">../..</set>
      <if cond="TARGETING_WIN32=='1'">
          <!-- Win32 makefiles will be put in BUILD/MSW -->
          <set var="WXLUA_BASEDIR">../../..</set>
-         <set var="WXLUA_APPSDIR">../..</set>
-         <set var="SRCDIR">$(WXLUA_APPSDIR)</set>
          <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set>
      </if>
      <if cond="TARGETING_WIN32=='0'">
-         <set var="SRCDIR">.</set>
- 
          <!-- In this way we support makefiles created from folders != root folder;
               i.e. with this trick you can do:
--- 17,28 ----
      <!-- ================================================================== -->
  
      <if cond="TARGETING_WIN32=='1'">
          <!-- Win32 makefiles will be put in BUILD/MSW -->
          <set var="WXLUA_BASEDIR">../../..</set>
          <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set>
+ 
+         <set-srcdir>../..</set-srcdir>
      </if>
      <if cond="TARGETING_WIN32=='0'">
          <!-- In this way we support makefiles created from folders != root folder;
               i.e. with this trick you can do:
***************
*** 33,38 ****
          -->
          <set var="WXLUA_BASEDIR">$(top_srcdir)</set>
!         <set var="WXLUA_APPSDIR">$(top_srcdir)/apps</set>
!         <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)bin</set>
      </if>
  
--- 30,36 ----
          -->
          <set var="WXLUA_BASEDIR">$(top_srcdir)</set>
!         <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)/bin</set>
! 
!         <!-- leave SRCDIR to its '.' default -->
      </if>
  
***************
*** 69,86 ****
      <template id="wxluaapp" template="wxlua">
          <app-type>gui</app-type>
-         <srcdir>$(WXLUA_APPSDIR)</srcdir>
          <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname>
          <install-to>$(BINDIR)</install-to>
      </template>
  
!     <!-- only used by app_lua and app_verbatimlua -->
!     <template id="luainterpreter" template="wxlua">
          <app-type>console</app-type>
          <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname>
          <install-to>$(BINDIR)</install-to>
  
!         <srcdir>$(WXLUA_APPSDIR)</srcdir>
! 
!         <include>$(WXLUA_APPSDIR)/../modules/lua/include</include>
          <sources>$(LUA_SRC)</sources>
          <headers>$(LUA_HDR)</headers>
--- 67,87 ----
      <template id="wxluaapp" template="wxlua">
          <app-type>gui</app-type>
          <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname>
          <install-to>$(BINDIR)</install-to>
      </template>
  
! 
! 
! 
!     <!-- ================================================================== -->
!     <!--                        The LUA interpreter target                  -->
!     <!-- ================================================================== -->
! 
!     <exe id="app_lua" template="wxlua">
          <app-type>console</app-type>
          <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname>
          <install-to>$(BINDIR)</install-to>
  
!         <include>$(WXLUA_BASEDIR)/modules/lua/include</include>
          <sources>$(LUA_SRC)</sources>
          <headers>$(LUA_HDR)</headers>
***************
*** 94,118 ****
              <sys-lib>m</sys-lib>
          </if>
-     </template>
- 
- 
- 
- 
-     <!-- ================================================================== -->
-     <!--                        The LUA interpreter targets                 -->
-     <!-- ================================================================== -->
  
-     <exe id="app_lua" template="luainterpreter">
-         <!-- avoid clashes with the verbatim lua interpreter and call it 'wxlua-lua' -->
          <exename>wxlua-lua</exename>
          <wxlua-lib>lua</wxlua-lib>
      </exe>
  
-     <!-- the verbatim LUA interpreter (compiled without WXLUA_LUA_NEWTHREAD define) -->
-     <exe id="app_verbatimlua" template="luainterpreter">
-         <exename>lua5.1</exename>
-         <sys-lib>lua5.1</sys-lib>
-     </exe>
- 
  
  
--- 95,103 ----
***************
*** 123,127 ****
      <!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use
                 as a module target... this would lead to problems when creating global DSW file... -->
!     <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'">
          <sources>$(WXLUAAPP_SRC)</sources>
          <headers>$(WXLUAAPP_HDR)</headers>
--- 108,113 ----
      <!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use
                 as a module target... this would lead to problems when creating global DSW file... -->
!     <exe id="app_wxlua" template="wxluaapp" 
!          cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'">
          <sources>$(WXLUAAPP_SRC)</sources>
          <headers>$(WXLUAAPP_HDR)</headers>