Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10627/modules/build/bakefiles
Modified Files:
modules.bkl
Removed Files:
sources.bkl
Log Message:
fixed problem with top_srcdir (autoconf) fixed EOL for MSVC6prj; switch to 26 as wx default version
--- sources.bkl DELETED ---
Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** modules.bkl 23 Jan 2006 21:20:29 -0000 1.12
--- modules.bkl 25 Jan 2006 18:35:58 -0000 1.13
***************
*** 22,31 ****
<!-- All the source files & header files linked above are relative to our base dir -->
! <if cond="FORMAT!='autoconf'"><set var="WXLUA_MODULEDIR">../..</set></if>
! <if cond="FORMAT=='autoconf'"><set var="WXLUA_MODULEDIR">.</set></if>
! <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)/..</set>
<!-- all the sources listed into sources.bkl contain path relative to our MODULES dir -->
! <set var="SRCDIR">$(WXLUA_MODULEDIR)</set>
<!-- the ldllmain.c file must be excluded ! -->
--- 22,40 ----
<!-- All the source files & header files linked above are relative to our base dir -->
! <if cond="FORMAT!='autoconf'">
! <set var="WXLUA_MODULEDIR">../..</set>
! <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)/..</set>
! </if>
! <if cond="FORMAT=='autoconf'">
! <!-- In this way we support makefiles created from folders != root folder;
! i.e. with this trick you can do:
! mkdir mybuild && cd mybuild && ../configure && make
! -->
! <set var="WXLUA_MODULEDIR">$(top_srcdir)/modules</set>
! <set var="WXLUA_BASEDIR">$(top_srcdir)</set>
! </if>
<!-- all the sources listed into sources.bkl contain path relative to our MODULES dir -->
! <set var="SRCDIR">$(WXLUA_MODULEDIR.replace('$(top_srcdir)', '..'))</set>
<!-- the ldllmain.c file must be excluded ! -->
***************
*** 66,69 ****
--- 75,79 ----
<define-rule name="wxlua_lib" extends="lib">
<template>
+ <srcdir>$(WXLUA_MODULEDIR)</srcdir>
<dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname>
<install-to>$(LIBDIR)</install-to>
***************
*** 91,94 ****
--- 101,105 ----
<define-rule name="wxlua_dll" extends="dll">
<template>
+ <srcdir>$(WXLUA_MODULEDIR)</srcdir>
<dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dirname>
<install-to>$(LIBDIR)</install-to>
***************
*** 163,166 ****
--- 174,178 ----
the same conventions followed by other modules... -->
<lib id="mod_lua_lib" template="wxbase">
+ <srcdir>$(WXLUA_MODULEDIR)</srcdir>
<define>WXLUA_CODE</define>
<sources>$(LUA_SRC) $(LUALIB_SRC)</sources>
***************
*** 177,180 ****
--- 189,193 ----
NOTE: like for lua_lib we don't use any wxLua-project-specific rule here -->
<exe id="mod_lua" template="wxbase">
+ <srcdir>$(WXLUA_MODULEDIR)</srcdir>
<library>mod_lua_lib</library>
<sources>lua/src/lua/lua.c</sources>
|
