[Wxlua-commit] wxLua/modules/build/bakefiles modules.bkl, 1.39, 1.40 options.bkl, 1.12, 1.13

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	modules.bkl options.bkl 
Log Message:
now BUILDDIR is set exactly like the wxWidgets builddir
system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1
changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use 
external lua
Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting 
lua library (when installed).
Fixed the "samples" directory copy when srcdir==.

Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** options.bkl	20 May 2006 12:01:26 -0000	1.12
--- options.bkl	19 Dec 2006 21:12:00 -0000	1.13
***************
*** 30,36 ****
      <!-- ================================================================== -->

!     <!-- wxbind and wxlua cannot be disabled ! -->

      <if cond="TARGETING_IDE=='0'">
          <option name="USE_WXBINDSTC">
              <values>0,1</values>
--- 30,37 ----
      <!-- ================================================================== -->

!

      <if cond="TARGETING_IDE=='0'">
+ 
          <option name="USE_WXBINDSTC">
              <values>0,1</values>

Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** modules.bkl	10 Dec 2006 00:47:23 -0000	1.39
--- modules.bkl	19 Dec 2006 21:12:00 -0000	1.40
***************
*** 52,64 ****
           dangerous duplication of code.
      -->
!     <wxlua_stdlib id="verbatimlua_lib" cond="SHARED=='0'">
!         <module-name>LUA</module-name>

          <!-- see options.bkl for these -->
          <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags>
          <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags>
!     </wxlua_stdlib>
!     <wxlua_stddll id="verbatimlua_dll" cond="SHARED=='1'">
!         <module-name>LUA</module-name>

          <if cond="TARGETING_WIN32=='1'">
--- 52,89 ----
           dangerous duplication of code.
      -->
!     <lib id="lua_lib" cond="SHARED=='0' and USE_SYSTEM_LUA=='0'">
!         <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname>
!         <libname>lua5.1</libname>
! 
!         <sources>$(LUA_SRC)</sources>
!         <headers prefix="lua/include">
!             $(removePrefixFromList('lua/include/', LUA_HDR))
!         </headers>
! 
!         <install-to>$(LIBDIR)</install-to>
!         <install-headers-to>$(INCLUDEDIR)</install-headers-to>

          <!-- see options.bkl for these -->
          <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags>
          <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags>
!     </lib>
!     <dll id="lua_dll" cond="SHARED=='1' and USE_SYSTEM_LUA=='0'">
!         <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname>
! 
!         <!--  FIXME -->
!         <libname>lua5.1</libname>
!         <dllname>lua5.1</dllname>
! 
!         <version>5.1.0</version>
!         <so_version>0.0.0</so_version>
!         <mac_version>51</mac_version>
! 
!         <sources>$(LUA_SRC)</sources>
!         <headers prefix="lua/include">
!             $(removePrefixFromList('lua/include/', LUA_HDR))
!         </headers>
! 
!         <install-to>$(LIBDIR)</install-to>
!         <install-headers-to>$(INCLUDEDIR)</install-headers-to>

          <if cond="TARGETING_WIN32=='1'">
***************
*** 69,73 ****
          <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags>
          <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags>
!     </wxlua_stddll>

      <!-- the wxLua lib & dll -->
--- 94,98 ----
          <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags>
          <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags>
!     </dll>

      <!-- the wxLua lib & dll -->
***************
*** 133,137 ****
          <sources>$(LUAMODULE_SRC)</sources>
          <headers>$(LUAMODULE_HDR)</headers>
- 
          <define>WXMAKINGDLL_LUAMODULE</define>

--- 158,161 ----
***************
*** 145,149 ****
          <wxlua-lib>wxluasocket</wxlua-lib>
          <wxlua-lib>wxluadebug</wxlua-lib>
!         <sys-lib>lua5.1</sys-lib>

          <wx-alllibs-req-bywxlua/>
--- 169,173 ----
          <wxlua-lib>wxluasocket</wxlua-lib>
          <wxlua-lib>wxluadebug</wxlua-lib>
!         <wxlua-lib>lua</wxlua-lib>

          <wx-alllibs-req-bywxlua/>
***************
*** 155,161 ****
           targets so to generate only half of the DSP files -->
      <!-- NOTE: we use 'mod_' as prefix so that when opening the DSW file, the user immediately
!          gets a good idea about what is a MODULE and what is a SAMPLE (see the a2d_sample rule) -->
      <set var="MSVC6PRJ_MERGED_TARGETS">
-         mod_verbatimlua=verbatimlua_lib+verbatimlua_dll
          mod_lua=lua_lib+lua_dll
          mod_wxlua=wxlua_lib+wxlua_dll
--- 179,184 ----
           targets so to generate only half of the DSP files -->
      <!-- NOTE: we use 'mod_' as prefix so that when opening the DSW file, the user immediately
!          gets a good idea about what is a MODULE and what is an APP -->
      <set var="MSVC6PRJ_MERGED_TARGETS">
          mod_lua=lua_lib+lua_dll
          mod_wxlua=wxlua_lib+wxlua_dll