From: Francesco M. <fr...@us...> - 2007-05-06 10:02:27
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31657/apps/build/bakefiles Modified Files: apps.bkl Log Message: added LUAC target Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** apps.bkl 5 May 2007 16:08:25 -0000 1.54 --- apps.bkl 6 May 2007 10:01:53 -0000 1.55 *************** *** 47,50 **** --- 47,51 ---- <include file="../../../modules/build/bakefiles/options.bkl"/> + <!-- a small template which avoid repeating the same tags for all wxLua apps --> <template id="wxluaapp" template="wxlua"> <app-type>gui</app-type> *************** *** 54,82 **** </template> ! ! ! <!-- ================================================================== --> ! <!-- The LUA interpreter target --> ! <!-- ================================================================== --> ! ! <exe id="app_lua" template="wxlua"> ! <wxlua-dirname>$(WXLUA_BINDIR)</wxlua-dirname> ! <app-type>console</app-type> <install-to>$(BINDIR)</install-to> <include>$(WXLUA_BASEDIR)/modules/lua/include</include> - <!--- the .. is because SRCDIR is always set to us to the wxLua/apps - folder and thus we only need to use .. to get to the module root --> - <sources>../modules/lua/src/lua.c</sources> - <headers></headers> - - <!-- we want as EXE name the standard "lua" name so that when we install - wxLua we get the lua installed in standard places and with standard names - (see also the notes in modules.bkl for lua_lib and lua_dll) - --> - <exename>lua</exename> - <!-- see modules/build/bakefiles/options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> --- 55,66 ---- </template> ! <!-- a simple template for Lua-only things (not for wxLua apps!) --> ! <template id="luaapp" template="wxlua"> <app-type>console</app-type> <install-to>$(BINDIR)</install-to> + <wxlua-dirname>$(WXLUA_BINDIR)</wxlua-dirname> <include>$(WXLUA_BASEDIR)/modules/lua/include</include> <!-- see modules/build/bakefiles/options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> *************** *** 89,106 **** <sys-lib>m</sys-lib> </if> ! </exe> <!-- ================================================================== --> ! <!-- The LUAC compiler target --> <!-- ================================================================== --> ! <exe id="app_luac" template="wxlua"> ! <wxlua-dirname>$(WXLUA_BINDIR)</wxlua-dirname> ! <app-type>console</app-type> ! <install-to>$(BINDIR)</install-to> ! <include>$(WXLUA_BASEDIR)/modules/lua/include</include> <!--- the .. is because SRCDIR is always set to us to the wxLua/apps folder and thus we only need to use .. to get to the module root --> --- 73,102 ---- <sys-lib>m</sys-lib> </if> ! </template> ! ! <!-- ================================================================== --> ! <!-- The LUA interpreter target --> <!-- ================================================================== --> ! <exe id="app_lua" template="luaapp"> ! <!--- the .. is because SRCDIR is always set to us to the wxLua/apps ! folder and thus we only need to use .. to get to the module root --> ! <sources>../modules/lua/src/lua.c</sources> ! <headers></headers> ! <!-- we want as EXE name the standard "lua" name so that when we install ! wxLua we also get official Lua installed in standard places and with ! standard names (see also the notes in modules.bkl for lua_lib and lua_dll) ! --> ! <exename>lua</exename> ! </exe> ! <!-- ================================================================== --> ! <!-- The LUAC compiler target --> ! <!-- ================================================================== --> + <exe id="app_luac" template="luaapp"> <!--- the .. is because SRCDIR is always set to us to the wxLua/apps folder and thus we only need to use .. to get to the module root --> *************** *** 111,130 **** <headers></headers> ! <!-- we want as EXE name the standard "lua" name so that when we install ! wxLua we get the lua installed in standard places and with standard names ! (see also the notes in modules.bkl for lua_lib and lua_dll) --> <exename>luac</exename> - - <!-- see modules/build/bakefiles/options.bkl for these --> - <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> - <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> - - <wxlua-lib>lua</wxlua-lib> - <if cond="TARGETING_WIN32=='0'"> - <!-- we require the standard MATH library to build the lua sources - (and it needs to be listed _after_ <wxlua-lib>lua</wxlua-lib> --> - <sys-lib>m</sys-lib> - </if> </exe> --- 107,115 ---- <headers></headers> ! <!-- we want as EXE name the standard "luac" name so that when we install ! wxLua we also get official Lua installed in standard places and with ! standard names (see also the notes in modules.bkl for lua_lib and lua_dll) --> <exename>luac</exename> </exe> |