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

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

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

Modified Files:
	apps.bkl 
Log Message:
updated DSW/DSP for SHARED build changes

Index: apps.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** apps.bkl	20 May 2006 13:12:34 -0000	1.40
--- apps.bkl	21 May 2006 09:55:24 -0000	1.41
***************
*** 74,83 ****
      </template>
  
! 
!     <!-- ================================================================== -->
!     <!--                        The LUA interpreter target                  -->
!     <!-- ================================================================== -->
! 
!     <exe id="app_lua" template="wxlua">
          <app-type>console</app-type>
          <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname>
--- 74,79 ----
      </template>
  
!     <!-- only used by app_lua and app_verbatimlua -->
!     <template id="luainterpreter" template="wxlua">
          <app-type>console</app-type>
          <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname>
***************
*** 85,88 ****
--- 81,86 ----
  
          <srcdir>$(WXLUA_APPSDIR)</srcdir>
+ 
+         <include>$(WXLUA_APPSDIR)/../modules/lua/include</include>
          <sources>$(LUA_SRC)</sources>
          <headers>$(LUA_HDR)</headers>
***************
*** 92,131 ****
          <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags>
  
-         <!-- avoid overwriting user's lua -->
-         <include>$(WXLUA_APPSDIR)/../modules/lua/include</include>
-         <exename>wxlua-lua</exename>
-         <wxlua-lib>lua</wxlua-lib>
- 
          <if cond="TARGETING_WIN32=='0'">
              <!-- we require the standard MATH library to build the lua sources -->
              <sys-lib>m</sys-lib>
          </if>
!     </exe>
  
-     <exe id="app_luaverbatim" template="wxlua">
-         <app-type>console</app-type>
-         <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname>
-         <install-to>$(BINDIR)</install-to>
  
-         <srcdir>$(WXLUA_APPSDIR)</srcdir>
-         <sources>$(LUA_SRC)</sources>
-         <headers>$(LUA_HDR)</headers>
  
-         <!-- see modules/build/bakefiles/options.bkl for these -->
-         <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags>
-         <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags>
  
!         <!-- avoid overwriting user's lua -->
!         <include>$(WXLUA_APPSDIR)/../modules/lua/include</include>
!         <exename>lua5.1</exename>
!         <sys-lib>lua5.1</sys-lib>
  
!         <if cond="TARGETING_WIN32=='0'">
!             <!-- we require the standard MATH library to build the lua sources -->
!             <sys-lib>m</sys-lib>
!         </if>
      </exe>
  
! 
  
  
--- 90,117 ----
          <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags>
  
          <if cond="TARGETING_WIN32=='0'">
              <!-- we require the standard MATH library to build the lua sources -->
              <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>