From: Francesco M. <fr...@us...> - 2006-01-28 21:01:49
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26072/modules/build/bakefiles Modified Files: modules.bkl Log Message: fixed things related to library names Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** modules.bkl 27 Jan 2006 21:57:09 -0000 1.14 --- modules.bkl 28 Jan 2006 21:01:07 -0000 1.15 *************** *** 22,25 **** --- 22,26 ---- <!-- All the source files & header files linked above are relative to our MODULE dir. --> + <set var="FILELISTDIR">../..</set> <if cond="FORMAT!='autoconf'"> <set var="WXLUA_BASEDIR">../../..</set> *************** *** 100,106 **** libwxlua_[gtk2|x11|...][u][d]_[modulename]-[wxversion].so (or .a) on Unix; on win32 instead: ! libwxlua_msw[u][d]_[modulename]-[wxversion without dots].dll (or .lib) --> ! <wxlike-libname>$(__modnamelow)</wxlike-libname> <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> --- 101,107 ---- libwxlua_[gtk2|x11|...][u][d]_[modulename]-[wxversion].so (or .a) on Unix; on win32 instead: ! 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> *************** *** 144,148 **** <set var="__modnamelow">$(__modname.lower())</set> ! <wxlike-libname>$(__modnamelow)</wxlike-libname> <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> --- 145,149 ---- <set var="__modnamelow">$(__modname.lower())</set> ! <wxlike-libname prefix='lua'>$(__modnamelow)</wxlike-libname> <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> *************** *** 181,185 **** <include>$(WXLUA_SOURCEDIR)/lua/include</include> <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> ! <wxlike-libname>lua</wxlike-libname> <install-to>$(LIBDIR)</install-to> --- 182,186 ---- <include>$(WXLUA_SOURCEDIR)/lua/include</include> <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> ! <wxlike-libname prefix='lua'>lua</wxlike-libname> <install-to>$(LIBDIR)</install-to> *************** *** 225,228 **** --- 226,231 ---- </wxlua_dll> + <!-- FIXME: WXLUASETUP_DIR and WXLUABINDLIB_DIR --> + <!-- the wxLuaDebug lib & dll --> <wxlua_lib id="wxluadebug_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> |