From: Francesco M. <fr...@us...> - 2007-02-03 19:12:30
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32395/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: added the RUNTIME_LIBS option to the bakefile build system Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** makefile.vc 19 Dec 2006 22:24:11 -0000 1.40 --- makefile.vc 3 Feb 2007 19:12:22 -0000 1.41 *************** *** 107,114 **** WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 107,115 ---- WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! RUNTIME_LIBS="$(RUNTIME_LIBS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** makefile.bcc 19 Dec 2006 22:24:11 -0000 1.37 --- makefile.bcc 3 Feb 2007 19:12:22 -0000 1.38 *************** *** 100,103 **** --- 100,111 ---- !endif + # 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. [dynamic,static] + !ifndef RUNTIME_LIBS + RUNTIME_LIBS = dynamic + !endif + # Does the wxLua bindings for STC need to be compiled ? [0,1] !ifndef USE_WXBINDSTC *************** *** 159,164 **** -DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \ -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ ! -DLUA_DIR="$(LUA_DIR)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \ -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ --- 167,172 ---- -DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \ -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ ! -DLUA_DIR="$(LUA_DIR)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \ ! -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \ -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** makefile.wat 19 Dec 2006 22:24:11 -0000 1.39 --- makefile.wat 3 Feb 2007 19:12:22 -0000 1.40 *************** *** 159,166 **** WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" & ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" & ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" & ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 159,167 ---- WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" & ! RUNTIME_LIBS="$(RUNTIME_LIBS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" & ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" & ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" & ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" & ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** makefile.gcc 19 Dec 2006 22:24:11 -0000 1.38 --- makefile.gcc 3 Feb 2007 19:12:22 -0000 1.39 *************** *** 100,107 **** WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 100,108 ---- WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! RUNTIME_LIBS="$(RUNTIME_LIBS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" |