Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32574/modules/build/bakefiles
Modified Files:
common.bkl modules.bkl
Log Message:
updated bakefile build system to use wxWidgets standard presets
Index: common.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** common.bkl 16 Dec 2006 12:09:05 -0000 1.9
--- common.bkl 23 Apr 2007 22:44:30 -0000 1.10
***************
*** 25,32 ****
<set var="WXLUA_MODULEDIR">../..</set>
- <set var="WXLUA_LIBOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_LIBOUTPUT_FOLDER)</set>
- <set var="WXLUA_DLLOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_DLLOUTPUT_FOLDER)</set>
- <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set>
-
<set-srcdir>../..</set-srcdir>
</if>
--- 25,28 ----
***************
*** 37,45 ****
-->
<set var="WXLUA_BASEDIR">$(top_srcdir)</set>
-
- <!-- top_builddir already ends with '/' -->
- <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)/$(WXLUA_LIBOUTPUT_FOLDER)</set>
- <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)/$(WXLUA_DLLOUTPUT_FOLDER)</set>
- <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)/bin</set>
</if>
--- 33,36 ----
***************
*** 74,78 ****
<!-- modules-specific options -->
! <include file="options.bkl"/>
--- 65,69 ----
<!-- modules-specific options -->
! <include file="options.bkl" once="1"/>
***************
*** 84,88 ****
<define-rule name="wxlua_lib" extends="lib">
<template>
! <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname>
<set var="__modname"/>
--- 75,80 ----
<define-rule name="wxlua_lib" extends="lib">
<template>
! <!-- do not prefix "lib" with $(WXLUA_BASEDIR): we want to allow out-of-tree builds!-->
! <wxlua-dirname>../lib</wxlua-dirname>
<set var="__modname"/>
***************
*** 98,102 ****
wxlua_msw[u][d]_[modulename]-[wxversion without dots].dll (or .lib)
-->
! <wxlike-libname prefix='lua'>$(__modnamelow)</wxlike-libname>
<sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources>
<headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers>
--- 90,94 ----
wxlua_msw[u][d]_[modulename]-[wxversion without dots].dll (or .lib)
-->
! <wxlike-libname prefix='wxlua'>$(__modnamelow)</wxlike-libname>
<sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources>
<headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers>
***************
*** 126,130 ****
<define-rule name="wxlua_dll" extends="dll">
<template>
! <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname>
<!-- The DLL version -->
--- 118,123 ----
<define-rule name="wxlua_dll" extends="dll">
<template>
! <!-- do not prefix "lib" with $(WXLUA_BASEDIR): we want to allow out-of-tree builds!-->
! <wxlua-dirname>../lib</wxlua-dirname>
<!-- The DLL version -->
***************
*** 150,155 ****
<set var="__modnamelow">$(__modname.lower())</set>
! <wxlike-libname prefix='lua'>$(__modnamelow)</wxlike-libname>
! <wxlike-dllname prefix='lua'>$(__modnamelow)</wxlike-dllname>
<sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources>
<headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers>
--- 143,147 ----
<set var="__modnamelow">$(__modname.lower())</set>
! <wxlike-dllname prefix='wxlua'>$(__modnamelow)</wxlike-dllname>
<sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources>
<headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers>
Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** modules.bkl 20 Dec 2006 13:15:11 -0000 1.42
--- modules.bkl 23 Apr 2007 22:44:30 -0000 1.43
***************
*** 15,19 ****
<!-- Contains stuff shared between this bakefile and the
wxLua/modules/wxbind/build/wxbindcustom.bkl one -->
! <include file="common.bkl"/>
<!-- Here it's important to use template_append and not just template ! -->
--- 15,19 ----
<!-- Contains stuff shared between this bakefile and the
wxLua/modules/wxbind/build/wxbindcustom.bkl one -->
! <include file="common.bkl" once="1"/>
<!-- Here it's important to use template_append and not just template ! -->
***************
*** 55,61 ****
against a DSO/DLL named "lua5.1[.dll]" so that our "wx[.dll]"
can be used just like any other Lua module.
-->
! <lib id="lua_lib" cond="SHARED=='0' and USE_SYSTEM_LUA=='0'">
! <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname>
<libname>lua5.1</libname>
--- 55,70 ----
against a DSO/DLL named "lua5.1[.dll]" so that our "wx[.dll]"
can be used just like any other Lua module.
+
+ NOTE #2: we add template "wxlike" only to be sure that this lua library
+ will be built using the same DEBUG/RELEASE settings as for all
+ other libraries (wxlike will set <debug-info> basing on WX_DEBUG=0/1
+ which has been replaced by our BUILD=debug/release option).
-->
! <lib id="lua_lib"
! template="wxlike"
! cond="SHARED=='0' and USE_SYSTEM_LUA=='0'">
!
! <!-- do not prefix "lib" with $(WXLUA_BASEDIR): we want to allow out-of-tree builds!-->
! <wxlua-dirname>../lib</wxlua-dirname>
<libname>lua5.1</libname>
***************
*** 72,77 ****
<ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags>
</lib>
! <dll id="lua_dll" cond="SHARED=='1' and USE_SYSTEM_LUA=='0'">
! <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname>
<libname>lua5.1</libname>
<dllname>lua5.1</dllname>
--- 81,90 ----
<ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags>
</lib>
! <dll id="lua_dll"
! template="wxlike"
! cond="SHARED=='1' and USE_SYSTEM_LUA=='0'">
!
! <!-- do not prefix "lib" with $(WXLUA_BASEDIR): we want to allow out-of-tree builds!-->
! <wxlua-dirname>../lib</wxlua-dirname>
<libname>lua5.1</libname>
<dllname>lua5.1</dllname>
***************
*** 153,157 ****
<!-- the luamodule: for lots of reasons it can be built only when SHARED==1 -->
<module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'">
! <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname>
<!-- $libdir/lua/5.1 looks to be the standard folder for lua modules... -->
--- 166,171 ----
<!-- the luamodule: for lots of reasons it can be built only when SHARED==1 -->
<module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'">
! <!-- do not prefix "lib" with $(WXLUA_BASEDIR): we want to allow out-of-tree builds!-->
! <wxlua-dirname>../lib</wxlua-dirname>
<!-- $libdir/lua/5.1 looks to be the standard folder for lua modules... -->
|
