From: John L. <jr...@us...> - 2008-01-19 21:37:44
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8228/wxLua/modules/build/msvc8 Modified Files: modules.sln Log Message: Add MONOLITHIC_LUAMODULE to build a single wx.so/dll that contains everything. configure has been updated to add the option --enable-monolithic-luamodule Move VARS_DONT_ELIMINATE=THREADING to wxlua.bkl from modules/../options.bkl Index: modules.sln =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules.sln,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules.sln 15 Jan 2008 00:08:22 -0000 1.5 --- modules.sln 19 Jan 2008 21:37:10 -0000 1.6 *************** *** 33,37 **** Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_wxluasocket", "modules_mod_wxluasocket.vcproj", "{F7ADA638-7CD4-5139-9775-42DD313AFC82}" EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_luamodule", "modules_mod_luamodule.vcproj", "{4873368A-3282-5679-95B5-A15A2A1F4EC9}" EndProject Global --- 33,37 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_wxluasocket", "modules_mod_wxluasocket.vcproj", "{F7ADA638-7CD4-5139-9775-42DD313AFC82}" EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_luamodule_mono", "modules_mod_luamodule_mono.vcproj", "{E72421D9-A661-52CC-A3E0-340D019D5186}" EndProject Global *************** *** 567,594 **** {F7ADA638-7CD4-5139-9775-42DD313AFC82}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 {F7ADA638-7CD4-5139-9775-42DD313AFC82}.Debug Multilib|Win32.Build.0 = Debug Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Unicode DLL Monolithic|Win32.ActiveCfg = Release Unicode DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Unicode DLL Monolithic|Win32.Build.0 = Release Unicode DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Unicode DLL Multilib|Win32.ActiveCfg = Release Unicode DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Unicode DLL Multilib|Win32.Build.0 = Release Unicode DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Unicode Monolithic|Win32.ActiveCfg = Release Unicode Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Unicode Multilib|Win32.ActiveCfg = Release Unicode Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release DLL Monolithic|Win32.ActiveCfg = Release DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release DLL Monolithic|Win32.Build.0 = Release DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release DLL Multilib|Win32.ActiveCfg = Release DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release DLL Multilib|Win32.Build.0 = Release DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Monolithic|Win32.ActiveCfg = Release Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Release Multilib|Win32.ActiveCfg = Release Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Unicode DLL Monolithic|Win32.ActiveCfg = Debug Unicode DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Unicode DLL Monolithic|Win32.Build.0 = Debug Unicode DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Unicode DLL Multilib|Win32.ActiveCfg = Debug Unicode DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Unicode DLL Multilib|Win32.Build.0 = Debug Unicode DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Unicode Monolithic|Win32.ActiveCfg = Debug Unicode Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Unicode Multilib|Win32.ActiveCfg = Debug Unicode Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug DLL Monolithic|Win32.ActiveCfg = Debug DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug DLL Monolithic|Win32.Build.0 = Debug DLL Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug DLL Multilib|Win32.ActiveCfg = Debug DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug DLL Multilib|Win32.Build.0 = Debug DLL Multilib|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Monolithic|Win32.ActiveCfg = Debug Monolithic|Win32 ! {4873368A-3282-5679-95B5-A15A2A1F4EC9}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution --- 567,594 ---- {F7ADA638-7CD4-5139-9775-42DD313AFC82}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 {F7ADA638-7CD4-5139-9775-42DD313AFC82}.Debug Multilib|Win32.Build.0 = Debug Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Unicode DLL Monolithic|Win32.ActiveCfg = Release Unicode DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Unicode DLL Monolithic|Win32.Build.0 = Release Unicode DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Unicode DLL Multilib|Win32.ActiveCfg = Release Unicode DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Unicode DLL Multilib|Win32.Build.0 = Release Unicode DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Unicode Monolithic|Win32.ActiveCfg = Release Unicode Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Unicode Multilib|Win32.ActiveCfg = Release Unicode Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release DLL Monolithic|Win32.ActiveCfg = Release DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release DLL Monolithic|Win32.Build.0 = Release DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release DLL Multilib|Win32.ActiveCfg = Release DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release DLL Multilib|Win32.Build.0 = Release DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Monolithic|Win32.ActiveCfg = Release Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Release Multilib|Win32.ActiveCfg = Release Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Unicode DLL Monolithic|Win32.ActiveCfg = Debug Unicode DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Unicode DLL Monolithic|Win32.Build.0 = Debug Unicode DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Unicode DLL Multilib|Win32.ActiveCfg = Debug Unicode DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Unicode DLL Multilib|Win32.Build.0 = Debug Unicode DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Unicode Monolithic|Win32.ActiveCfg = Debug Unicode Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Unicode Multilib|Win32.ActiveCfg = Debug Unicode Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug DLL Monolithic|Win32.ActiveCfg = Debug DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug DLL Monolithic|Win32.Build.0 = Debug DLL Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug DLL Multilib|Win32.ActiveCfg = Debug DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug DLL Multilib|Win32.Build.0 = Debug DLL Multilib|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Monolithic|Win32.ActiveCfg = Debug Monolithic|Win32 ! {E72421D9-A661-52CC-A3E0-340D019D5186}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution |