Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/bakefiles common.bkl, 1.14, 1.15 modules.bkl, 1.47, 1.48
|
From: Francesco M. <fr...@us...> - 2007-08-01 10:08:28
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7207/modules/build/bakefiles Modified Files: common.bkl modules.bkl Log Message: fixed configure script about the new USE_BINDxxx options; also fixed the inter-module dependencies Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** common.bkl 16 Jul 2007 22:53:31 -0000 1.14 --- common.bkl 1 Aug 2007 10:08:23 -0000 1.15 *************** *** 152,155 **** --- 152,159 ---- <install-headers-to>$(INCLUDEDIR)</install-headers-to> </define-tag> + <define-tag name="module-dep"> + <wxlua-lib>$(value)</wxlua-lib> + <depends>$(value)_lib</depends> + </define-tag> </define-rule> *************** *** 211,214 **** --- 215,222 ---- <define>WXMAKINGDLL_$(value)</define> </define-tag> + <define-tag name="module-dep"> + <wxlua-lib>$(value)</wxlua-lib> + <depends>$(value)_dll</depends> + </define-tag> </define-rule> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** modules.bkl 16 Jul 2007 19:34:32 -0000 1.47 --- modules.bkl 1 Aug 2007 10:08:23 -0000 1.48 *************** *** 115,119 **** <wxlua_stddll id="wxlua_dll" cond="SHARED=='1'"> <module-name>WXLUA</module-name> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 115,119 ---- <wxlua_stddll id="wxlua_dll" cond="SHARED=='1'"> <module-name>WXLUA</module-name> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 124,131 **** <wxlua_stddll id="wxbindadv_dll" cond="SHARED=='1' and USE_WXBINDADV=='1'"> <module-name>WXBINDADV</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 124,131 ---- <wxlua_stddll id="wxbindadv_dll" cond="SHARED=='1' and USE_WXBINDADV=='1'"> <module-name>WXBINDADV</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 136,143 **** <wxlua_stddll id="wxbindaui_dll" cond="SHARED=='1' and USE_WXBINDAUI=='1'"> <module-name>WXBINDAUI</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> <wx-lib>aui</wx-lib> </wxlua_stddll> --- 136,143 ---- <wxlua_stddll id="wxbindaui_dll" cond="SHARED=='1' and USE_WXBINDAUI=='1'"> <module-name>WXBINDAUI</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> <wx-lib>aui</wx-lib> </wxlua_stddll> *************** *** 149,154 **** <wxlua_stddll id="wxbindbase_dll" cond="SHARED=='1'"> <module-name>WXBINDBASE</module-name> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 149,154 ---- <wxlua_stddll id="wxbindbase_dll" cond="SHARED=='1'"> <module-name>WXBINDBASE</module-name> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 159,165 **** <wxlua_stddll id="wxbindcore_dll" cond="SHARED=='1'"> <module-name>WXBINDCORE</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 159,165 ---- <wxlua_stddll id="wxbindcore_dll" cond="SHARED=='1'"> <module-name>WXBINDCORE</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 170,177 **** <wxlua_stddll id="wxbindgl_dll" cond="SHARED=='1' and USE_WXBINDGL=='1'"> <module-name>WXBINDGL</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 170,177 ---- <wxlua_stddll id="wxbindgl_dll" cond="SHARED=='1' and USE_WXBINDGL=='1'"> <module-name>WXBINDGL</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 182,189 **** <wxlua_stddll id="wxbindhtml_dll" cond="SHARED=='1' and USE_WXBINDHTML=='1'"> <module-name>WXBINDHTML</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 182,189 ---- <wxlua_stddll id="wxbindhtml_dll" cond="SHARED=='1' and USE_WXBINDHTML=='1'"> <module-name>WXBINDHTML</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 194,202 **** <wxlua_stddll id="wxbindmedia_dll" cond="SHARED=='1' and USE_WXBINDMEDIA=='1'"> <module-name>WXBINDMEDIA</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxbindnet</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 194,202 ---- <wxlua_stddll id="wxbindmedia_dll" cond="SHARED=='1' and USE_WXBINDMEDIA=='1'"> <module-name>WXBINDMEDIA</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxbindnet</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 207,214 **** <wxlua_stddll id="wxbindnet_dll" cond="SHARED=='1' and USE_WXBINDNET=='1'"> <module-name>WXBINDNET</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 207,214 ---- <wxlua_stddll id="wxbindnet_dll" cond="SHARED=='1' and USE_WXBINDNET=='1'"> <module-name>WXBINDNET</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 219,226 **** <wxlua_stddll id="wxbindrichtext_dll" cond="SHARED=='1' and USE_WXBINDRICHTEXT=='1'"> <module-name>WXBINDRICHTEXT</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> <wx-lib>richtext</wx-lib> </wxlua_stddll> --- 219,226 ---- <wxlua_stddll id="wxbindrichtext_dll" cond="SHARED=='1' and USE_WXBINDRICHTEXT=='1'"> <module-name>WXBINDRICHTEXT</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> <wx-lib>richtext</wx-lib> </wxlua_stddll> *************** *** 232,239 **** <wxlua_stddll id="wxbindstc_dll" cond="SHARED=='1' and USE_WXBINDSTC=='1'"> <module-name>WXBINDSTC</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> <wx-lib>stc</wx-lib> </wxlua_stddll> --- 232,239 ---- <wxlua_stddll id="wxbindstc_dll" cond="SHARED=='1' and USE_WXBINDSTC=='1'"> <module-name>WXBINDSTC</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> <wx-lib>stc</wx-lib> </wxlua_stddll> *************** *** 245,251 **** <wxlua_stddll id="wxbindxml_dll" cond="SHARED=='1' and USE_WXBINDXML=='1'"> <module-name>WXBINDXML</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 245,251 ---- <wxlua_stddll id="wxbindxml_dll" cond="SHARED=='1' and USE_WXBINDXML=='1'"> <module-name>WXBINDXML</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 256,263 **** <wxlua_stddll id="wxbindxrc_dll" cond="SHARED=='1' and USE_WXBINDXRC=='1'"> <module-name>WXBINDXRC</module-name> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 256,263 ---- <wxlua_stddll id="wxbindxrc_dll" cond="SHARED=='1' and USE_WXBINDXRC=='1'"> <module-name>WXBINDXRC</module-name> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 269,274 **** <wxlua_stddll id="wxluadebug_dll" cond="SHARED=='1' and USE_WXLUADEBUG=='1'"> <module-name>WXLUADEBUG</module-name> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 269,274 ---- <wxlua_stddll id="wxluadebug_dll" cond="SHARED=='1' and USE_WXLUADEBUG=='1'"> <module-name>WXLUADEBUG</module-name> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> *************** *** 279,287 **** <wxlua_stddll id="wxluasocket_dll" cond="SHARED=='1' and USE_WXLUASOCKET=='1'"> <module-name>WXLUASOCKET</module-name> ! <wxlua-lib>wxluadebug</wxlua-lib> ! <wxlua-lib>wxbindbase</wxlua-lib> ! <wxlua-lib>wxbindcore</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> --- 279,287 ---- <wxlua_stddll id="wxluasocket_dll" cond="SHARED=='1' and USE_WXLUASOCKET=='1'"> <module-name>WXLUASOCKET</module-name> ! <module-dep>wxluadebug</module-dep> ! <module-dep>wxbindbase</module-dep> ! <module-dep>wxbindcore</module-dep> ! <module-dep>wxlua</module-dep> ! <module-dep>lua</module-dep> </wxlua_stddll> |
