Update of /cvsroot/wxlua/wxLua/build/bakefiles
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32395/build/bakefiles
Modified Files:
Bakefiles.bkgen options.bkl wxluabase.bkl
Log Message:
added the RUNTIME_LIBS option to the bakefile build system
Index: options.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/options.bkl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** options.bkl 19 Dec 2006 21:28:20 -0000 1.4
--- options.bkl 3 Feb 2007 19:12:22 -0000 1.5
***************
*** 47,50 ****
--- 47,63 ----
<description>The path to the Lua library</description>
</option>
+
+ <if cond="FORMAT!='autoconf'">
+ <option name="RUNTIME_LIBS">
+ <values>dynamic,static</values>
+ <default-value>dynamic</default-value>
+ <description>
+ This is an advanced option. Handle with care.
+ Version of C runtime library to use. You can change this to
+ static if SHARED=0, but it is highly recommended to not do
+ it if SHARED=1 unless you know what you are doing.
+ </description>
+ </option>
+ </if>
</if>
Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** wxluabase.bkl 26 Dec 2006 10:37:02 -0000 1.32
--- wxluabase.bkl 3 Feb 2007 19:12:22 -0000 1.33
***************
*** 233,236 ****
--- 233,241 ----
templates specific for wxlua-based apps -->
<template id="wxlua-base" template="wxbase">
+ <!-- honour the value of the RUNTIME_LIBS advanced option for all
+ wxLua's apps and libs -->
+ <if cond="FORMAT!='autoconf' and TARGETING_IDE=='0'">
+ <runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
+ </if>
<!-- an additional include & link path are required not only on win32 but also
Index: Bakefiles.bkgen
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/Bakefiles.bkgen,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Bakefiles.bkgen 7 Feb 2006 09:14:03 -0000 1.8
--- Bakefiles.bkgen 3 Feb 2007 19:12:22 -0000 1.9
***************
*** 17,21 ****
<!-- required since wxLua bakefiles use wx presets stored in wxWidgets subfolders... -->
! <add-flags>-I%WXWIN%/build/bakefiles/wxpresets</add-flags>
--- 17,21 ----
<!-- required since wxLua bakefiles use wx presets stored in wxWidgets subfolders... -->
! <add-flags>-I%WXWIN%/build/bakefiles/wxpresets -I.</add-flags>
|
