Update of /cvsroot/wxlua/wxLua/build/bakefiles
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209/build/bakefiles
Modified Files:
wxhacks.bkl wxluabase.bkl
Log Message:
multiple fixes to the build system: updated DSP/DSW, renamed some targets, now wxStEdit libname is correctly used, removed unused files from CVS
Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** wxluabase.bkl 8 Dec 2006 13:19:58 -0000 1.23
--- wxluabase.bkl 10 Dec 2006 00:47:22 -0000 1.24
***************
*** 138,149 ****
<error>Invalid wxlua-lib value !</error>
</if>
! <if cond="value=='lua'">
! <!-- we build a vanilla lua5.1 library; thus we don't name it with wxLua naming convention -->
! <sys-lib>lua5.1</sys-lib>
! </if>
! <if cond="value!='lua' and TARGETING_WIN32=='1'">
<sys-lib>wxlua_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
</if>
! <if cond="value!='lua' and TARGETING_WIN32=='0'">
<sys-lib>wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib>
</if>
--- 138,145 ----
<error>Invalid wxlua-lib value !</error>
</if>
! <if cond="TARGETING_WIN32=='1'">
<sys-lib>wxlua_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
</if>
! <if cond="TARGETING_WIN32=='0'">
<sys-lib>wxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib>
</if>
Index: wxhacks.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxhacks.bkl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxhacks.bkl 8 Dec 2006 13:19:58 -0000 1.16
--- wxhacks.bkl 10 Dec 2006 00:47:22 -0000 1.17
***************
*** 338,340 ****
--- 338,360 ----
</if>
</define-tag>
+
+
+ <!-- A simple tag which helps you to define a library to link to using the same rules used
+ by wxWidgets. This tag is used in place of <wx-lib>libname</wx-lib> and
+ will generate an approprately pre and postfixed name as generated by
+ having used <wxlike-libname>module1</wxlike-libname> in another component.
+ E.g.:
+ <wxlike-lib>module1</wxlike-lib>
+ <wxlike-lib>module2</wxlike-lib>
+ -->
+
+ <define-tag name="wxlike-lib" rules="exe,lib,dll,module">
+ <if cond="TARGETING_WIN32=='1'">
+ <sys-lib>wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
+ </if>
+ <if cond="TARGETING_WIN32=='0'">
+ <sys-lib>wx_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib>
+ </if>
+ </define-tag>
+
</makefile>
|
