Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/bakefiles common.bkl, 1.11, 1.12 modules.bkl, 1.45, 1.46 options.bkl, 1.13, 1.14
|
From: John L. <jr...@us...> - 2007-07-04 05:39:52
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/build/bakefiles Modified Files: common.bkl modules.bkl options.bkl Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** options.bkl 19 Dec 2006 21:12:00 -0000 1.13 --- options.bkl 4 Jul 2007 05:39:16 -0000 1.14 *************** *** 20,23 **** --- 20,24 ---- see wxLua/build/autoconf/configure.ac --> + <set var="USE_WXBINDAUI_DEFAULT">1</set> <set var="USE_WXBINDSTC_DEFAULT">1</set> <set var="USE_WXLUADEBUG_DEFAULT">1</set> *************** *** 34,41 **** <if cond="TARGETING_IDE=='0'"> <option name="USE_WXBINDSTC"> <values>0,1</values> <default-value>$(USE_WXBINDSTC_DEFAULT)</default-value> ! <description>Does the wxLua bindings for STC need to be compiled ?</description> </option> --- 35,48 ---- <if cond="TARGETING_IDE=='0'"> + <option name="USE_WXBINDAUI"> + <values>0,1</values> + <default-value>$(USE_WXBINDAUI_DEFAULT)</default-value> + <description>Does the wxLua bindings for wxAUI need to be compiled ?</description> + </option> + <option name="USE_WXBINDSTC"> <values>0,1</values> <default-value>$(USE_WXBINDSTC_DEFAULT)</default-value> ! <description>Does the wxLua bindings for wxSTC need to be compiled ?</description> </option> *************** *** 72,75 **** --- 79,83 ---- 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 through the IDE GUI... --> + <set var="USE_WXBINDAUI">1</set> <set var="USE_WXBINDSTC">1</set> <set var="USE_WXLUADEBUG">1</set> Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** common.bkl 24 Apr 2007 14:21:09 -0000 1.11 --- common.bkl 4 Jul 2007 05:39:16 -0000 1.12 *************** *** 46,49 **** --- 46,52 ---- <set var="WXBIND_HDR">$(fileList('wxbind/include/*.h'))</set> + <set var="WXBINDAUI_SRC">$(fileList('wxbindaui/src/*.cpp'))</set> + <set var="WXBINDAUI_HDR">$(fileList('wxbindaui/include/*.h'))</set> + <set var="WXBINDSTC_SRC">$(fileList('wxbindstc/src/*.cpp'))</set> <set var="WXBINDSTC_HDR">$(fileList('wxbindstc/include/*.h'))</set> *************** *** 131,134 **** --- 134,138 ---- <wx-lib>xrc</wx-lib> <wx-lib>html</wx-lib> + <wx-lib>aui</wx-lib> <wx-lib>media</wx-lib> <wx-lib>adv</wx-lib> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** modules.bkl 4 May 2007 20:22:25 -0000 1.45 --- modules.bkl 4 Jul 2007 05:39:16 -0000 1.46 *************** *** 46,50 **** <!-- the lua lib & dll: these are needed by all wxLua modules, specially for linking the "mod_luamodule" (see below); in fact, compiling statically the ! lua interpreter into "mod_luamodule" is not a Good Thing ! See http://lua-users.org/wiki/BuildingModules to understand why (basically because lua core gets duplicated). --- 46,50 ---- <!-- the lua lib & dll: these are needed by all wxLua modules, specially for linking the "mod_luamodule" (see below); in fact, compiling statically the ! lua interpreter into "mod_luamodule" is not a Good Thing ! See http://lua-users.org/wiki/BuildingModules to understand why (basically because lua core gets duplicated). *************** *** 140,143 **** --- 140,155 ---- </wxlua_stddll> + <!-- the wxBindAUI lib & dll --> + <wxlua_stdlib id="wxbindaui_lib" cond="SHARED=='0' and USE_WXBINDAUI=='1'"> + <module-name>WXBINDAUI</module-name> + </wxlua_stdlib> + <wxlua_stddll id="wxbindaui_dll" cond="SHARED=='1' and USE_WXBINDAUI=='1'"> + <module-name>WXBINDAUI</module-name> + <wxlua-lib>wxbind</wxlua-lib> + <wxlua-lib>wxlua</wxlua-lib> + <wxlua-lib>lua</wxlua-lib> + <wx-lib>aui</wx-lib> + </wxlua_stddll> + <!-- the wxLuaDebug lib & dll --> <wxlua_stdlib id="wxluadebug_lib" cond="SHARED=='0' and USE_WXLUADEBUG=='1'"> *************** *** 178,185 **** <!-- we won't use <wxlua-allstdlibs> because it links to the non-verbatim version of lua, while we need the verbatim one (lua5.1.so/.dll) --> ! <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> <wxlua-lib>lua</wxlua-lib> --- 190,199 ---- <!-- we won't use <wxlua-allstdlibs> because it links to the non-verbatim version of lua, while we need the verbatim one (lua5.1.so/.dll) --> ! <wxlua-lib>wxbindstc</wxlua-lib> ! <wxlua-lib>wxbindaui</wxlua-lib> <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> + <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> *************** *** 197,200 **** --- 211,215 ---- mod_wxlua=wxlua_lib+wxlua_dll mod_wxbind=wxbind_lib+wxbind_dll + mod_wxbindaui=wxbindaui_lib+wxbindaui_dll mod_wxbindstc=wxbindstc_lib+wxbindstc_dll mod_wxluadebug=wxluadebug_lib+wxluadebug_dll |
