Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2007-02-06 04:18:15
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24793/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: cleanup in genwxbind.lua remove whitespace in generated files Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wxstc_datatypes.lua 18 Jan 2007 17:19:00 -0000 1.40 --- wxstc_datatypes.lua 6 Feb 2007 04:17:41 -0000 1.41 *************** *** 3483,3486 **** --- 3483,3487 ---- wxUSE_CONTROLS = "wxUSE_CONTROLS", wxUSE_DATAOBJ = "wxUSE_DATAOBJ", + wxUSE_DATEPICKCTRL = "wxUSE_DATEPICKCTRL", wxUSE_DATETIME = "wxUSE_DATETIME", wxUSE_DEBUG_CONTEXT = "wxUSE_DEBUG_CONTEXT", |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24793/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wxlua.cpp xml.cpp Log Message: cleanup in genwxbind.lua remove whitespace in generated files Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** xml.cpp 17 Dec 2006 07:47:16 -0000 1.17 --- xml.cpp 6 Feb 2007 04:17:46 -0000 1.18 *************** *** 508,513 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlNode_methods[] = { --- 508,511 ---- *************** *** 726,731 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlProperty_methods[] = { --- 724,727 ---- *************** *** 974,979 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlDocument_methods[] = { --- 970,973 ---- *************** *** 1018,1023 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlResourceHandler_methods[] = { --- 1012,1015 ---- *************** *** 1627,1632 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXmlResource_methods[] = { --- 1619,1622 ---- Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** defsutil.cpp 17 Dec 2006 07:47:15 -0000 1.21 --- defsutil.cpp 6 Feb 2007 04:17:42 -0000 1.22 *************** *** 320,325 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxProcess_methods[] = { --- 320,323 ---- *************** *** 701,706 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMouseState_methods[] = { --- 699,702 ---- *************** *** 795,800 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyCursor_methods[] = { --- 791,794 ---- *************** *** 869,874 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBusyInfo_methods[] = { --- 863,866 ---- Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxlua.cpp 17 Dec 2006 07:47:16 -0000 1.24 --- wxlua.cpp 6 Feb 2007 04:17:46 -0000 1.25 *************** *** 60,65 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaState_methods[] = { --- 60,63 ---- *************** *** 203,208 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaObject_methods[] = { --- 201,204 ---- *************** *** 320,325 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaPrintout_methods[] = { --- 316,319 ---- *************** *** 386,391 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaHtmlWindow_methods[] = { --- 380,383 ---- *************** *** 506,511 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaHtmlWinTagEvent_methods[] = { --- 498,501 ---- *************** *** 594,599 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaTreeItemData_methods[] = { --- 584,587 ---- Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** image.cpp 17 Dec 2006 07:47:15 -0000 1.21 --- image.cpp 6 Feb 2007 04:17:44 -0000 1.22 *************** *** 1494,1499 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxImage_methods[] = { --- 1494,1497 ---- *************** *** 1826,1831 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxImageHandler_methods[] = { --- 1824,1827 ---- *************** *** 1893,1898 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBMPHandler_methods[] = { --- 1889,1892 ---- *************** *** 1937,1942 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxICOHandler_methods[] = { --- 1931,1934 ---- *************** *** 1981,1986 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxCURHandler_methods[] = { --- 1973,1976 ---- *************** *** 2025,2030 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxANIHandler_methods[] = { --- 2015,2018 ---- *************** *** 2069,2074 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxIFFHandler_methods[] = { --- 2057,2060 ---- *************** *** 2113,2118 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGIFHandler_methods[] = { --- 2099,2102 ---- *************** *** 2157,2162 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxJPEGHandler_methods[] = { --- 2141,2144 ---- *************** *** 2201,2206 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPCXHandler_methods[] = { --- 2183,2186 ---- *************** *** 2245,2250 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPNGHandler_methods[] = { --- 2225,2228 ---- *************** *** 2289,2294 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPNMHandler_methods[] = { --- 2267,2270 ---- *************** *** 2333,2338 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTIFFHandler_methods[] = { --- 2309,2312 ---- *************** *** 2377,2382 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxXPMHandler_methods[] = { --- 2351,2354 ---- *************** *** 2489,2494 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxArtProvider_methods[] = { --- 2461,2464 ---- Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mdi.cpp 17 Dec 2006 07:47:15 -0000 1.20 --- mdi.cpp 6 Feb 2007 04:17:45 -0000 1.21 *************** *** 42,47 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMDIClientWindow_methods[] = { --- 42,45 ---- *************** *** 342,347 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMDIParentFrame_methods[] = { --- 340,343 ---- *************** *** 530,535 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMDIChildFrame_methods[] = { --- 526,529 ---- *************** *** 673,678 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDocChildFrame_methods[] = { --- 667,670 ---- *************** *** 1377,1382 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDocManager_methods[] = { --- 1369,1372 ---- *************** *** 1517,1522 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDocParentFrame_methods[] = { --- 1507,1510 ---- *************** *** 1893,1898 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDocTemplate_methods[] = { --- 1881,1884 ---- *************** *** 2508,2513 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDocument_methods[] = { --- 2494,2497 ---- *************** *** 2846,2851 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxView_methods[] = { --- 2830,2833 ---- *************** *** 3278,3283 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxCommandProcessor_methods[] = { --- 3260,3263 ---- *************** *** 3399,3404 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxCommand_methods[] = { --- 3379,3382 ---- *************** *** 3628,3633 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFileHistory_methods[] = { --- 3606,3609 ---- Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** config.cpp 17 Dec 2006 07:47:14 -0000 1.22 --- config.cpp 6 Feb 2007 04:17:42 -0000 1.23 *************** *** 753,758 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxConfigBase_methods[] = { --- 753,756 ---- *************** *** 846,851 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxConfig_methods[] = { --- 844,847 ---- *************** *** 914,919 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFileConfig_methods[] = { --- 910,913 ---- Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** grid.cpp 17 Dec 2006 07:47:15 -0000 1.21 --- grid.cpp 6 Feb 2007 04:17:43 -0000 1.22 *************** *** 83,88 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellWorker_methods[] = { --- 83,86 ---- *************** *** 145,150 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellRenderer_methods[] = { --- 143,146 ---- *************** *** 190,195 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellStringRenderer_methods[] = { --- 186,189 ---- *************** *** 231,236 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellNumberRenderer_methods[] = { --- 225,228 ---- *************** *** 340,345 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellFloatRenderer_methods[] = { --- 332,335 ---- *************** *** 389,394 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellBoolRenderer_methods[] = { --- 379,382 ---- *************** *** 436,441 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellDateTimeRenderer_methods[] = { --- 424,427 ---- *************** *** 481,486 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellEnumRenderer_methods[] = { --- 467,470 ---- *************** *** 522,527 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellAutoWrapStringRenderer_methods[] = { --- 506,509 ---- *************** *** 829,834 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellEditor_methods[] = { --- 811,814 ---- *************** *** 890,895 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellTextEditor_methods[] = { --- 870,873 ---- *************** *** 937,942 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellNumberEditor_methods[] = { --- 915,918 ---- *************** *** 984,989 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellFloatEditor_methods[] = { --- 960,963 ---- *************** *** 1025,1030 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellBoolEditor_methods[] = { --- 999,1002 ---- *************** *** 1072,1077 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellChoiceEditor_methods[] = { --- 1044,1047 ---- *************** *** 1117,1122 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellEnumEditor_methods[] = { --- 1087,1090 ---- *************** *** 1158,1163 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellAutoWrapStringEditor_methods[] = { --- 1126,1129 ---- *************** *** 1782,1787 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellAttr_methods[] = { --- 1748,1751 ---- *************** *** 1984,1989 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellAttrProvider_methods[] = { --- 1948,1951 ---- *************** *** 2653,2658 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridTableBase_methods[] = { --- 2615,2618 ---- *************** *** 2740,2745 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridStringTable_methods[] = { --- 2700,2703 ---- *************** *** 2915,2920 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridTableMessage_methods[] = { --- 2873,2876 ---- *************** *** 3094,3099 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridCellCoords_methods[] = { --- 3050,3053 ---- *************** *** 6424,6429 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGrid_methods[] = { --- 6378,6381 ---- *************** *** 6893,6898 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridEvent_methods[] = { --- 6845,6848 ---- *************** *** 7086,7091 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridSizeEvent_methods[] = { --- 7036,7039 ---- *************** *** 7373,7378 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridRangeSelectEvent_methods[] = { --- 7321,7324 ---- *************** *** 7565,7570 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridEditorCreatedEvent_methods[] = { --- 7511,7514 ---- Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** file.cpp 18 Jan 2007 17:19:02 -0000 1.26 --- file.cpp 6 Feb 2007 04:17:43 -0000 1.27 *************** *** 2038,2043 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFile_methods[] = { --- 2038,2041 ---- *************** *** 2306,2311 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDir_methods[] = { --- 2304,2307 ---- *************** *** 2444,2449 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxStreamBase_methods[] = { --- 2440,2443 ---- *************** *** 2685,2690 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxInputStream_methods[] = { --- 2679,2682 ---- *************** *** 2854,2859 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxOutputStream_methods[] = { --- 2846,2849 ---- *************** *** 2943,2948 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFileInputStream_methods[] = { --- 2933,2936 ---- *************** *** 3028,3033 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFileOutputStream_methods[] = { --- 3016,3019 ---- Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** data.cpp 17 Dec 2006 07:47:14 -0000 1.28 --- data.cpp 6 Feb 2007 04:17:42 -0000 1.29 *************** *** 77,82 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxString_methods[] = { --- 77,80 ---- *************** *** 102,107 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxClientData_methods[] = { --- 100,103 ---- *************** *** 174,179 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxStringClientData_methods[] = { --- 170,173 ---- *************** *** 376,381 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxObject_methods[] = { --- 370,373 ---- *************** *** 431,436 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxObjectRefData_methods[] = { --- 423,426 ---- *************** *** 593,598 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxClassInfo_methods[] = { --- 583,586 ---- *************** *** 731,736 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxValidator_methods[] = { --- 719,722 ---- *************** *** 922,927 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTextValidator_methods[] = { --- 908,911 ---- *************** *** 1066,1071 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGenericValidator_methods[] = { --- 1050,1053 ---- *************** *** 1486,1490 **** { LuaMethod, "AppendStringKey", wxLua_wxList_AppendStringKey, 2, 2, s_wxluatagArray_wxLua_wxList_AppendStringKey }, #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) - }; static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); --- 1468,1471 ---- *************** *** 1506,1510 **** { LuaMethod, "Find", wxLua_wxList_Find1, 1, 1, s_wxluatagArray_wxLua_wxList_Find1 }, #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) - { LuaMethod, "FindNumKey", wxLua_wxList_FindNumKey, 1, 1, s_wxluatagArray_wxLua_wxList_FindNumKey }, { LuaMethod, "FindStringKey", wxLua_wxList_FindStringKey, 1, 1, s_wxluatagArray_wxLua_wxList_FindStringKey }, --- 1487,1490 ---- *************** *** 1530,1534 **** { LuaMethod, "InsertBefore", wxLua_wxList_InsertBefore, 2, 2, s_wxluatagArray_wxLua_wxList_InsertBefore }, #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) - }; static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); --- 1510,1513 ---- *************** *** 1659,1664 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxNode_methods[] = { --- 1638,1641 ---- Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** controls.cpp 19 Jan 2007 04:17:38 -0000 1.37 --- controls.cpp 6 Feb 2007 04:17:42 -0000 1.38 *************** *** 166,171 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxButton_methods[] = { --- 166,169 ---- *************** *** 436,441 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBitmapButton_methods[] = { --- 434,437 ---- *************** *** 610,615 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxToggleButton_methods[] = { --- 606,609 ---- *************** *** 845,850 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxCheckBox_methods[] = { --- 839,842 ---- *************** *** 1246,1250 **** { LuaMethod, "AppendStrings", wxLua_wxControlWithItems_AppendStrings, 1, 1, s_wxluatagArray_wxLua_wxControlWithItems_AppendStrings }, #endif // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox) - { LuaMethod, "Append", wxLua_wxControlWithItems_Append1, 1, 1, s_wxluatagArray_wxLua_wxControlWithItems_Append1 }, { LuaMethod, "AppendWithClientData", wxLua_wxControlWithItems_AppendWithClientData, 2, 2, s_wxluatagArray_wxLua_wxControlWithItems_AppendWithClientData }, --- 1238,1241 ---- *************** *** 1434,1439 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxChoice_methods[] = { --- 1425,1428 ---- *************** *** 1851,1856 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxComboBox_methods[] = { --- 1840,1843 ---- *************** *** 2137,2142 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGauge_methods[] = { --- 2124,2127 ---- *************** *** 2416,2421 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxListBox_methods[] = { --- 2401,2404 ---- *************** *** 2584,2589 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxCheckListBox_methods[] = { --- 2567,2570 ---- *************** *** 3852,3856 **** { LuaMethod, "FindItemAtPos", wxLua_wxListCtrl_FindItemAtPos, 3, 3, s_wxluatagArray_wxLua_wxListCtrl_FindItemAtPos }, #endif // (wxUSE_LISTCTRL && wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect) - { LuaMethod, "FindItem", wxLua_wxListCtrl_FindItem1, 3, 2, s_wxluatagArray_wxLua_wxListCtrl_FindItem1 }, { LuaMethod, "FindItemData", wxLua_wxListCtrl_FindItemData, 2, 2, s_wxluatagArray_wxLua_wxListCtrl_FindItemData }, --- 3833,3836 ---- *************** *** 4209,4214 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxListItemAttr_methods[] = { --- 4189,4192 ---- *************** *** 5113,5118 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxListEvent_methods[] = { --- 5091,5094 ---- *************** *** 5386,5391 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxListView_methods[] = { --- 5362,5365 ---- *************** *** 5936,5941 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxRadioButton_methods[] = { --- 5910,5913 ---- *************** *** 6163,6168 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxScrollBar_methods[] = { --- 6135,6138 ---- *************** *** 6600,6605 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSlider_methods[] = { --- 6570,6573 ---- *************** *** 6826,6831 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSpinButton_methods[] = { --- 6794,6797 ---- *************** *** 6941,6946 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSpinEvent_methods[] = { --- 6907,6910 ---- *************** *** 8132,8137 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTextCtrl_methods[] = { --- 8096,8099 ---- *************** *** 8711,8716 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTextAttr_methods[] = { --- 8673,8676 ---- *************** *** 10514,10519 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTreeItemAttr_methods[] = { --- 10474,10477 ---- *************** *** 11102,11107 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTreeItemData_methods[] = { --- 11060,11063 ---- *************** *** 11318,11323 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTreeEvent_methods[] = { --- 11274,11277 ---- *************** *** 11711,11716 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGenericDirCtrl_methods[] = { --- 11665,11668 ---- Index: regex.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/regex.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** regex.cpp 17 Dec 2006 07:47:16 -0000 1.16 --- regex.cpp 6 Feb 2007 04:17:45 -0000 1.17 *************** *** 299,304 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxRegEx_methods[] = { --- 299,302 ---- Index: socket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/socket.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** socket.cpp 17 Dec 2006 07:47:16 -0000 1.22 --- socket.cpp 6 Feb 2007 04:17:45 -0000 1.23 *************** *** 639,644 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSocketBase_methods[] = { --- 639,642 ---- *************** *** 772,777 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSocketClient_methods[] = { --- 770,773 ---- *************** *** 888,893 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSocketServer_methods[] = { --- 884,887 ---- *************** *** 1011,1016 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSocketEvent_methods[] = { --- 1005,1008 ---- *************** *** 1062,1067 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSockAddress_methods[] = { --- 1054,1057 ---- *************** *** 1239,1244 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxIPaddress_methods[] = { --- 1229,1232 ---- *************** *** 1328,1333 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxIPV4address_methods[] = { --- 1316,1319 ---- *************** *** 1473,1478 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxProtocol_methods[] = { --- 1459,1462 ---- *************** *** 1597,1602 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHTTP_methods[] = { --- 1581,1584 ---- *************** *** 2045,2050 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFTP_methods[] = { --- 2027,2030 ---- *************** *** 2550,2555 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxURI_methods[] = { --- 2530,2533 ---- *************** *** 2741,2746 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxURL_methods[] = { --- 2719,2722 ---- Index: clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/clipdrag.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** clipdrag.cpp 17 Dec 2006 07:47:14 -0000 1.25 --- clipdrag.cpp 6 Feb 2007 04:17:42 -0000 1.26 *************** *** 209,214 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxClipboard_methods[] = { --- 209,212 ---- *************** *** 599,604 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDataObject_methods[] = { --- 597,600 ---- *************** *** 771,776 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDataObjectSimple_methods[] = { --- 767,770 ---- *************** *** 862,867 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDataObjectComposite_methods[] = { --- 856,859 ---- *************** *** 965,970 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFileDataObject_methods[] = { --- 957,960 ---- *************** *** 1064,1069 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTextDataObject_methods[] = { --- 1054,1057 ---- *************** *** 1150,1155 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBitmapDataObject_methods[] = { --- 1138,1141 ---- *************** *** 1215,1220 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDropTarget_methods[] = { --- 1201,1204 ---- *************** *** 1465,1470 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDropSource_methods[] = { --- 1449,1452 ---- *************** *** 1607,1612 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDropFilesEvent_methods[] = { --- 1589,1592 ---- *************** *** 1719,1724 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMetafile_methods[] = { --- 1699,1702 ---- *************** *** 1813,1818 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMetafileDC_methods[] = { --- 1791,1794 ---- Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** dialogs.cpp 17 Dec 2006 07:47:15 -0000 1.23 --- dialogs.cpp 6 Feb 2007 04:17:43 -0000 1.24 *************** *** 279,284 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDialog_methods[] = { --- 279,282 ---- *************** *** 979,984 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxAboutDialogInfo_methods[] = { --- 977,980 ---- *************** *** 1092,1097 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxColourDialog_methods[] = { --- 1088,1091 ---- *************** *** 1282,1287 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxColourData_methods[] = { --- 1276,1279 ---- *************** *** 1619,1624 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFileDialog_methods[] = { --- 1611,1614 ---- *************** *** 1815,1820 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDirDialog_methods[] = { --- 1805,1808 ---- *************** *** 1895,1900 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMessageDialog_methods[] = { --- 1883,1886 ---- *************** *** 1999,2004 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMultiChoiceDialog_methods[] = { --- 1985,1988 ---- *************** *** 2119,2124 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSingleChoiceDialog_methods[] = { --- 2103,2106 ---- *************** *** 2222,2227 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTextEntryDialog_methods[] = { --- 2204,2207 ---- *************** *** 2292,2297 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPasswordEntryDialog_methods[] = { --- 2272,2275 ---- *************** *** 2364,2369 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFontDialog_methods[] = { --- 2342,2345 ---- *************** *** 2671,2676 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFontData_methods[] = { --- 2647,2650 ---- *************** *** 2830,2835 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFindReplaceDialog_methods[] = { --- 2804,2807 ---- *************** *** 2996,3001 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFindReplaceData_methods[] = { --- 2968,2971 ---- *************** *** 3185,3190 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFindDialogEvent_methods[] = { --- 3155,3158 ---- *************** *** 3294,3299 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxProgressDialog_methods[] = { --- 3262,3265 ---- *************** *** 3410,3415 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSplashScreen_methods[] = { --- 3376,3379 ---- *************** *** 3479,3484 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSplashScreenWindow_methods[] = { --- 3443,3446 ---- *************** *** 3736,3741 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxWizard_methods[] = { --- 3698,3701 ---- *************** *** 3808,3813 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxWizardPage_methods[] = { --- 3768,3771 ---- *************** *** 3947,3952 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxWizardPageSimple_methods[] = { --- 3905,3908 ---- *************** *** 4059,4064 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxWizardEvent_methods[] = { --- 4015,4018 ---- Index: html.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/html.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** html.cpp 17 Dec 2006 07:47:15 -0000 1.23 --- html.cpp 6 Feb 2007 04:17:44 -0000 1.24 *************** *** 458,463 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlCell_methods[] = { --- 458,461 ---- *************** *** 546,551 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlWidgetCell_methods[] = { --- 544,547 ---- *************** *** 657,662 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlLinkInfo_methods[] = { --- 653,656 ---- *************** *** 876,881 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlTag_methods[] = { --- 870,873 ---- *************** *** 1235,1240 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlContainerCell_methods[] = { --- 1227,1230 ---- *************** *** 1789,1794 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlWindow_methods[] = { --- 1779,1782 ---- *************** *** 1920,1925 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlParser_methods[] = { --- 1908,1911 ---- *************** *** 2542,2547 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlWinParser_methods[] = { --- 2528,2531 ---- *************** *** 2820,2825 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlWindowInterface_methods[] = { --- 2804,2807 ---- *************** *** 3052,3057 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlDCRenderer_methods[] = { --- 3034,3037 ---- *************** *** 3329,3334 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlEasyPrinting_methods[] = { --- 3309,3312 ---- *************** *** 3498,3503 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlPrintout_methods[] = { --- 3476,3479 ---- Index: sizer.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/sizer.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** sizer.cpp 17 Dec 2006 07:47:16 -0000 1.19 --- sizer.cpp 6 Feb 2007 04:17:45 -0000 1.20 *************** *** 620,625 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSizerItem_methods[] = { --- 620,623 ---- *************** *** 1547,1552 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSizer_methods[] = { --- 1545,1548 ---- *************** *** 1660,1665 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBoxSizer_methods[] = { --- 1656,1659 ---- *************** *** 1838,1843 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridSizer_methods[] = { --- 1832,1835 ---- *************** *** 2028,2033 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFlexGridSizer_methods[] = { --- 2020,2023 ---- *************** *** 2643,2648 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGridBagSizer_methods[] = { --- 2633,2636 ---- *************** *** 2844,2849 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGBPosition_methods[] = { --- 2832,2835 ---- *************** *** 3018,3023 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGBSpan_methods[] = { --- 3004,3007 ---- *************** *** 3322,3327 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGBSizerItem_methods[] = { --- 3306,3309 ---- *************** *** 3404,3409 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxNotebookSizer_methods[] = { --- 3386,3389 ---- *************** *** 3503,3508 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxStaticBoxSizer_methods[] = { --- 3483,3486 ---- *************** *** 3554,3559 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLayoutConstraints_methods[] = { --- 3532,3535 ---- *************** *** 3780,3785 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxIndividualLayoutConstraint_methods[] = { --- 3756,3759 ---- Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** gdi.cpp 4 Jan 2007 23:28:04 -0000 1.43 --- gdi.cpp 6 Feb 2007 04:17:43 -0000 1.44 *************** *** 1523,1531 **** #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxPointSizeRect) - #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "Contains", wxLua_wxRect_Contains1, 2, 2, s_wxluatagArray_wxLua_wxRect_Contains1 }, #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxPointSizeRect) - }; static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); --- 1523,1529 ---- *************** *** 1685,1690 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGDIObject_methods[] = { --- 1683,1686 ---- *************** *** 2295,2299 **** { LuaMethod, "ContainsRect", wxLua_wxRegion_ContainsRect, 1, 1, s_wxluatagArray_wxLua_wxRegion_ContainsRect }, #endif // (wxLUA_USE_wxRegion) && (wxLUA_USE_wxPointSizeRect) - { LuaMethod, "Contains", wxLua_wxRegion_Contains1, 2, 2, s_wxluatagArray_wxLua_wxRegion_Contains1 }, { LuaMethod, "ContainsRectDim", wxLua_wxRegion_ContainsRectDim, 4, 4, s_wxluatagArray_wxLua_wxRegion_ContainsRectDim }, --- 2291,2294 ---- *************** *** 2317,2321 **** { LuaMethod, "IntersectRect", wxLua_wxRegion_IntersectRect, 1, 1, s_wxluatagArray_wxLua_wxRegion_IntersectRect }, #endif // (wxLUA_USE_wxRegion) && (wxLUA_USE_wxPointSizeRect) - { LuaMethod, "Intersect", wxLua_wxRegion_Intersect1, 4, 4, s_wxluatagArray_wxLua_wxRegion_Intersect1 }, { LuaMethod, "IntersectRegion", wxLua_wxRegion_IntersectRegion, 1, 1, s_wxluatagArray_wxLua_wxRegion_IntersectRegion }, --- 2312,2315 ---- *************** *** 2339,2343 **** { LuaMethod, "SubtractRect", wxLua_wxRegion_SubtractRect, 1, 1, s_wxluatagArray_wxLua_wxRegion_SubtractRect }, #endif // (wxLUA_USE_wxRegion) && (wxLUA_USE_wxPointSizeRect) - { LuaMethod, "Subtract", wxLua_wxRegion_Subtract1, 4, 4, s_wxluatagArray_wxLua_wxRegion_Subtract1 }, { LuaMethod, "SubtractRegion", wxLua_wxRegion_SubtractRegion, 1, 1, s_wxluatagArray_wxLua_wxRegion_SubtractRegion }, --- 2333,2336 ---- *************** *** 2362,2375 **** #endif // ((wxLUA_USE_wxRegion) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxColourPenBrush) - #if (wxLUA_USE_wxRegion) && (wxLUA_USE_wxBitmap) { LuaMethod, "UnionBitmap", wxLua_wxRegion_UnionBitmap, 1, 1, s_wxluatagArray_wxLua_wxRegion_UnionBitmap }, #endif // (wxLUA_USE_wxRegion) && (wxLUA_USE_wxBitmap) - #if (wxLUA_USE_wxRegion) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "UnionRect", wxLua_wxRegion_UnionRect, 1, 1, s_wxluatagArray_wxLua_wxRegion_UnionRect }, #endif // (wxLUA_USE_wxRegion) && (wxLUA_USE_wxPointSizeRect) - { LuaMethod, "Union", wxLua_wxRegion_Union1, 4, 4, s_wxluatagArray_wxLua_wxRegion_Union1 }, { LuaMethod, "UnionRegion", wxLua_wxRegion_UnionRegion, 1, 1, s_wxluatagArray_wxLua_wxRegion_UnionRegion }, --- 2355,2365 ---- *************** *** 2393,2397 **** { LuaMethod, "XorRect", wxLua_wxRegion_XorRect, 1, 1, s_wxluatagArray_wxLua_wxRegion_XorRect }, #endif // (wxLUA_USE_wxRegion) && (wxLUA_USE_wxPointSizeRect) - { LuaMethod, "Xor", wxLua_wxRegion_Xor1, 4, 4, s_wxluatagArray_wxLua_wxRegion_Xor1 }, { LuaMethod, "XorRegion", wxLua_wxRegion_XorRegion, 1, 1, s_wxluatagArray_wxLua_wxRegion_XorRegion }, --- 2383,2386 ---- *************** *** 2416,2420 **** { LuaConstructor, "wxRegionFromRect", wxLua_wxRegionFromRect_constructor, 1, 1, s_wxluatagArray_wxLua_wxRegionFromRect_constructor }, #endif // (wxLUA_USE_wxRegion) && (wxLUA_USE_wxPointSizeRect) - { LuaConstructor, "wxRegion", wxLua_wxRegion_constructor1, 4, 0, s_wxluatagArray_wxLua_wxRegion_constructor1 }, { LuaConstructor, "wxRegionCopy", wxLua_wxRegionCopy_constructor, 1, 1, s_wxluatagArray_wxLua_wxRegionCopy_constructor }, --- 2405,2408 ---- *************** *** 2642,2647 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxRegionIterator_methods[] = { --- 2630,2633 ---- *************** *** 3148,3153 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFont_methods[] = { --- 3134,3137 ---- *************** *** 3377,3382 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFontEnumerator_methods[] = { --- 3361,3364 ---- *************** *** 3465,3470 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFontList_methods[] = { --- 3447,3450 ---- *************** *** 3747,3752 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFontMapper_methods[] = { --- 3727,3730 ---- *************** *** 3976,3981 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxColour_methods[] = { --- 3954,3957 ---- *************** *** 4108,4113 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxColourDatabase_methods[] = { --- 4084,4087 ---- *************** *** 4532,4536 **** { LuaConstructor, "wxPenFromBitmap", wxLua_wxPenFromBitmap_constructor, 2, 2, s_wxluatagArray_wxLua_wxPenFromBitmap_constructor }, #endif // ((wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxBitmap)) && ((defined(__WXMSW__)) && (wxLUA_USE_wxColourPenBrush)) - { LuaConstructor, "wxPen", wxLua_wxPen_constructor1, 0, 0, s_wxluatagArray_wxLua_wxPen_constructor1 }, { LuaConstructor, "wxPenFromColour", wxLua_wxPenFromColour_constructor, 3, 3, s_wxluatagArray_wxLua_wxPenFromColour_constructor }, --- 4506,4509 ---- *************** *** 4636,4641 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPenList_methods[] = { --- 4609,4612 ---- *************** *** 5044,5049 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBrushList_methods[] = { --- 5015,5018 ---- *************** *** 5237,5242 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPalette_methods[] = { --- 5206,5209 ---- *************** *** 5481,5486 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxIcon_methods[] = { --- 5448,5451 ---- *************** *** 5710,5715 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBitmapHandler_methods[] = { --- 5675,5678 ---- *************** *** 5736,5741 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGDIImageHandler_methods[] = { --- 5699,5702 ---- *************** *** 5762,5767 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGDIImageHandlerList_methods[] = { --- 5723,5726 ---- *************** *** 6298,6303 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBitmap_methods[] = { --- 6257,6260 ---- *************** *** 6630,6635 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxCursor_methods[] = { --- 6587,6590 ---- *************** *** 6857,6870 **** #endif // ((defined(__WXMSW__)) && (wxLUA_USE_wxMask)) && (wxLUA_USE_wxBitmap) - #if ((wxLUA_USE_wxMask) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxColourPenBrush) { LuaMethod, "CreateColour", wxLua_wxMask_CreateColour, 2, 2, s_wxluatagArray_wxLua_wxMask_CreateColour }, #endif // ((wxLUA_USE_wxMask) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxColourPenBrush) - #if (wxLUA_USE_wxMask) && (wxLUA_USE_wxBitmap) { LuaMethod, "Create", wxLua_wxMask_Create1, 1, 1, s_wxluatagArray_wxLua_wxMask_Create1 }, #endif // (wxLUA_USE_wxMask) && (wxLUA_USE_wxBitmap) - }; static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); --- 6812,6822 ---- *************** *** 7236,7249 **** #endif // ((wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImageList) - #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImageList) { LuaMethod, "Add", wxLua_wxImageList_Add1, 2, 1, s_wxluatagArray_wxLua_wxImageList_Add1 }, #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxImageList) - #if (wxLUA_USE_wxIcon) && (wxLUA_USE_wxImageList) { LuaMethod, "AddIcon", wxLua_wxImageList_AddIcon, 1, 1, s_wxluatagArray_wxLua_wxImageList_AddIcon }, #endif // (wxLUA_USE_wxIcon) && (wxLUA_USE_wxImageList) - }; static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); --- 7188,7198 ---- *************** *** 8723,8727 **** { LuaMethod, "DrawCheckMarkRect", wxLua_wxDC_DrawCheckMarkRect, 1, 1, s_wxluatagArray_wxLua_wxDC_DrawCheckMarkRect }, #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) - { LuaMethod, "DrawCheckMark", wxLua_wxDC_DrawCheckMark1, 4, 4, s_wxluatagArray_wxLua_wxDC_DrawCheckMark1 }, }; --- 8672,8675 ---- *************** *** 8745,8753 **** #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxDC) - #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) { LuaMethod, "DrawLabel", wxLua_wxDC_DrawLabel1, 4, 2, s_wxluatagArray_wxLua_wxDC_DrawLabel1 }, #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) - }; static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); --- 8693,8699 ---- *************** *** 8769,8773 **** { LuaMethod, "SetClippingRegion", wxLua_wxDC_SetClippingRegion1, 1, 1, s_wxluatagArray_wxLua_wxDC_SetClippingRegion1 }, #endif // (wxLUA_USE_wxRegion) && (wxLUA_USE_wxDC) - { LuaMethod, "SetClippingRegionXYWH", wxLua_wxDC_SetClippingRegionXYWH, 4, 4, s_wxluatagArray_wxLua_wxDC_SetClippingRegionXYWH }, }; --- 8715,8718 ---- *************** *** 8986,8991 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMemoryDC_methods[] = { --- 8931,8934 ---- *************** *** 9057,9062 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxWindowDC_methods[] = { --- 9000,9003 ---- *************** *** 9123,9128 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxClientDC_methods[] = { --- 9064,9067 ---- *************** *** 9189,9194 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPaintDC_methods[] = { --- 9128,9131 ---- *************** *** 9305,9310 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxScreenDC_methods[] = { --- 9242,9245 ---- *************** *** 9488,9496 **** #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxDC) - #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) { LuaMethod, "Init", wxLua_wxBufferedDC_Init1, 3, 2, s_wxluatagArray_wxLua_wxBufferedDC_Init1 }, #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) - }; static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); --- 9423,9429 ---- *************** *** 9513,9521 **** #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxDC) - #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) { LuaConstructor, "wxBufferedDCFromSize", wxLua_wxBufferedDCFromSize_constructor, 3, 2, s_wxluatagArray_wxLua_wxBufferedDCFromSize_constructor }, #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) - { LuaConstructor, "wxBufferedDC", wxLua_wxBufferedDC_constructor1, 0, 0, s_wxluatagArray_wxLua_wxBufferedDC_constructor1 }, }; --- 9446,9452 ---- *************** *** 9649,9653 **** { LuaConstructor, "wxBufferedPaintDCFromBitmap", wxLua_wxBufferedPaintDCFromBitmap_constructor, 3, 2, s_wxluatagArray_wxLua_wxBufferedPaintDCFromBitmap_constructor }, #endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxDC) - { LuaConstructor, "wxBufferedPaintDC", wxLua_wxBufferedPaintDC_constructor1, 2, 1, s_wxluatagArray_wxLua_wxBufferedPaintDC_constructor1 }, }; --- 9580,9583 ---- *************** *** 9731,9736 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxMirrorDC_methods[] = { --- 9661,9664 ---- *************** *** 9842,9846 **** { LuaConstructor, "wxDCClipper", wxLua_wxDCClipper_constructor1, 2, 2, s_wxluatagArray_wxLua_wxDCClipper_constructor1 }, #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) - { LuaConstructor, "wxDCClipperFromCoords", wxLua_wxDCClipperFromCoords_constructor, 5, 5, s_wxluatagArray_wxLua_wxDCClipperFromCoords_constructor }, }; --- 9770,9773 ---- *************** *** 10239,10243 **** { LuaMethod, "Create", wxLua_wxCaret_Create1, 2, 2, s_wxluatagArray_wxLua_wxCaret_Create1 }, #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxCaret) - { LuaMethod, "CreateFromWH", wxLua_wxCaret_CreateFromWH, 3, 3, s_wxluatagArray_wxLua_wxCaret_CreateFromWH }, }; --- 10166,10169 ---- *************** *** 10260,10264 **** { LuaMethod, "Move", wxLua_wxCaret_Move1, 1, 1, s_wxluatagArray_wxLua_wxCaret_Move1 }, #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxCaret) - { LuaMethod, "MoveXY", wxLua_wxCaret_MoveXY, 2, 2, s_wxluatagArray_wxLua_wxCaret_MoveXY }, }; --- 10186,10189 ---- *************** *** 10281,10285 **** { LuaMethod, "SetSize", wxLua_wxCaret_SetSize1, 1, 1, s_wxluatagArray_wxLua_wxCaret_SetSize1 }, #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxCaret) - { LuaMethod, "SetSizeWH", wxLua_wxCaret_SetSizeWH, 2, 2, s_wxluatagArray_wxLua_wxCaret_SetSizeWH }, }; --- 10206,10209 ---- *************** *** 10535,10540 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGLCanvas_methods[] = { --- 10459,10462 ---- *************** *** 10736,10741 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxGLContext_methods[] = { --- 10658,10661 ---- *************** *** 10906,10911 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxVideoMode_methods[] = { --- 10826,10829 ---- *************** *** 11456,11461 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDisplay_methods[] = { --- 11374,11377 ---- Index: print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** print.cpp 21 Jan 2007 23:13:07 -0000 1.21 --- print.cpp 6 Feb 2007 04:17:45 -0000 1.22 *************** *** 296,301 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPrintout_methods[] = { --- 296,299 ---- *************** *** 535,540 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPrinter_methods[] = { --- 533,536 ---- *************** *** 1069,1074 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPrintData_methods[] = { --- 1065,1068 ---- *************** *** 1722,1727 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPageSetupDialogData_methods[] = { --- 1716,1719 ---- *************** *** 1865,1870 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPageSetupDialog_methods[] = { --- 1857,1860 ---- *************** *** 1986,1991 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPrintDialog_methods[] = { --- 1976,1979 ---- *************** *** 2560,2565 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPrintDialogData_methods[] = { --- 2548,2551 ---- *************** *** 2668,2673 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPreviewCanvas_methods[] = { --- 2654,2657 ---- *************** *** 2767,2772 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPreviewControlBar_methods[] = { --- 2751,2754 ---- *************** *** 3130,3135 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPrintPreview_methods[] = { --- 3112,3115 ---- *************** *** 3296,3301 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPreviewFrame_methods[] = { --- 3276,3279 ---- *************** *** 3404,3409 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPostScriptDC_methods[] = { --- 3382,3385 ---- *************** *** 3480,3485 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxPrinterDC_methods[] = { --- 3456,3459 ---- Index: help.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/help.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** help.cpp 17 Dec 2006 07:47:15 -0000 1.18 --- help.cpp 6 Feb 2007 04:17:44 -0000 1.19 *************** *** 332,337 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHelpController_methods[] = { --- 332,335 ---- *************** *** 417,422 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxWinHelpController_methods[] = { --- 415,418 ---- *************** *** 445,450 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxBestHelpController_methods[] = { --- 441,444 ---- *************** *** 507,512 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxExtHelpController_methods[] = { --- 501,504 ---- *************** *** 640,645 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlHelpData_methods[] = { --- 632,635 ---- *************** *** 929,934 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxHtmlHelpController_methods[] = { --- 919,922 ---- Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** appframe.cpp 19 Dec 2006 06:18:02 -0000 1.29 --- appframe.cpp 6 Feb 2007 04:17:41 -0000 1.30 *************** *** 326,331 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxApp_methods[] = { --- 326,329 ---- *************** *** 701,706 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTopLevelWindow_methods[] = { --- 699,702 ---- *************** *** 1141,1146 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxFrame_methods[] = { --- 1137,1140 ---- *************** *** 1312,1316 **** { LuaConstructor, "wxMiniFrame", wxLua_wxMiniFrame_constructor1, 7, 3, s_wxluatagArray_wxLua_wxMiniFrame_constructor1 }, #endif // (wxLUA_USE_wxPointSizeRect) && ((wxLUA_USE_wxMiniFrame) && (wxLUA_USE_wxFrame)) - }; static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); --- 1306,1309 ---- *************** *** 1761,1766 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxToolTip_methods[] = { --- 1754,1757 ---- *************** *** 1942,1947 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxAcceleratorTable_methods[] = { --- 1933,1936 ---- *************** *** 2248,2253 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTaskBarIcon_methods[] = { --- 2237,2240 ---- *************** *** 2287,2292 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTaskBarIconEvent_methods[] = { --- 2274,2277 ---- *************** *** 2313,2318 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSystemSettings_methods[] = { --- 2298,2301 ---- *************** *** 2339,2344 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxSystemOptions_methods[] = { --- 2322,2325 ---- Index: datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** datetime.cpp 18 Jan 2007 17:19:02 -0000 1.23 --- datetime.cpp 6 Feb 2007 04:17:42 -0000 1.24 *************** *** 1430,1438 **** #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDateSpan && wxUSE_DATETIME) - #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxTimeSpan && wxUSE_DATETIME) { LuaMethod, "Add", wxLua_wxDateTime_Add1, 1, 1, s_wxluatagArray_wxLua_wxDateTime_Add1 }, #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxTimeSpan && wxUSE_DATETIME) - }; static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); --- 1430,1436 ---- *************** *** 1455,1463 **** #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDateSpan && wxUSE_DATETIME) - #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxTimeSpan && wxUSE_DATETIME) { LuaMethod, "Subtract", wxLua_wxDateTime_Subtract1, 1, 1, s_wxluatagArray_wxLua_wxDateTime_Subtract1 }, #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxTimeSpan && wxUSE_DATETIME) - }; static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); --- 1453,1459 ---- *************** *** 2420,2425 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTimeSpan_methods[] = { --- 2416,2419 ---- *************** *** 2938,2943 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDateSpan_methods[] = { --- 2932,2935 ---- *************** *** 3062,3067 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDateTimeHolidayAuthority_methods[] = { --- 3054,3057 ---- *************** *** 3110,3115 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDateTimeWorkDays_methods[] = { --- 3100,3103 ---- *************** *** 3275,3280 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTimer_methods[] = { --- 3263,3266 ---- *************** *** 3345,3350 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxTimerEvent_methods[] = { --- 3331,3334 ---- *************** *** 3793,3798 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxCalendarCtrl_methods[] = { --- 3777,3780 ---- *************** *** 4238,4243 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxCalendarDateAttr_methods[] = { --- 4220,4223 ---- *************** *** 4384,4389 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDateEvent_methods[] = { --- 4364,4367 ---- *************** *** 4494,4499 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxCalendarEvent_methods[] = { --- 4472,4475 ---- *************** *** 4680,4685 **** - - // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxDatePickerCtrl_methods[] = { --- 4656,4659 ---- Index: event.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/event.cpp,v retrieving revisi... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-02-05 23:24:01
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6261/docs Modified Files: wxlua.html Log Message: add comments for virtual functions and how to use them for wxLuaPrintout and wxLuaHtmlWindow Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxlua.html 19 Dec 2006 17:06:16 -0000 1.11 --- wxlua.html 5 Feb 2007 23:23:56 -0000 1.12 *************** *** 942,948 **** operator to copy the values from pt1. We then change the value of pt1, test if pt2 has changed, it hasn't, and the test to see if they're ! still equal and as expected, they're not.<br> ! </li> </ul> --- 942,993 ---- operator to copy the values from pt1. We then change the value of pt1, test if pt2 has changed, it hasn't, and the test to see if they're ! still equal and as expected, they're not.</li> ! </ul> ! ! <li><b>Extending classes</b> </li> ! ! <ul> ! ! <li>You cannot arbitrarily override "virtual" functions ! in wxLua as this must be done in C++. The class must be subclassed and ! the virtual functions overridden to check to see if there is a ! lua function to call instead of the base class function. This has only ! been done for cases where it is necessary, in many cases you can ! intercept the appropriate wxEvent and change the behavior from within ! the handler. Examples of virtual functions that must or can be ! overridden are in wxLuaPrintout class, see the printing ! sample, and wxLuaHtmlWindow, see html sample. The only virtual ! functions that you can override are marked with comments in the binding ! files and wxluaref.htm. </li> ! ! <li>You may also add your own functions to classes that ! will not be called by C++, but can be called from lua. This makes sense ! if you would rather keep functions that act on a particular class with ! it rather than having global functions that take that class as a ! parameter.</li> ! ! <ul> ! ! <li>Example : <i>"r = ! wx.wxRect(1,2,3,4); r.PrintXY = function(self) print(self:GetX(), ! self:GetY()) end; r:PrintXY()"</i> adds the function PrintXY to ! the wxRect instance r. The userdata, class instance, r is ! passed to the lua function as the parameter "self" which is pushed onto ! the stack when the PrintXY function is called with the ":" notation.</li> ! ! <li>Note that the above example is the same as <i>"</i><i>r ! = wx.wxRect(1,2,3,4); </i><i>function wxRect_PrintXY(r) ! print(r:GetX(), r:GetY()) end; wxRect_PrintXY(r)"</i>.</li> ! ! <li>You may also create the lua function beforehand and ! then assign it to the rect object. <i>"function ! wxRect_PrintXY_func(self) print(self:GetX(), self:GetY()) end; ! r1 = wx.wxRect(1,2,3,4); r1.PrintXY = wxRect_PrintXY_func; r1:PrintXY()"</i>. ! You can see that using this idea you can make a lua function ! that creates a new wxRect, sets your extra functions ! for it, and returns it for use.</li> ! ! </ul> </ul> |
|
From: John L. <jr...@us...> - 2007-02-05 23:24:00
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6261/bindings/wxwidgets Modified Files: wxlua.i Log Message: add comments for virtual functions and how to use them for wxLuaPrintout and wxLuaHtmlWindow Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxlua.i 7 Dec 2006 06:32:42 -0000 1.19 --- wxlua.i 5 Feb 2007 23:23:56 -0000 1.20 *************** *** 56,60 **** --- 56,74 ---- wxLuaObject *GetID() + + // This is an added function to wxPrintout so you don't have to override GetPageInfo void SetPageInfo(int minPage, int maxPage, int pageFrom = 0, int pageTo = 0) + + // The functions below are all virtual functions that you can override in lua. + // See the printing sample and wxPrintout for proper parameters and usage. + //void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) + //bool HasPage(int pageNum) + //bool OnBeginDocument(int startPage, int endPage) + //void OnEndDocument() + //void OnBeginPrinting() + //void OnEndPrinting() + //void OnPreparePrinting() + //bool OnPrintPage(int pageNum) + %endclass *************** *** 70,73 **** --- 84,95 ---- %class wxLuaHtmlWindow, wxHtmlWindow wxLuaHtmlWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxHW_SCROLLBAR_AUTO, const wxString& name = "wxLuaHtmlWindow") + + // The functions below are all virtual functions that you can override in lua. + // See the html sample and wxHtmlWindow for proper parameters and usage. + //bool OnCellClicked(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& event) + //void OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y) + //void OnLinkClicked(const wxHtmlLinkInfo& link) + //void OnSetTitle(const wxString& title) + %endclass |
|
From: Francesco M. <fr...@us...> - 2007-02-03 19:47:46
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14409/build/bakefiles Modified Files: wxlua.bkl Log Message: add RUNTIME_LIBS to the list of global options to pass to subprojects Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxlua.bkl 24 Dec 2006 11:00:21 -0000 1.33 --- wxlua.bkl 3 Feb 2007 19:47:41 -0000 1.34 *************** *** 36,40 **** <!-- global options --> ! USE_SYSTEM_LUA LUA_DIR <!-- wxWidgets build selection options --> --- 36,40 ---- <!-- global options --> ! USE_SYSTEM_LUA LUA_DIR RUNTIME_LIBS <!-- wxWidgets build selection options --> |
|
From: Francesco M. <fr...@us...> - 2007-02-03 19:47:46
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14409/build/msw Modified Files: makefile.gcc makefile.vc makefile.wat Log Message: add RUNTIME_LIBS to the list of global options to pass to subprojects Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** makefile.vc 3 Feb 2007 19:12:22 -0000 1.41 --- makefile.vc 3 Feb 2007 19:47:41 -0000 1.42 *************** *** 66,69 **** --- 66,75 ---- LUA_DIR = ..\..\..\modules\lua + # 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] + RUNTIME_LIBS = dynamic + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** makefile.wat 3 Feb 2007 19:12:22 -0000 1.40 --- makefile.wat 3 Feb 2007 19:47:41 -0000 1.41 *************** *** 66,69 **** --- 66,75 ---- LUA_DIR = ..\..\..\modules\lua + # 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] + RUNTIME_LIBS = dynamic + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** makefile.gcc 3 Feb 2007 19:12:22 -0000 1.39 --- makefile.gcc 3 Feb 2007 19:47:41 -0000 1.40 *************** *** 59,62 **** --- 59,68 ---- LUA_DIR = ..\..\..\modules\lua + # 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] + RUNTIME_LIBS = dynamic + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 |
|
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)" |
|
From: Francesco M. <fr...@us...> - 2007-02-03 19:12:26
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32395/apps/build/msw Modified Files: makefile.bcc makefile.vc makefile.wat Log Message: added the RUNTIME_LIBS option to the bakefile build system Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** makefile.vc 19 Dec 2006 22:24:11 -0000 1.58 --- makefile.vc 3 Feb 2007 19:12:21 -0000 1.59 *************** *** 60,63 **** --- 60,69 ---- LUA_DIR = ..\..\..\modules\lua + # 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] + RUNTIME_LIBS = dynamic + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 89,94 **** ### Variables: ### ! APP_LUA_CFLAGS = /MD$(____BUILD_13) /DWIN32 $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ --- 95,100 ---- ### Variables: ### ! APP_LUA_CFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ *************** *** 99,104 **** APP_LUA_OBJECTS = \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj ! APP_WXLUA_CXXFLAGS = /MD$(____BUILD_13) /DWIN32 $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ --- 105,110 ---- APP_LUA_OBJECTS = \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ *************** *** 111,116 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /MD$(____BUILD_13) /DWIN32 $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ --- 117,122 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ *************** *** 124,129 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /MD$(____BUILD_13) /DWIN32 $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ --- 130,135 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ *************** *** 139,144 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /MD$(____BUILD_13) /DWIN32 $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ --- 145,150 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ *************** *** 274,277 **** --- 280,289 ---- ____BUILD_13 = !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS = L + !endif !if "$(SHARED)" == "0" __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_lib Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** makefile.bcc 19 Dec 2006 22:24:11 -0000 1.58 --- makefile.bcc 3 Feb 2007 19:12:21 -0000 1.59 *************** *** 90,93 **** --- 90,101 ---- !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 + # Compile the wxLua app ? [0,1] !ifndef USE_WXLUAAPP *************** *** 133,156 **** ### Variables: ### ! APP_LUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj ! APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_lconsole.obj ! APP_WXLUAEDIT_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ --- 141,164 ---- ### Variables: ### ! APP_LUA_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj ! APP_WXLUA_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_lconsole.obj ! APP_WXLUAEDIT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ *************** *** 159,166 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj ! APP_WXLUACAN_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) --- 167,174 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj ! APP_WXLUACAN_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) *************** *** 171,178 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_canlua.obj ! APP_WXLUAFREEZE_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ --- 179,186 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_canlua.obj ! APP_WXLUAFREEZE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ *************** *** 266,269 **** --- 274,289 ---- ____BUILD = -O2 !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS = -tWR + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS = + !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_3 = i + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_3 = + !endif !if "$(SHARED)" == "0" __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib *************** *** 375,382 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_4 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_4 = -v- !endif !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" --- 395,402 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_7 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_7 = -v- !endif !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" *************** *** 435,446 **** ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe: $(APP_LUA_OBJECTS) ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -ap @&&| ! c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32.lib,, | !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif --- 455,466 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe: $(APP_LUA_OBJECTS) ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -ap @&&| ! c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32$(__RUNTIME_LIBS_3).lib,, | !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif *************** *** 448,453 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)\lib @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif --- 468,473 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)\lib @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif *************** *** 455,460 **** !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif --- 475,480 ---- !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif *************** *** 462,467 **** !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif --- 482,487 ---- !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** makefile.wat 19 Dec 2006 22:24:11 -0000 1.59 --- makefile.wat 3 Feb 2007 19:12:21 -0000 1.60 *************** *** 60,63 **** --- 60,69 ---- LUA_DIR = ..\..\..\modules\lua + # 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] + RUNTIME_LIBS = dynamic + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 176,185 **** __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\wat$(WXLIBPOSTFIX)_dll !endif ! ____BUILD_6 = !ifeq BUILD debug ! ____BUILD_6 = -wx !endif !ifeq BUILD release ! ____BUILD_6 = !endif ____BUILD = --- 182,191 ---- __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\wat$(WXLIBPOSTFIX)_dll !endif ! ____BUILD_7 = !ifeq BUILD debug ! ____BUILD_7 = -wx !endif !ifeq BUILD release ! ____BUILD_7 = !endif ____BUILD = *************** *** 190,206 **** ____BUILD = -ot -ox !endif ! ____BUILD_7 = !ifeq BUILD debug ! ____BUILD_7 = -d2 !endif !ifeq BUILD release ! ____BUILD_7 = -d0 !endif ! ____BUILD_8 = !ifeq BUILD debug ! ____BUILD_8 = debug all !endif !ifeq BUILD release ! ____BUILD_8 = !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = --- 196,219 ---- ____BUILD = -ot -ox !endif ! ____BUILD_8 = !ifeq BUILD debug ! ____BUILD_8 = -d2 !endif !ifeq BUILD release ! ____BUILD_8 = -d0 !endif ! ____BUILD_9 = !ifeq BUILD debug ! ____BUILD_9 = debug all !endif !ifeq BUILD release ! ____BUILD_9 = ! !endif ! __RUNTIME_LIBS = ! !ifeq RUNTIME_LIBS dynamic ! __RUNTIME_LIBS = -br ! !endif ! !ifeq RUNTIME_LIBS static ! __RUNTIME_LIBS = !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = *************** *** 485,498 **** APP_LUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_6) $(____BUILD) & ! $(____BUILD_7) -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include & ! -i=..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_6) $(____BUILD) & ! $(____BUILD_7) -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include & ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj & --- 498,511 ---- APP_LUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj & *************** *** 500,507 **** APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_6) $(____BUILD) & ! $(____BUILD_7) -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include & ! -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $(CPPFLAGS) & ! $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj & --- 513,520 ---- APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=$(WXSTEDIT_DIR)\include & ! -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj & *************** *** 509,515 **** APP_WXLUACAN_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_6) $(____BUILD) & ! $(____BUILD_7) -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include & ! -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj & --- 522,529 ---- APP_WXLUACAN_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) & ! $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj & *************** *** 520,526 **** APP_WXLUAFREEZE_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_6) $(____BUILD) & ! $(____BUILD_7) -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include & ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj --- 534,540 ---- APP_WXLUAFREEZE_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj *************** *** 552,556 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt ref 'main_' @for %i in ($(APP_LUA_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc file %i @for %i in ( wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc library %i --- 566,570 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt ref 'main_' @for %i in ($(APP_LUA_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc file %i @for %i in ( wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc library %i *************** *** 567,571 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc library %i --- 581,585 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc library %i *************** *** 584,588 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc library %i --- 598,602 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc library %i *************** *** 599,603 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc library %i --- 613,617 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc library %i *************** *** 613,617 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAFREEZE_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc library %i --- 627,631 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAFREEZE_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc library %i |
|
From: Francesco M. <fr...@us...> - 2007-02-03 19:12:26
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32395 Modified Files: Makefile.in Log Message: added the RUNTIME_LIBS option to the bakefile build system Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.in 24 Dec 2006 11:00:20 -0000 1.21 --- Makefile.in 3 Feb 2007 19:12:21 -0000 1.22 *************** *** 34,39 **** install: all install_modules $(__install_apps___depname) samples desktop mime icon ! $(INSTALL_DIR) $(DESTDIR)$(libdir)/pkgconfig ! $(INSTALL_DATA) $(top_builddir)/build/autoconf/wxlua.pc $(DESTDIR)$(libdir)/pkgconfig uninstall: uninstall_modules $(__uninstall_apps___depname) --- 34,39 ---- install: all install_modules $(__install_apps___depname) samples desktop mime icon ! $(INSTALL_DIR) $(libdir)/pkgconfig ! $(INSTALL_DATA) $(top_builddir)/build/autoconf/wxlua.pc $(libdir)/pkgconfig uninstall: uninstall_modules $(__uninstall_apps___depname) |
|
From: Francesco M. <fr...@us...> - 2007-02-03 19:12:25
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32395/modules/build/msw Modified Files: makefile.bcc makefile.vc makefile.wat Log Message: added the RUNTIME_LIBS option to the bakefile build system Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** makefile.vc 20 Dec 2006 16:39:44 -0000 1.59 --- makefile.vc 3 Feb 2007 19:12:22 -0000 1.60 *************** *** 63,66 **** --- 63,72 ---- LUA_DIR = ..\..\..\modules\lua + # 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] + RUNTIME_LIBS = dynamic + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 145,154 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_loadlib.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_linit.obj ! WXLUA_LIB_CXXFLAGS = /MD$(____BUILD_1_14) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 151,160 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_loadlib.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_linit.obj ! WXLUA_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 161,170 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_dummy.obj ! WXLUA_DLL_CXXFLAGS = /MD$(____BUILD_1_14) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 167,176 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_dummy.obj ! WXLUA_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 177,186 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj ! WXBIND_LIB_CXXFLAGS = /MD$(____BUILD_1_14) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 183,192 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj ! WXBIND_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 220,229 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = /MD$(____BUILD_1_14) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 226,235 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 263,272 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = /MD$(____BUILD_1_14) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 269,278 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 278,287 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_dummy.obj ! WXBINDSTC_DLL_CXXFLAGS = /MD$(____BUILD_1_14) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 284,293 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_dummy.obj ! WXBINDSTC_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 294,303 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj ! WXLUADEBUG_LIB_CXXFLAGS = /MD$(____BUILD_1_14) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 300,309 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj ! WXLUADEBUG_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 310,319 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = /MD$(____BUILD_1_14) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 316,325 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 327,336 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = /MD$(____BUILD_1_14) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 333,342 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 346,355 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj ! WXLUASOCKET_DLL_CXXFLAGS = /MD$(____BUILD_1_14) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_11) \ ! $(____BUILD_1_12) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 352,361 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj ! WXLUASOCKET_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 366,374 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj ! MOD_LUAMODULE_CXXFLAGS = /MD$(____BUILD_1_14) /DWIN32 $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_11) \ ! $(____BUILD_1_12) $(______BUILD) /Fd..\..\..\lib\vc_dll\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ /DWXMAKINGDLL_LUAMODULE /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) --- 372,380 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj ! MOD_LUAMODULE_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) /Fd..\..\..\lib\vc_dll\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ /DWXMAKINGDLL_LUAMODULE /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) *************** *** 476,495 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_11 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_1_11 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_12 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_1_12 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_13 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_1_13 = !endif !if "$(BUILD)" == "debug" --- 482,501 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_13 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_1_13 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_14 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_1_14 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_15 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_1_15 = !endif !if "$(BUILD)" == "debug" *************** *** 500,507 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_14 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_1_14 = !endif !if "$(SHARED)" == "0" --- 506,519 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_16 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_1_16 = ! !endif ! !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS = D ! !endif ! !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS = L !endif !if "$(SHARED)" == "0" *************** *** 686,690 **** !if "$(SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj $(WXLUA_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUA_DLL_OBJECTS) lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib << --- 698,702 ---- !if "$(SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj $(WXLUA_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUA_DLL_OBJECTS) lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib << *************** *** 701,705 **** !if "$(SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_dummy.obj $(WXBIND_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXBIND_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib << --- 713,717 ---- !if "$(SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_dummy.obj $(WXBIND_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXBIND_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib << *************** *** 716,720 **** !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj $(WXBINDSTC_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXBINDSTC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib << --- 728,732 ---- !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj $(WXBINDSTC_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXBINDSTC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib << *************** *** 731,735 **** !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_dummy.obj $(WXLUADEBUG_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUADEBUG_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib << --- 743,747 ---- !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_dummy.obj $(WXLUADEBUG_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUADEBUG_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib << *************** *** 746,750 **** !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj $(WXLUASOCKET_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUASOCKET_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib << --- 758,762 ---- !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj $(WXLUASOCKET_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUASOCKET_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib << *************** *** 753,757 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ..\..\..\lib\vc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << --- 765,769 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ..\..\..\lib\vc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** makefile.bcc 20 Dec 2006 16:39:44 -0000 1.60 --- makefile.bcc 3 Feb 2007 19:12:22 -0000 1.61 *************** *** 95,98 **** --- 95,106 ---- !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 *************** *** 185,192 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_loadlib.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_linit.obj ! WXLUA_LIB_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ --- 193,201 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_loadlib.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_linit.obj ! WXLUA_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ *************** *** 198,205 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_dummy.obj ! WXLUA_DLL_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ --- 207,215 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_dummy.obj ! WXLUA_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ *************** *** 211,218 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlstate.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj ! WXBIND_LIB_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ --- 221,229 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlstate.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj ! WXBIND_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ *************** *** 251,258 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_thread.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBIND \ --- 262,270 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_thread.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBIND \ *************** *** 291,298 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_thread.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ --- 303,311 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_thread.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ *************** *** 303,310 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_dummy.obj ! WXBINDSTC_DLL_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ --- 316,324 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_dummy.obj ! WXBINDSTC_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ *************** *** 315,322 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj ! WXLUADEBUG_LIB_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ --- 329,337 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj ! WXLUADEBUG_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ *************** *** 328,335 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_splttree.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ --- 343,351 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_splttree.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ *************** *** 341,349 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_splttree.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ --- 357,365 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_splttree.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ *************** *** 358,366 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_dservice.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj ! WXLUASOCKET_DLL_CXXFLAGS = -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ --- 374,382 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_dservice.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj ! WXLUASOCKET_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ *************** *** 375,382 **** bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj ! MOD_LUAMODULE_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS) --- 391,398 ---- bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj ! MOD_LUAMODULE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ ! $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS) *************** *** 483,486 **** --- 499,514 ---- ____BUILD = -O2 !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS = -tWR + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS = + !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_4 = i + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_4 = + !endif !if "$(SHARED)" == "0" __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib *************** *** 592,599 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_10 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_10 = -v- !endif --- 620,627 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_3 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_1_3 = -v- !endif *************** *** 692,697 **** !if "$(SHARED)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj $(WXLUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ --- 720,725 ---- !if "$(SHARED)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj $(WXLUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ *************** *** 708,713 **** !if "$(SHARED)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_dummy.obj $(WXBIND_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ --- 736,741 ---- !if "$(SHARED)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_dummy.obj $(WXBIND_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ *************** *** 724,729 **** !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj $(WXBINDSTC_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBINDSTC_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ --- 752,757 ---- !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj $(WXBINDSTC_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBINDSTC_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ *************** *** 740,745 **** !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_dummy.obj $(WXLUADEBUG_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ --- 768,773 ---- !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_dummy.obj $(WXLUADEBUG_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ *************** *** 756,761 **** !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj $(WXLUASOCKET_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ --- 784,789 ---- !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj $(WXLUASOCKET_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ *************** *** 764,769 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ..\..\..\lib\bcc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | !endif --- 792,797 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ..\..\..\lib\bcc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** makefile.wat 20 Dec 2006 16:39:45 -0000 1.59 --- makefile.wat 3 Feb 2007 19:12:22 -0000 1.60 *************** *** 63,66 **** --- 63,72 ---- LUA_DIR = ..\..\..\modules\lua + # 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] + RUNTIME_LIBS = dynamic + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 256,279 **** ____BUILD = !endif ! ____BUILD_21 = !ifeq BUILD debug ! ____BUILD_21 = -od !endif !ifeq BUILD release ! ____BUILD_21 = -ot -ox !endif ! ____BUILD_22 = !ifeq BUILD debug ! ____BUILD_22 = -d2 !endif !ifeq BUILD release ! ____BUILD_22 = -d0 !endif ! ____BUILD_23 = !ifeq BUILD debug ! ____BUILD_23 = debug all !endif !ifeq BUILD release ! ____BUILD_23 = !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = --- 262,292 ---- ____BUILD = !endif ! ____BUILD_1_0 = !ifeq BUILD debug ! ____BUILD_1_0 = -od !endif !ifeq BUILD release ! ____BUILD_1_0 = -ot -ox !endif ! ____BUILD_21 = !ifeq BUILD debug ! ____BUILD_21 = -d2 !endif !ifeq BUILD release ! ____BUILD_21 = -d0 !endif ! ____BUILD_1_1 = !ifeq BUILD debug ! ____BUILD_1_1 = debug all !endif !ifeq BUILD release ! ____BUILD_1_1 = ! !endif ! __RUNTIME_LIBS = ! !ifeq RUNTIME_LIBS dynamic ! __RUNTIME_LIBS = -br ! !endif ! !ifeq RUNTIME_LIBS static ! __RUNTIME_LIBS = !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = *************** *** 590,596 **** $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_21) & ! $(____BUILD_22) -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include & ! -i=$(WX_DIR)\contrib\include /fh $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj & --- 603,610 ---- $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_0) & ! $(____BUILD_21) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=$(WX_DIR)\contrib\include /fh $(CPPFLAGS) & ! $(CXXFLAGS) WXLUA_LIB_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj & *************** *** 601,607 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_21) & ! $(____BUILD_22) -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include & ! -i=$(WX_DIR)\contrib\include -dWXMAKINGDLL_WXLUA /fh $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlcallb.obj & --- 615,622 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_0) & ! $(____BUILD_21) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=$(WX_DIR)\contrib\include -dWXMAKINGDLL_WXLUA /fh & ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlcallb.obj & *************** *** 612,618 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_21) & ! $(____BUILD_22) -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include & ! -i=$(WX_DIR)\contrib\include /fh $(CPPFLAGS) $(CXXFLAGS) WXBIND_LIB_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_wxlua.obj & --- 627,634 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_0) & ! $(____BUILD_21) $(__RUNTIME_... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2007-02-03 19:12:25
|
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> |
|
From: John L. <jr...@us...> - 2007-01-21 23:13:14
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17508/wxLua/bindings/wxwidgets Modified Files: override.hpp Log Message: fix wxPrintout::OnBeginDocument binding to not directly call wxPrintout::OnBeginDocument but just OnBeginDocument on the object on the stack, allows base_OnBeginDocument to work properly Add better descriptions to functions in wxlstate.h GetLuaNULL() -> GetLuaNULLTag() GetLuaWinDestroyTable() -> GetLuaWinDestroyTableTag() wxLua_lua_isenumerationtype does not take nil as a valid enum anymore Add wxLuaDebugDataItem::ToString for debugging Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** override.hpp 19 Jan 2007 04:17:38 -0000 1.58 --- override.hpp 21 Jan 2007 23:13:06 -0000 1.59 *************** *** 3766,3790 **** %end - %override wxLua_wxPrintout_OnBeginDocument - // bool OnBeginDocument(int startPage, int endPage); - static int LUACALL wxLua_wxPrintout_OnBeginDocument(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // int endPage - int endPage = (int)wxlState.GetNumberType(3); - // int startPagest - int startPage = (int)wxlState.GetNumberType(2); - // get this - wxPrintout *self = (wxPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintout); - // call OnBeginDocument - returns = self->wxPrintout::OnBeginDocument(startPage, endPage); - // push the result number - lua_pushboolean(L, returns); - // return the number of parameters - return 1; - } - %end - // ---------------------------------------------------------------------------- // Overrides for regex.i --- 3766,3769 ---- |
|
From: John L. <jr...@us...> - 2007-01-21 23:13:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17508/wxLua/modules/wxbind/src Modified Files: print.cpp wxlprint.cpp Log Message: fix wxPrintout::OnBeginDocument binding to not directly call wxPrintout::OnBeginDocument but just OnBeginDocument on the object on the stack, allows base_OnBeginDocument to work properly Add better descriptions to functions in wxlstate.h GetLuaNULL() -> GetLuaNULLTag() GetLuaWinDestroyTable() -> GetLuaWinDestroyTableTag() wxLua_lua_isenumerationtype does not take nil as a valid enum anymore Add wxLuaDebugDataItem::ToString for debugging Index: wxlprint.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlprint.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxlprint.cpp 13 Dec 2006 06:57:50 -0000 1.12 --- wxlprint.cpp 21 Jan 2007 23:13:07 -0000 1.13 *************** *** 116,120 **** m_wxlState.LuaCall(3, false); - fResult = m_wxlState.GetBooleanType(-1); m_wxlState.lua_Pop(1); --- 116,119 ---- Index: print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** print.cpp 17 Dec 2006 07:47:16 -0000 1.20 --- print.cpp 21 Jan 2007 23:13:07 -0000 1.21 *************** *** 200,205 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_OnBeginDocument[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // %override wxLua_wxPrintout_OnBeginDocument ! // bool OnBeginDocument(int startPage, int endPage); static int LUACALL wxLua_wxPrintout_OnBeginDocument(lua_State *L) { --- 200,204 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxPrintout_OnBeginDocument[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // bool OnBeginDocument(int startPage, int endPage) static int LUACALL wxLua_wxPrintout_OnBeginDocument(lua_State *L) { *************** *** 208,220 **** // int endPage int endPage = (int)wxlState.GetNumberType(3); ! // int startPagest int startPage = (int)wxlState.GetNumberType(2); // get this ! wxPrintout *self = (wxPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintout); // call OnBeginDocument ! returns = self->wxPrintout::OnBeginDocument(startPage, endPage); ! // push the result number lua_pushboolean(L, returns); ! // return the number of parameters return 1; } --- 207,219 ---- // int endPage int endPage = (int)wxlState.GetNumberType(3); ! // int startPage int startPage = (int)wxlState.GetNumberType(2); // get this ! wxPrintout * self = (wxPrintout *)wxlState.GetUserDataType(1, s_wxluatag_wxPrintout); // call OnBeginDocument ! returns = self->OnBeginDocument(startPage, endPage); ! // push the result flag lua_pushboolean(L, returns); ! return 1; } |
|
From: John L. <jr...@us...> - 2007-01-21 23:13:11
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17508/wxLua/modules/wxluadebug/include Modified Files: wxldebug.h Log Message: fix wxPrintout::OnBeginDocument binding to not directly call wxPrintout::OnBeginDocument but just OnBeginDocument on the object on the stack, allows base_OnBeginDocument to work properly Add better descriptions to functions in wxlstate.h GetLuaNULL() -> GetLuaNULLTag() GetLuaWinDestroyTable() -> GetLuaWinDestroyTableTag() wxLua_lua_isenumerationtype does not take nil as a valid enum anymore Add wxLuaDebugDataItem::ToString for debugging Index: wxldebug.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wxldebug.h 12 Dec 2006 01:23:40 -0000 1.30 --- wxldebug.h 21 Jan 2007 23:13:08 -0000 1.31 *************** *** 44,47 **** --- 44,54 ---- void SetExpanded(bool fExpanded) { m_fExpanded = fExpanded; } + // Get a human readable string for debugging + wxString ToString() const + { + return wxString::Format(wxT("Name: '%s' Type: '%s' Value: '%s' Ref: %d Idx: %d Expanded: %d HasSrc: %d"), + m_itemName.c_str(), m_itemType.c_str(), m_itemValue.c_str(), m_nReference, m_nIndex, (int)m_fExpanded, (int)!m_itemSource.IsEmpty()); + } + private: wxString m_itemName; |
|
From: John L. <jr...@us...> - 2007-01-21 23:13:11
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17508/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlcallb.cpp wxlstate.cpp Log Message: fix wxPrintout::OnBeginDocument binding to not directly call wxPrintout::OnBeginDocument but just OnBeginDocument on the object on the stack, allows base_OnBeginDocument to work properly Add better descriptions to functions in wxlstate.h GetLuaNULL() -> GetLuaNULLTag() GetLuaWinDestroyTable() -> GetLuaWinDestroyTableTag() wxLua_lua_isenumerationtype does not take nil as a valid enum anymore Add wxLuaDebugDataItem::ToString for debugging Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** wxlstate.cpp 14 Dec 2006 01:01:26 -0000 1.85 --- wxlstate.cpp 21 Jan 2007 23:13:07 -0000 1.86 *************** *** 479,484 **** switch (ltype) { ! case LUA_TNIL: // evaluates to 0 so wx.ENUM_typo = 0 ! case LUA_TNUMBER: // make sure it's only a number for an enum return true; default: --- 479,484 ---- switch (ltype) { ! //case LUA_TNIL: // evaluates to 0 so wx.ENUM_typo = 0 ! case LUA_TNUMBER: // make sure it's only a number for an enum return true; default: *************** *** 1672,1676 **** // setup base class tags, must do it here since we can have many bindings ! // that have subclassed classes for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() ) { --- 1672,1677 ---- // setup base class tags, must do it here since we can have many bindings ! // that have subclassed classes and they have to be installed first to get ! // their tags initialized. for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() ) { *************** *** 1832,1841 **** return M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxLuaFunction; } ! int wxLuaState::GetLuaNULL() const { wxCHECK_MSG(GetRefData() != NULL, 0, wxT("Invalid wxLuaState")); return M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_NULL; } ! int wxLuaState::GetLuaWinDestroyTable() const { wxCHECK_MSG(GetRefData() != NULL, 0, wxT("Invalid wxLuaState")); --- 1833,1842 ---- return M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxLuaFunction; } ! int wxLuaState::GetLuaNULLTag() const { wxCHECK_MSG(GetRefData() != NULL, 0, wxT("Invalid wxLuaState")); return M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_NULL; } ! int wxLuaState::GetLuaWinDestroyTableTag() const { wxCHECK_MSG(GetRefData() != NULL, 0, wxT("Invalid wxLuaState")); *************** *** 2241,2251 **** return pFunction->GetObject(); } ! else ! { ! if (IsDerivedClass(stack_tag, tag)) ! return ttouserdata(stack_idx); ! else if (M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_NULL == stack_tag) ! return NULL; ! } } --- 2242,2249 ---- return pFunction->GetObject(); } ! else if (M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_NULL == stack_tag) ! return NULL; ! else if (IsDerivedClass(stack_tag, tag)) ! return ttouserdata(stack_idx); } *************** *** 2289,2293 **** { handled = true; ! wxLuaWinDestroyCallback *pCallback = new wxLuaWinDestroyCallback(*this, win->GetId(), (wxEvtHandler*)win, tag); --- 2287,2291 ---- { handled = true; ! wxLuaWinDestroyCallback *pCallback = new wxLuaWinDestroyCallback(*this, win->GetId(), (wxEvtHandler*)win, tag); Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** wxlbind.cpp 17 Dec 2006 07:47:17 -0000 1.48 --- wxlbind.cpp 21 Jan 2007 23:13:07 -0000 1.49 *************** *** 330,337 **** --- 330,339 ---- wxCHECK_MSG(!wxlState.GetCallBaseClassFunction(), 0, wxT("Base class function call not reset")); + bool fCallbase = false; bool fFound = false; int result = 0; WXLUACLASS *pClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); const char *cpIndex = "{unknown}"; + wxCharBuffer funcName; // debugging code for the table function, see print statement below *************** *** 345,352 **** { void *pObject = wxlState.ttouserdata(1); ! wxCharBuffer funcName(lua_tostring(L, 2)); // make a copy of the string cpIndex = funcName.data(); ! bool fCallbase = (memcmp(cpIndex, CALL_BASECLASS_FUNC, CALL_BASECLASS_FUNC_LEN) == 0); if (fCallbase) --- 347,354 ---- { void *pObject = wxlState.ttouserdata(1); ! funcName = lua_tostring(L, 2); // make a copy of the string cpIndex = funcName.data(); ! fCallbase = (memcmp(cpIndex, CALL_BASECLASS_FUNC, CALL_BASECLASS_FUNC_LEN) == 0); if (fCallbase) *************** *** 390,395 **** } ! //wxPrintf(wxT("wxLua_lua_getTableFunc func '%s' pClass %d, userdata %d, lightuserdata %d, ttag %d, class_tag %d lua_State %d wxLuaStateRefData %d\n"), ! // lua2wx(cpIndex).c_str(), (long)pClass, init_isuserdata, init_islightuserdata, init_ttag, init_class_tag, (long)L, (long)wxlState.GetRefData()); if (!fFound) --- 392,397 ---- } ! //wxPrintf(wxT("wxLua_lua_getTableFunc func '%s' pClass %d '%s', userdata %d, lightuserdata %d, ttag %d, class_tag %d lua_State %d wxLuaStateRefData %d call base %d\n"), ! // lua2wx(funcName).c_str(), (long)pClass, pClass ? lua2wx(pClass->name).c_str() : wxT(""), init_isuserdata, init_islightuserdata, init_ttag, init_class_tag, (long)L, (long)wxlState.GetRefData(), (int)wxlState.GetCallBaseClassFunction()); if (!fFound) *************** *** 664,668 **** //lua_pushboolean(L, false); //lua_rawset(L, tableOffset); - //lua_pushliteral(L, "TRUE"); //lua_pushboolean(L, true); --- 666,669 ---- Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxlcallb.cpp 14 Dec 2006 01:01:26 -0000 1.23 --- wxlcallb.cpp 21 Jan 2007 23:13:07 -0000 1.24 *************** *** 35,39 **** wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState")); ! // create a reference to the lua function m_routine = m_wxlState.tinsert(lua_func_stack_idx); --- 35,39 ---- wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState")); ! // create a reference to the lua function m_routine = m_wxlState.tinsert(lua_func_stack_idx); *************** *** 169,173 **** // get a reference to the destroy handler table ! if (m_wxlState.tget(m_wxlState.GetLuaWinDestroyTable())) { // create a reference to object --- 169,173 ---- // get a reference to the destroy handler table ! if (m_wxlState.tget(m_wxlState.GetLuaWinDestroyTableTag())) { // create a reference to object *************** *** 220,224 **** // Note: do not remove from wxLuaState's destroyHandlerList here, wait 'till destructor ! if (m_wxlState.tget(m_wxlState.GetLuaWinDestroyTable())) { lua_State* L = m_wxlState.GetLuaState(); --- 220,224 ---- // Note: do not remove from wxLuaState's destroyHandlerList here, wait 'till destructor ! if (m_wxlState.tget(m_wxlState.GetLuaWinDestroyTableTag())) { lua_State* L = m_wxlState.GetLuaState(); |
|
From: John L. <jr...@us...> - 2007-01-21 23:13:11
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17508/wxLua/modules/wxlua/include Modified Files: wxlstate.h Log Message: fix wxPrintout::OnBeginDocument binding to not directly call wxPrintout::OnBeginDocument but just OnBeginDocument on the object on the stack, allows base_OnBeginDocument to work properly Add better descriptions to functions in wxlstate.h GetLuaNULL() -> GetLuaNULLTag() GetLuaWinDestroyTable() -> GetLuaWinDestroyTableTag() wxLua_lua_isenumerationtype does not take nil as a valid enum anymore Add wxLuaDebugDataItem::ToString for debugging Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** wxlstate.h 19 Dec 2006 21:12:03 -0000 1.58 --- wxlstate.h 21 Jan 2007 23:13:07 -0000 1.59 *************** *** 458,474 **** void RegisterBindings(bool registerTypes); ! // Get the installed wxLuaBinding with the given ! // wxLuaBinding::GetBindingName or NULL for no match. wxLuaBinding* GetLuaBinding(const wxString& bindingName) const; ! // Get WXLUACLASS for given lua Tag, the number lua uses to track the class const WXLUACLASS* GetLuaClass(int iClassTag) const; ! // Get WXLUACLASS for given class name const WXLUACLASS* GetLuaClass(const char* className) const; ! // Get base WXLUACLASS for given Tag const WXLUACLASS* GetBaseLuaClass(int iClassTag) const; ! // returns true is iClassTag is derived from iBaseClassTag bool IsDerivedClass(int iClassTag, int iBaseClassTag) const; ! // Get WXLUAEVENT for given wxEvent const WXLUAEVENT* GetLuaEvent(wxEvent *pEvent) const; --- 458,480 ---- void RegisterBindings(bool registerTypes); ! // Get the installed wxLuaBinding with the given ! // wxLuaBinding::GetBindingName or NULL for no match. wxLuaBinding* GetLuaBinding(const wxString& bindingName) const; ! // Get WXLUACLASS for given lua Tag using WXLUACLASS::class_tag, ! // returns NULL on failure. const WXLUACLASS* GetLuaClass(int iClassTag) const; ! // Get WXLUACLASS for given class name using WXLUACLASS::name, ! // returns NULL on failure. const WXLUACLASS* GetLuaClass(const char* className) const; ! // Get base WXLUACLASS for given Tag using WXLUACLASS::class_tag and ! // WXLUACLASS::baseclass_tag. returns NULL on failure. const WXLUACLASS* GetBaseLuaClass(int iClassTag) const; ! // returns true if iClassTag is derived or equal to iBaseClassTag by using ! // WXLUACLASS::class_tag and WXLUACLASS::baseclass_tag. ! // returns NULL on failure. bool IsDerivedClass(int iClassTag, int iBaseClassTag) const; ! // Get WXLUAEVENT for given wxEvent by comparing the wxEvent::GetEventType() ! // to WXLUAEVENT::eventType. const WXLUAEVENT* GetLuaEvent(wxEvent *pEvent) const; *************** *** 476,483 **** // you may add or remove bindings before creation wxLuaBindingList* GetLuaBindingList() const; bool GetBindingsRegistered() const; // Are the binding registered int GetwxLuaFunctionTag() const; // The lua tag for wxLuaFunction objects. ! int GetLuaNULL() const; // The lua tag for NULL pointer ! int GetLuaWinDestroyTable() const; // The lua tag for the wxWindow destroy tracking table int GetwxEventTag() const; // The lua tag for wxEvents int GetwxWindowTag() const; // The lua tag for wxWindows --- 482,491 ---- // you may add or remove bindings before creation wxLuaBindingList* GetLuaBindingList() const; + bool GetBindingsRegistered() const; // Are the binding registered + int GetwxLuaFunctionTag() const; // The lua tag for wxLuaFunction objects. ! int GetLuaNULLTag() const; // The lua tag for NULL pointer ! int GetLuaWinDestroyTableTag() const; // The lua tag for the wxWindow destroy tracking table int GetwxEventTag() const; // The lua tag for wxEvents int GetwxWindowTag() const; // The lua tag for wxWindows *************** *** 567,572 **** bool IsUserDataType(int stack_idx, int tag) const; // Return a pointer to the object that corresponds to the specified stack ! // index and tag. Get a user data type (either allocated by us if the tag ! // is iTagS otherwise system allocated iTagP. // If the data type does not have the correct tag, or if the parameter // stack_idx is nil, NULL is returned, otherwise terror is called. --- 575,580 ---- bool IsUserDataType(int stack_idx, int tag) const; // Return a pointer to the object that corresponds to the specified stack ! // index and tag. Get a user data type either allocated by wxLua or a ! // system allocated tag. // If the data type does not have the correct tag, or if the parameter // stack_idx is nil, NULL is returned, otherwise terror is called. *************** *** 583,592 **** --- 591,603 ---- // Validate that the object at the stack index specified is a boolean object // or that the object can be converted to a boolean and return the boolean. + // calls terror if the value is not of the right type. bool GetBooleanType(int stack_idx); // Validate that the object at the stack index specified is a enumeration object // or that the object can be converted to a enumeration and return the enumeration value. + // calls terror if the value is not of the right type. long GetEnumerationType(int stack_idx); // Validate that the object at the stack index specified is a number object // or that the object can be converted to a number and return the number value. + // calls terror if the value is not of the right type. double GetNumberType(int stack_idx); *************** *** 609,613 **** // convert a parameter which is presumably a table into a character pointer array. // returns the number of character strings in the array in count. ! // the return value may need to be deleted. const char** GetCharArray(int stack_idx, int &count); --- 620,624 ---- // convert a parameter which is presumably a table into a character pointer array. // returns the number of character strings in the array in count. ! // You must delete the return value if not NULL. const char** GetCharArray(int stack_idx, int &count); *************** *** 616,623 **** // numeric entry in the table is a numeric object or can be converted to a number // Return a pointer to the array of ints and set the size in count ! // the return value will need to be deleted. int* GetIntArray(int stack_idx, int &count); // convert a parameter which is presumably a table into a wxArrayInt. ! // returns the number of values in the array. int GetwxArrayInt(int stack_idx, wxArrayInt &intArray); --- 627,634 ---- // numeric entry in the table is a numeric object or can be converted to a number // Return a pointer to the array of ints and set the size in count ! // You must delete the return value if not NULL. int* GetIntArray(int stack_idx, int &count); // convert a parameter which is presumably a table into a wxArrayInt. ! // returns the number of values put into the array. int GetwxArrayInt(int stack_idx, wxArrayInt &intArray); *************** *** 627,630 **** --- 638,643 ---- int PushwxArrayIntTable(const wxArrayInt &intArray); + // ----------------------------------------------------------------------- + // Returns the 'name' of a lua userdata object from its tag. // returns wxEmptyString on failure. |
|
From: Francesco M. <fr...@us...> - 2007-01-19 20:43:52
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12301 Modified Files: updatesite.sh Log Message: fixed updating of docs folder Index: updatesite.sh =================================================================== RCS file: /cvsroot/wxlua/website/updatesite.sh,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** updatesite.sh 19 Dec 2006 23:00:59 -0000 1.27 --- updatesite.sh 19 Jan 2007 20:43:44 -0000 1.28 *************** *** 16,19 **** --- 16,20 ---- echo "Checking out the docs dir to the htdocs/docs dir from cvs" + cd docs cvs -q update -P -d |
|
From: John L. <jr...@us...> - 2007-01-19 04:17:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21977/wxLua/modules/wxbind/src Modified Files: controls.cpp Log Message: add wxControlWithItems GetStringClientObject to get back a wxStringClientData Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** controls.cpp 17 Dec 2006 07:47:14 -0000 1.36 --- controls.cpp 19 Jan 2007 04:17:38 -0000 1.37 *************** *** 1001,1004 **** --- 1001,1023 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxControlWithItems_GetStringClientObject[] = { &s_wxluaarg_Number, 0 }; + // %override wxLua_wxControlWithItems_GetStringClientObject + // %rename GetStringClientObject wxStringClientData* GetClientObject(int n) const + static int LUACALL wxLua_wxControlWithItems_GetStringClientObject(lua_State *L) + { + wxLuaState wxlState(L); + wxStringClientData *returns; + // int n + int n = (int)wxlState.GetNumberType(2); + // get this + wxControlWithItems * self = (wxControlWithItems *)wxlState.GetUserDataType(1, s_wxluatag_wxControlWithItems); + // call GetClientObject + returns = (wxStringClientData*)self->GetClientObject(n); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxStringClientData, returns); + + return 1; + } + static wxLuaArgTag s_wxluatagArray_wxLua_wxControlWithItems_GetCount[] = { 0 }; // int GetCount() const *************** *** 1269,1272 **** --- 1288,1292 ---- { LuaMethod, "FindString", wxLua_wxControlWithItems_FindString, 1, 1, s_wxluatagArray_wxLua_wxControlWithItems_FindString }, { LuaMethod, "GetClientObject", wxLua_wxControlWithItems_GetClientObject, 1, 1, s_wxluatagArray_wxLua_wxControlWithItems_GetClientObject }, + { LuaMethod, "GetStringClientObject", wxLua_wxControlWithItems_GetStringClientObject, 1, 1, s_wxluatagArray_wxLua_wxControlWithItems_GetStringClientObject }, { LuaMethod, "GetCount", wxLua_wxControlWithItems_GetCount, 0, 0, s_wxluatagArray_wxLua_wxControlWithItems_GetCount }, { LuaMethod, "GetSelection", wxLua_wxControlWithItems_GetSelection, 0, 0, s_wxluatagArray_wxLua_wxControlWithItems_GetSelection }, |
|
From: John L. <jr...@us...> - 2007-01-19 04:17:41
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21977/wxLua/bindings/wxwidgets Modified Files: controls.i override.hpp Log Message: add wxControlWithItems GetStringClientObject to get back a wxStringClientData Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** override.hpp 14 Dec 2006 01:01:23 -0000 1.57 --- override.hpp 19 Jan 2007 04:17:38 -0000 1.58 *************** *** 637,640 **** --- 637,660 ---- // ---------------------------------------------------------------------------- + + %override wxLua_wxControlWithItems_GetStringClientObject + // %rename GetStringClientObject wxStringClientData* GetClientObject(int n) const + static int LUACALL wxLua_wxControlWithItems_GetStringClientObject(lua_State *L) + { + wxLuaState wxlState(L); + wxStringClientData *returns; + // int n + int n = (int)wxlState.GetNumberType(2); + // get this + wxControlWithItems * self = (wxControlWithItems *)wxlState.GetUserDataType(1, s_wxluatag_wxControlWithItems); + // call GetClientObject + returns = (wxStringClientData*)self->GetClientObject(n); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxStringClientData, returns); + + return 1; + } + %end + %override wxLua_wxListBox_GetSelections // int GetSelections(wxArrayInt& selections) const Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** controls.i 7 Dec 2006 06:32:42 -0000 1.24 --- controls.i 19 Jan 2007 04:17:38 -0000 1.25 *************** *** 141,144 **** --- 141,147 ---- //void* GetClientData(int n) const wxClientData* GetClientObject(int n) const + // Get the wxStringClientData if and only if you have called SetClientObject with a wxStringClientData + // %override %rename GetStringClientObject wxStringClientData* GetClientObject(int n) const + %rename GetStringClientObject wxStringClientData* GetClientObject(int n) const int GetCount() const int GetSelection() const |
|
From: John L. <jr...@us...> - 2007-01-18 17:19:25
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14671/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: updated wxUSE_XXX ifdefs for date time Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wxstc_datatypes.lua 19 Dec 2006 06:18:02 -0000 1.39 --- wxstc_datatypes.lua 18 Jan 2007 17:19:00 -0000 1.40 *************** *** 413,417 **** wxCalendarCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", IsNumber = false, --- 413,417 ---- wxCalendarCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", IsNumber = false, *************** *** 419,423 **** }, wxCalendarDateAttr = { ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", IsNumber = false, --- 419,423 ---- }, wxCalendarDateAttr = { ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", IsNumber = false, *************** *** 425,429 **** }, wxCalendarDateBorder = { ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "enum", IsNumber = true, --- 425,429 ---- }, wxCalendarDateBorder = { ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "enum", IsNumber = true, *************** *** 432,436 **** wxCalendarEvent = { BaseClass = "wxDateEvent", ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", IsNumber = false, --- 432,436 ---- wxCalendarEvent = { BaseClass = "wxDateEvent", ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", IsNumber = false, *************** *** 438,442 **** }, wxCalendarHitTestResult = { ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "enum", IsNumber = true, --- 438,442 ---- }, wxCalendarHitTestResult = { ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "enum", IsNumber = true, *************** *** 695,699 **** wxDateEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", IsNumber = false, --- 695,699 ---- wxDateEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", IsNumber = false, *************** *** 702,706 **** wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxDatePickerCtrl", DefType = "class", IsNumber = false, --- 702,706 ---- wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL", DefType = "class", IsNumber = false, *************** *** 708,712 **** }, wxDateSpan = { ! Condition = "wxLUA_USE_wxDateSpan", DefType = "class", IsNumber = false, --- 708,712 ---- }, wxDateSpan = { ! Condition = "wxLUA_USE_wxDateSpan && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 714,718 **** }, wxDateTime = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "class", IsNumber = false, --- 714,718 ---- }, wxDateTime = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 720,724 **** }, ["wxDateTime::Calendar"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 720,724 ---- }, ["wxDateTime::Calendar"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 726,730 **** }, ["wxDateTime::Country"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 726,730 ---- }, ["wxDateTime::Country"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 732,736 **** }, ["wxDateTime::Month"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 732,736 ---- }, ["wxDateTime::Month"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 738,742 **** }, ["wxDateTime::TZ"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 738,742 ---- }, ["wxDateTime::TZ"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 744,748 **** }, ["wxDateTime::WeekDay"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 744,748 ---- }, ["wxDateTime::WeekDay"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 750,754 **** }, wxDateTimeArray = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "class", IsNumber = false, --- 750,754 ---- }, wxDateTimeArray = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 756,760 **** }, wxDateTimeHolidayAuthority = { ! Condition = "wxLUA_USE_wxDateTimeHolidayAuthority", DefType = "class", IsNumber = false, --- 756,760 ---- }, wxDateTimeHolidayAuthority = { ! Condition = "wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 763,767 **** wxDateTimeWorkDays = { BaseClass = "wxDateTimeHolidayAuthority", ! Condition = "wxLUA_USE_wxDateTimeHolidayAuthority", DefType = "class", IsNumber = false, --- 763,767 ---- wxDateTimeWorkDays = { BaseClass = "wxDateTimeHolidayAuthority", ! Condition = "wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 2893,2897 **** }, wxTimeSpan = { ! Condition = "wxLUA_USE_wxTimeSpan", DefType = "class", IsNumber = false, --- 2893,2897 ---- }, wxTimeSpan = { ! Condition = "wxLUA_USE_wxTimeSpan && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 2900,2904 **** wxTimer = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxTimer", DefType = "class", IsNumber = false, --- 2900,2904 ---- wxTimer = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxTimer && wxUSE_TIMER", DefType = "class", IsNumber = false, *************** *** 2907,2911 **** wxTimerEvent = { BaseClass = "wxEvent", ! Condition = "wxLUA_USE_wxTimer", DefType = "class", IsNumber = false, --- 2907,2911 ---- wxTimerEvent = { BaseClass = "wxEvent", ! Condition = "wxLUA_USE_wxTimer && wxUSE_TIMER", DefType = "class", IsNumber = false, |
|
From: John L. <jr...@us...> - 2007-01-18 17:19:11
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14671/wxLua/modules/wxbind/src Modified Files: datetime.cpp file.cpp wx_bind.cpp Log Message: updated wxUSE_XXX ifdefs for date time Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** wx_bind.cpp 19 Dec 2006 06:18:03 -0000 1.71 --- wx_bind.cpp 18 Jan 2007 17:19:02 -0000 1.72 *************** *** 195,199 **** #endif // wxCHECK_VERSION(2,5,0) ! #if wxLUA_USE_wxCalendarCtrl { &wxEVT_CALENDAR_DAY_CHANGED, "wxEVT_CALENDAR_DAY_CHANGED", &s_wxluatag_wxCalendarEvent }, { &wxEVT_CALENDAR_DOUBLECLICKED, "wxEVT_CALENDAR_DOUBLECLICKED", &s_wxluatag_wxCalendarEvent }, --- 195,199 ---- #endif // wxCHECK_VERSION(2,5,0) ! #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL { &wxEVT_CALENDAR_DAY_CHANGED, "wxEVT_CALENDAR_DAY_CHANGED", &s_wxluatag_wxCalendarEvent }, { &wxEVT_CALENDAR_DOUBLECLICKED, "wxEVT_CALENDAR_DOUBLECLICKED", &s_wxluatag_wxCalendarEvent }, *************** *** 203,207 **** { &wxEVT_CALENDAR_YEAR_CHANGED, "wxEVT_CALENDAR_YEAR_CHANGED", &s_wxluatag_wxCalendarEvent }, { &wxEVT_DATE_CHANGED, "wxEVT_DATE_CHANGED", &s_wxluatag_wxDateEvent }, ! #endif // wxLUA_USE_wxCalendarCtrl #if wxLUA_USE_wxDragDrop --- 203,207 ---- { &wxEVT_CALENDAR_YEAR_CHANGED, "wxEVT_CALENDAR_YEAR_CHANGED", &s_wxluatag_wxCalendarEvent }, { &wxEVT_DATE_CHANGED, "wxEVT_DATE_CHANGED", &s_wxluatag_wxDateEvent }, ! #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL #if wxLUA_USE_wxDragDrop *************** *** 300,306 **** #endif // wxLUA_USE_wxTaskBarIcon ! #if wxLUA_USE_wxTimer { &wxEVT_TIMER, "wxEVT_TIMER", &s_wxluatag_wxTimerEvent }, ! #endif // wxLUA_USE_wxTimer #if wxLUA_USE_wxTreeCtrl --- 300,306 ---- #endif // wxLUA_USE_wxTaskBarIcon ! #if wxLUA_USE_wxTimer && wxUSE_TIMER { &wxEVT_TIMER, "wxEVT_TIMER", &s_wxluatag_wxTimerEvent }, ! #endif // wxLUA_USE_wxTimer && wxUSE_TIMER #if wxLUA_USE_wxTreeCtrl *************** *** 1135,1142 **** #endif // wxLUA_USE_wxTextValidator ! #if wxLUA_USE_wxTimer { "wxTIMER_CONTINUOUS", wxTIMER_CONTINUOUS }, { "wxTIMER_ONE_SHOT", wxTIMER_ONE_SHOT }, ! #endif // wxLUA_USE_wxTimer #if wxLUA_USE_wxToolbar --- 1135,1142 ---- #endif // wxLUA_USE_wxTextValidator ! #if wxLUA_USE_wxTimer && wxUSE_TIMER { "wxTIMER_CONTINUOUS", wxTIMER_CONTINUOUS }, { "wxTIMER_ONE_SHOT", wxTIMER_ONE_SHOT }, ! #endif // wxLUA_USE_wxTimer && wxUSE_TIMER #if wxLUA_USE_wxToolbar *************** *** 1618,1622 **** #endif // wxLUA_USE_wxAcceleratorTable ! #if wxLUA_USE_wxCalendarCtrl { "wxCAL_BORDER_NONE", wxCAL_BORDER_NONE }, { "wxCAL_BORDER_ROUND", wxCAL_BORDER_ROUND }, --- 1618,1622 ---- #endif // wxLUA_USE_wxAcceleratorTable ! #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL { "wxCAL_BORDER_NONE", wxCAL_BORDER_NONE }, { "wxCAL_BORDER_ROUND", wxCAL_BORDER_ROUND }, *************** *** 1635,1639 **** { "wxCAL_SHOW_SURROUNDING_WEEKS", wxCAL_SHOW_SURROUNDING_WEEKS }, { "wxCAL_SUNDAY_FIRST", wxCAL_SUNDAY_FIRST }, ! #endif // wxLUA_USE_wxCalendarCtrl #if wxLUA_USE_wxCheckBox --- 1635,1639 ---- { "wxCAL_SHOW_SURROUNDING_WEEKS", wxCAL_SHOW_SURROUNDING_WEEKS }, { "wxCAL_SUNDAY_FIRST", wxCAL_SUNDAY_FIRST }, ! #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL #if wxLUA_USE_wxCheckBox *************** *** 1739,1743 **** #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDatePickerCtrl { "wxDP_ALLOWNONE", wxDP_ALLOWNONE }, { "wxDP_DEFAULT", wxDP_DEFAULT }, --- 1739,1743 ---- #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL { "wxDP_ALLOWNONE", wxDP_ALLOWNONE }, { "wxDP_DEFAULT", wxDP_DEFAULT }, *************** *** 1745,1751 **** { "wxDP_SHOWCENTURY", wxDP_SHOWCENTURY }, { "wxDP_SPIN", wxDP_SPIN }, ! #endif // wxLUA_USE_wxDatePickerCtrl ! #if wxLUA_USE_wxDateTime { "wxDateTime_ADT", wxDateTime::ADT }, { "wxDateTime_AKDT", wxDateTime::AKDT }, --- 1745,1751 ---- { "wxDP_SHOWCENTURY", wxDP_SHOWCENTURY }, { "wxDP_SPIN", wxDP_SPIN }, ! #endif // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME { "wxDateTime_ADT", wxDateTime::ADT }, { "wxDateTime_AKDT", wxDateTime::AKDT }, *************** *** 1833,1837 **** { "wxDateTime_WET", wxDateTime::WET }, { "wxDateTime_Wed", wxDateTime::Wed }, ! #endif // wxLUA_USE_wxDateTime #if wxLUA_USE_wxDragDrop --- 1833,1837 ---- { "wxDateTime_WET", wxDateTime::WET }, { "wxDateTime_Wed", wxDateTime::Wed }, ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME #if wxLUA_USE_wxDragDrop *************** *** 2702,2708 **** #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDateTime { &wxDefaultDateTime, 0, "wxDefaultDateTime", &s_wxluatag_wxDateTime }, ! #endif // wxLUA_USE_wxDateTime #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY --- 2702,2708 ---- #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME { &wxDefaultDateTime, 0, "wxDefaultDateTime", &s_wxluatag_wxDateTime }, ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY *************** *** 3027,3031 **** #endif // (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG) ! #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) static wxLuaArgTag s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange[] = { &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTimeArray, 0 }; --- 3027,3031 ---- #endif // (wxLUA_USE_wxColourPenBrush) && (wxUSE_COLOURDLG) ! #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME) static wxLuaArgTag s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange[] = { &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTimeArray, 0 }; *************** *** 3065,3069 **** } ! #endif // (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) #if (wxLUA_USE_wxFont) && (wxLUA_USE_wxSystemSettings) --- 3065,3069 ---- } ! #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME) #if (wxLUA_USE_wxFont) && (wxLUA_USE_wxSystemSettings) *************** *** 4552,4556 **** #endif // wxLUA_USE_wxCursor ! #if wxLUA_USE_wxDateTime static wxLuaArgTag s_wxluatagArray_wxLua_function_wxFileModificationTime[] = { &s_wxluaarg_String, 0 }; --- 4552,4556 ---- #endif // wxLUA_USE_wxCursor ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME static wxLuaArgTag s_wxluatagArray_wxLua_function_wxFileModificationTime[] = { &s_wxluaarg_String, 0 }; *************** *** 4573,4579 **** } ! #endif // wxLUA_USE_wxDateTime ! #if wxLUA_USE_wxDateTimeHolidayAuthority static wxLuaArgTag s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_AddAuthority[] = { &s_wxluatag_wxDateTimeHolidayAuthority, 0 }; --- 4573,4579 ---- } ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME static wxLuaArgTag s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_AddAuthority[] = { &s_wxluatag_wxDateTimeHolidayAuthority, 0 }; *************** *** 4601,4605 **** } ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY --- 4601,4605 ---- } ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY *************** *** 5169,5176 **** ! #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) { LuaGlobal, "wxDateTimeHolidayAuthority_GetHolidaysInRange", wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange, 3, 3, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange }, { LuaGlobal, "wxDateTimeHolidayAuthority_IsHoliday", wxLua_wxDateTimeHolidayAuthority_IsHoliday, 1, 1, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_IsHoliday }, ! #endif // (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) --- 5169,5176 ---- ! #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME) { LuaGlobal, "wxDateTimeHolidayAuthority_GetHolidaysInRange", wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange, 3, 3, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange }, { LuaGlobal, "wxDateTimeHolidayAuthority_IsHoliday", wxLua_wxDateTimeHolidayAuthority_IsHoliday, 1, 1, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_IsHoliday }, ! #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME) *************** *** 5316,5328 **** ! #if wxLUA_USE_wxDateTime { LuaGlobal, "wxFileModificationTime", wxLua_function_wxFileModificationTime, 1, 1, s_wxluatagArray_wxLua_function_wxFileModificationTime }, ! #endif // wxLUA_USE_wxDateTime ! #if wxLUA_USE_wxDateTimeHolidayAuthority { LuaGlobal, "wxDateTimeHolidayAuthority_AddAuthority", wxLua_wxDateTimeHolidayAuthority_AddAuthority, 1, 1, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_AddAuthority }, { LuaGlobal, "wxDateTimeHolidayAuthority_ClearAllAuthorities", wxLua_wxDateTimeHolidayAuthority_ClearAllAuthorities, 0, 0, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_ClearAllAuthorities }, ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority --- 5316,5328 ---- ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME { LuaGlobal, "wxFileModificationTime", wxLua_function_wxFileModificationTime, 1, 1, s_wxluatagArray_wxLua_function_wxFileModificationTime }, ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME { LuaGlobal, "wxDateTimeHolidayAuthority_AddAuthority", wxLua_wxDateTimeHolidayAuthority_AddAuthority, 1, 1, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_AddAuthority }, { LuaGlobal, "wxDateTimeHolidayAuthority_ClearAllAuthorities", wxLua_wxDateTimeHolidayAuthority_ClearAllAuthorities, 0, 0, s_wxluatagArray_wxLua_wxDateTimeHolidayAuthority_ClearAllAuthorities }, ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME *************** *** 5679,5688 **** ! #if wxLUA_USE_wxCalendarCtrl { "wxCalendarCtrl", wxCalendarCtrl_methods, wxCalendarCtrl_methodCount, -1, CLASSINFO(wxCalendarCtrl), &s_wxluatag_wxCalendarCtrl, "wxControl" }, { "wxCalendarDateAttr", wxCalendarDateAttr_methods, wxCalendarDateAttr_methodCount, -1, NULL, &s_wxluatag_wxCalendarDateAttr, NULL }, { "wxCalendarEvent", wxCalendarEvent_methods, wxCalendarEvent_methodCount, -1, CLASSINFO(wxCalendarEvent), &s_wxluatag_wxCalendarEvent, "wxDateEvent" }, { "wxDateEvent", wxDateEvent_methods, wxDateEvent_methodCount, -1, CLASSINFO(wxDateEvent), &s_wxluatag_wxDateEvent, "wxCommandEvent" }, ! #endif // wxLUA_USE_wxCalendarCtrl --- 5679,5688 ---- ! #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL { "wxCalendarCtrl", wxCalendarCtrl_methods, wxCalendarCtrl_methodCount, -1, CLASSINFO(wxCalendarCtrl), &s_wxluatag_wxCalendarCtrl, "wxControl" }, { "wxCalendarDateAttr", wxCalendarDateAttr_methods, wxCalendarDateAttr_methodCount, -1, NULL, &s_wxluatag_wxCalendarDateAttr, NULL }, { "wxCalendarEvent", wxCalendarEvent_methods, wxCalendarEvent_methodCount, -1, CLASSINFO(wxCalendarEvent), &s_wxluatag_wxCalendarEvent, "wxDateEvent" }, { "wxDateEvent", wxDateEvent_methods, wxDateEvent_methodCount, -1, CLASSINFO(wxDateEvent), &s_wxluatag_wxDateEvent, "wxCommandEvent" }, ! #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL *************** *** 5778,5801 **** ! #if wxLUA_USE_wxDatePickerCtrl { "wxDatePickerCtrl", wxDatePickerCtrl_methods, wxDatePickerCtrl_methodCount, -1, CLASSINFO(wxDatePickerCtrl), &s_wxluatag_wxDatePickerCtrl, "wxControl" }, ! #endif // wxLUA_USE_wxDatePickerCtrl ! #if wxLUA_USE_wxDateSpan { "wxDateSpan", wxDateSpan_methods, wxDateSpan_methodCount, -1, NULL, &s_wxluatag_wxDateSpan, NULL }, ! #endif // wxLUA_USE_wxDateSpan ! #if wxLUA_USE_wxDateTime { "wxDateTime", wxDateTime_methods, wxDateTime_methodCount, -1, NULL, &s_wxluatag_wxDateTime, NULL }, { "wxDateTimeArray", wxDateTimeArray_methods, wxDateTimeArray_methodCount, -1, NULL, &s_wxluatag_wxDateTimeArray, NULL }, ! #endif // wxLUA_USE_wxDateTime ! #if wxLUA_USE_wxDateTimeHolidayAuthority { "wxDateTimeHolidayAuthority", wxDateTimeHolidayAuthority_methods, wxDateTimeHolidayAuthority_methodCount, -1, NULL, &s_wxluatag_wxDateTimeHolidayAuthority, NULL }, { "wxDateTimeWorkDays", wxDateTimeWorkDays_methods, wxDateTimeWorkDays_methodCount, -1, NULL, &s_wxluatag_wxDateTimeWorkDays, "wxDateTimeHolidayAuthority" }, ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority --- 5778,5801 ---- ! #if wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL { "wxDatePickerCtrl", wxDatePickerCtrl_methods, wxDatePickerCtrl_methodCount, -1, CLASSINFO(wxDatePickerCtrl), &s_wxluatag_wxDatePickerCtrl, "wxControl" }, ! #endif // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL ! #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME { "wxDateSpan", wxDateSpan_methods, wxDateSpan_methodCount, -1, NULL, &s_wxluatag_wxDateSpan, NULL }, ! #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME { "wxDateTime", wxDateTime_methods, wxDateTime_methodCount, -1, NULL, &s_wxluatag_wxDateTime, NULL }, { "wxDateTimeArray", wxDateTimeArray_methods, wxDateTimeArray_methodCount, -1, NULL, &s_wxluatag_wxDateTimeArray, NULL }, ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME { "wxDateTimeHolidayAuthority", wxDateTimeHolidayAuthority_methods, wxDateTimeHolidayAuthority_methodCount, -1, NULL, &s_wxluatag_wxDateTimeHolidayAuthority, NULL }, { "wxDateTimeWorkDays", wxDateTimeWorkDays_methods, wxDateTimeWorkDays_methodCount, -1, NULL, &s_wxluatag_wxDateTimeWorkDays, "wxDateTimeHolidayAuthority" }, ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME *************** *** 6211,6223 **** ! #if wxLUA_USE_wxTimeSpan { "wxTimeSpan", wxTimeSpan_methods, wxTimeSpan_methodCount, -1, NULL, &s_wxluatag_wxTimeSpan, NULL }, ! #endif // wxLUA_USE_wxTimeSpan ! #if wxLUA_USE_wxTimer { "wxTimer", wxTimer_methods, wxTimer_methodCount, -1, CLASSINFO(wxTimer), &s_wxluatag_wxTimer, "wxObject" }, { "wxTimerEvent", wxTimerEvent_methods, wxTimerEvent_methodCount, -1, CLASSINFO(wxTimerEvent), &s_wxluatag_wxTimerEvent, "wxEvent" }, ! #endif // wxLUA_USE_wxTimer --- 6211,6223 ---- ! #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME { "wxTimeSpan", wxTimeSpan_methods, wxTimeSpan_methodCount, -1, NULL, &s_wxluatag_wxTimeSpan, NULL }, ! #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxTimer && wxUSE_TIMER { "wxTimer", wxTimer_methods, wxTimer_methodCount, -1, CLASSINFO(wxTimer), &s_wxluatag_wxTimer, "wxObject" }, { "wxTimerEvent", wxTimerEvent_methods, wxTimerEvent_methodCount, -1, CLASSINFO(wxTimerEvent), &s_wxluatag_wxTimerEvent, "wxEvent" }, ! #endif // wxLUA_USE_wxTimer && wxUSE_TIMER *************** *** 6528,6534 **** ! #if wxLUA_USE_wxCalendarCtrl wxLUA_IMPLEMENT_ENCAPSULATION(wxCalendarDateAttr, wxCalendarDateAttr) ! #endif // wxLUA_USE_wxCalendarCtrl --- 6528,6534 ---- ! #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL wxLUA_IMPLEMENT_ENCAPSULATION(wxCalendarDateAttr, wxCalendarDateAttr) ! #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL *************** *** 6563,6581 **** ! #if wxLUA_USE_wxDateSpan wxLUA_IMPLEMENT_ENCAPSULATION(wxDateSpan, wxDateSpan) ! #endif // wxLUA_USE_wxDateSpan ! #if wxLUA_USE_wxDateTime wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTime, wxDateTime) wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeArray, wxDateTimeArray) ! #endif // wxLUA_USE_wxDateTime ! #if wxLUA_USE_wxDateTimeHolidayAuthority wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority) wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeWorkDays, wxDateTimeWorkDays) ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority --- 6563,6581 ---- ! #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME wxLUA_IMPLEMENT_ENCAPSULATION(wxDateSpan, wxDateSpan) ! #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTime, wxDateTime) wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeArray, wxDateTimeArray) ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority) wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeWorkDays, wxDateTimeWorkDays) ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME *************** *** 6650,6656 **** ! #if wxLUA_USE_wxTimeSpan wxLUA_IMPLEMENT_ENCAPSULATION(wxTimeSpan, wxTimeSpan) ! #endif // wxLUA_USE_wxTimeSpan --- 6650,6656 ---- ! #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME wxLUA_IMPLEMENT_ENCAPSULATION(wxTimeSpan, wxTimeSpan) ! #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** file.cpp 17 Dec 2006 07:47:15 -0000 1.25 --- file.cpp 18 Jan 2007 17:19:02 -0000 1.26 *************** *** 57,61 **** ! #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxFileName) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetModificationTime[] = { 0 }; // wxDateTime GetModificationTime() const --- 57,61 ---- ! #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetModificationTime[] = { 0 }; // wxDateTime GetModificationTime() const *************** *** 127,131 **** } ! #endif // (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxFileName) --- 127,131 ---- } ! #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) *************** *** 1530,1538 **** ! #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxFileName) { LuaMethod, "GetModificationTime", wxLua_wxFileName_GetModificationTime, 0, 0, s_wxluatagArray_wxLua_wxFileName_GetModificationTime }, { LuaMethod, "GetTimes", wxLua_wxFileName_GetTimes, 3, 3, s_wxluatagArray_wxLua_wxFileName_GetTimes }, { LuaMethod, "SetTimes", wxLua_wxFileName_SetTimes, 3, 3, s_wxluatagArray_wxLua_wxFileName_SetTimes }, ! #endif // (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxFileName) --- 1530,1538 ---- ! #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) { LuaMethod, "GetModificationTime", wxLua_wxFileName_GetModificationTime, 0, 0, s_wxluatagArray_wxLua_wxFileName_GetModificationTime }, { LuaMethod, "GetTimes", wxLua_wxFileName_GetTimes, 3, 3, s_wxluatagArray_wxLua_wxFileName_GetTimes }, { LuaMethod, "SetTimes", wxLua_wxFileName_SetTimes, 3, 3, s_wxluatagArray_wxLua_wxFileName_SetTimes }, ! #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxFileName) Index: datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** datetime.cpp 17 Dec 2006 07:47:14 -0000 1.22 --- datetime.cpp 18 Jan 2007 17:19:02 -0000 1.23 *************** *** 27,31 **** ! #if wxLUA_USE_wxDateTime // ------------------------------------------------------------------------------------------------- // Bind class wxDateTime --- 27,31 ---- ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME // ------------------------------------------------------------------------------------------------- [...992 lines suppressed...] ! #if (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) { LuaMethod, "GetRange", wxLua_wxDatePickerCtrl_GetRange, 2, 2, s_wxluatagArray_wxLua_wxDatePickerCtrl_GetRange }, { LuaMethod, "GetValue", wxLua_wxDatePickerCtrl_GetValue, 0, 0, s_wxluatagArray_wxLua_wxDatePickerCtrl_GetValue }, { LuaMethod, "SetRange", wxLua_wxDatePickerCtrl_SetRange, 2, 2, s_wxluatagArray_wxLua_wxDatePickerCtrl_SetRange }, { LuaMethod, "SetValue", wxLua_wxDatePickerCtrl_SetValue, 1, 1, s_wxluatagArray_wxLua_wxDatePickerCtrl_SetValue }, ! #endif // (wxLUA_USE_wxDateTime && wxUSE_DATETIME) && (wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL) { LuaDelete, "wxDatePickerCtrl", wxLua_wxDatePickerCtrl_destructor, 0, 0, s_wxluaargArray_None }, *************** *** 4694,4697 **** int wxDatePickerCtrl_methodCount = sizeof(wxDatePickerCtrl_methods)/sizeof(wxDatePickerCtrl_methods[0]); ! #endif // wxLUA_USE_wxDatePickerCtrl --- 4702,4705 ---- int wxDatePickerCtrl_methodCount = sizeof(wxDatePickerCtrl_methods)/sizeof(wxDatePickerCtrl_methods[0]); ! #endif // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL |
|
From: John L. <jr...@us...> - 2007-01-18 17:19:11
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14671/wxLua/bindings/wxwidgets Modified Files: datetime.i wx_datatypes.lua Log Message: updated wxUSE_XXX ifdefs for date time Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** datetime.i 7 Dec 2006 06:32:42 -0000 1.20 --- datetime.i 18 Jan 2007 17:19:01 -0000 1.21 *************** *** 25,29 **** // wxDateTime ! %if wxLUA_USE_wxDateTime %include "wx/datetime.h" --- 25,29 ---- // wxDateTime ! %if wxLUA_USE_wxDateTime & wxUSE_DATETIME %include "wx/datetime.h" *************** *** 225,234 **** %endclass ! %endif //wxLUA_USE_wxDateTime //----------------------------------------------------------------------------- // wxTimeSpan ! %if wxLUA_USE_wxTimeSpan %include "wx/datetime.h" --- 225,234 ---- %endclass ! %endif //wxLUA_USE_wxDateTime & wxUSE_DATETIME //----------------------------------------------------------------------------- // wxTimeSpan ! %if wxLUA_USE_wxTimeSpan & wxUSE_DATETIME %include "wx/datetime.h" *************** *** 275,284 **** %endclass ! %endif //wxLUA_USE_wxTimeSpan //----------------------------------------------------------------------------- // wxDateSpan ! %if wxLUA_USE_wxDateSpan %include "wx/datetime.h" --- 275,284 ---- %endclass ! %endif //wxLUA_USE_wxTimeSpan & wxUSE_DATETIME //----------------------------------------------------------------------------- // wxDateSpan ! %if wxLUA_USE_wxDateSpan & wxUSE_DATETIME %include "wx/datetime.h" *************** *** 319,328 **** %endclass ! %endif //wxLUA_USE_wxDateSpan //----------------------------------------------------------------------------- // wxDateTimeHolidayAuthority ! %if wxLUA_USE_wxDateTimeHolidayAuthority %class %noclassinfo %encapsulate wxDateTimeHolidayAuthority --- 319,328 ---- %endclass ! %endif //wxLUA_USE_wxDateSpan & wxUSE_DATETIME //----------------------------------------------------------------------------- // wxDateTimeHolidayAuthority ! %if wxLUA_USE_wxDateTimeHolidayAuthority & wxUSE_DATETIME %class %noclassinfo %encapsulate wxDateTimeHolidayAuthority *************** *** 343,352 **** %endclass ! %endif //wxLUA_USE_wxDateTimeHolidayAuthority //----------------------------------------------------------------------------- // wxTimer ! %if wxLUA_USE_wxTimer %include "wx/timer.h" --- 343,352 ---- %endclass ! %endif //wxLUA_USE_wxDateTimeHolidayAuthority & wxUSE_DATETIME //----------------------------------------------------------------------------- // wxTimer ! %if wxLUA_USE_wxTimer & wxUSE_TIMER %include "wx/timer.h" *************** *** 378,387 **** %endclass ! %endif //wxLUA_USE_wxTimer //----------------------------------------------------------------------------- // wxCalendarCtrl ! %if wxLUA_USE_wxCalendarCtrl %include "wx/calctrl.h" --- 378,387 ---- %endclass ! %endif //wxLUA_USE_wxTimer & wxUSE_TIMER //----------------------------------------------------------------------------- // wxCalendarCtrl ! %if wxLUA_USE_wxCalendarCtrl & wxUSE_CALENDARCTRL %include "wx/calctrl.h" *************** *** 515,524 **** %endclass ! %endif //wxLUA_USE_wxCalendarCtrl //----------------------------------------------------------------------------- // wxDatePickerCtrl ! %if wxLUA_USE_wxDatePickerCtrl %include "wx/datectrl.h" --- 515,524 ---- %endclass ! %endif //wxLUA_USE_wxCalendarCtrl & wxUSE_CALENDARCTRL //----------------------------------------------------------------------------- // wxDatePickerCtrl ! %if wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL %include "wx/datectrl.h" *************** *** 543,546 **** %endclass ! %endif //wxLUA_USE_wxDatePickerCtrl --- 543,546 ---- %endclass ! %endif //wxLUA_USE_wxDatePickerCtrl & wxUSE_DATEPICKCTRL Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** wx_datatypes.lua 19 Dec 2006 06:18:02 -0000 1.44 --- wx_datatypes.lua 18 Jan 2007 17:19:01 -0000 1.45 *************** *** 413,417 **** wxCalendarCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", IsNumber = false, --- 413,417 ---- wxCalendarCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", IsNumber = false, *************** *** 419,423 **** }, wxCalendarDateAttr = { ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", IsNumber = false, --- 419,423 ---- }, wxCalendarDateAttr = { ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", IsNumber = false, *************** *** 425,429 **** }, wxCalendarDateBorder = { ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "enum", IsNumber = true, --- 425,429 ---- }, wxCalendarDateBorder = { ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "enum", IsNumber = true, *************** *** 432,436 **** wxCalendarEvent = { BaseClass = "wxDateEvent", ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", IsNumber = false, --- 432,436 ---- wxCalendarEvent = { BaseClass = "wxDateEvent", ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", IsNumber = false, *************** *** 438,442 **** }, wxCalendarHitTestResult = { ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "enum", IsNumber = true, --- 438,442 ---- }, wxCalendarHitTestResult = { ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "enum", IsNumber = true, *************** *** 695,699 **** wxDateEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", IsNumber = false, --- 695,699 ---- wxDateEvent = { BaseClass = "wxCommandEvent", ! Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", IsNumber = false, *************** *** 702,706 **** wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxDatePickerCtrl", DefType = "class", IsNumber = false, --- 702,706 ---- wxDatePickerCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL", DefType = "class", IsNumber = false, *************** *** 708,712 **** }, wxDateSpan = { ! Condition = "wxLUA_USE_wxDateSpan", DefType = "class", IsNumber = false, --- 708,712 ---- }, wxDateSpan = { ! Condition = "wxLUA_USE_wxDateSpan && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 714,718 **** }, wxDateTime = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "class", IsNumber = false, --- 714,718 ---- }, wxDateTime = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 720,724 **** }, ["wxDateTime::Calendar"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 720,724 ---- }, ["wxDateTime::Calendar"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 726,730 **** }, ["wxDateTime::Country"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 726,730 ---- }, ["wxDateTime::Country"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 732,736 **** }, ["wxDateTime::Month"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 732,736 ---- }, ["wxDateTime::Month"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 738,742 **** }, ["wxDateTime::TZ"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 738,742 ---- }, ["wxDateTime::TZ"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 744,748 **** }, ["wxDateTime::WeekDay"] = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "enum", IsNumber = true, --- 744,748 ---- }, ["wxDateTime::WeekDay"] = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "enum", IsNumber = true, *************** *** 750,754 **** }, wxDateTimeArray = { ! Condition = "wxLUA_USE_wxDateTime", DefType = "class", IsNumber = false, --- 750,754 ---- }, wxDateTimeArray = { ! Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 756,760 **** }, wxDateTimeHolidayAuthority = { ! Condition = "wxLUA_USE_wxDateTimeHolidayAuthority", DefType = "class", IsNumber = false, --- 756,760 ---- }, wxDateTimeHolidayAuthority = { ! Condition = "wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 763,767 **** wxDateTimeWorkDays = { BaseClass = "wxDateTimeHolidayAuthority", ! Condition = "wxLUA_USE_wxDateTimeHolidayAuthority", DefType = "class", IsNumber = false, --- 763,767 ---- wxDateTimeWorkDays = { BaseClass = "wxDateTimeHolidayAuthority", ! Condition = "wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 2881,2885 **** }, wxTimeSpan = { ! Condition = "wxLUA_USE_wxTimeSpan", DefType = "class", IsNumber = false, --- 2881,2885 ---- }, wxTimeSpan = { ! Condition = "wxLUA_USE_wxTimeSpan && wxUSE_DATETIME", DefType = "class", IsNumber = false, *************** *** 2888,2892 **** wxTimer = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxTimer", DefType = "class", IsNumber = false, --- 2888,2892 ---- wxTimer = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxTimer && wxUSE_TIMER", DefType = "class", IsNumber = false, *************** *** 2895,2899 **** wxTimerEvent = { BaseClass = "wxEvent", ! Condition = "wxLUA_USE_wxTimer", DefType = "class", IsNumber = false, --- 2895,2899 ---- wxTimerEvent = { BaseClass = "wxEvent", ! Condition = "wxLUA_USE_wxTimer && wxUSE_TIMER", DefType = "class", IsNumber = false, |
|
From: John L. <jr...@us...> - 2007-01-18 17:19:11
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14671/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: updated wxUSE_XXX ifdefs for date time Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** wxbind.h 19 Dec 2006 06:18:02 -0000 1.49 --- wxbind.h 18 Jan 2007 17:19:01 -0000 1.50 *************** *** 199,207 **** #endif // wxLUA_USE_wxButton ! #if wxLUA_USE_wxCalendarCtrl #include "wx/calctrl.h" #include "wx/dateevt.h" #include "wx/event.h" ! #endif // wxLUA_USE_wxCalendarCtrl #if wxLUA_USE_wxCaret --- 199,207 ---- #endif // wxLUA_USE_wxButton ! #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL #include "wx/calctrl.h" #include "wx/dateevt.h" #include "wx/event.h" ! #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL #if wxLUA_USE_wxCaret *************** *** 271,285 **** #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDatePickerCtrl #include "wx/datectrl.h" ! #endif // wxLUA_USE_wxDatePickerCtrl ! #if wxLUA_USE_wxDateSpan #include "wx/datetime.h" ! #endif // wxLUA_USE_wxDateSpan ! #if wxLUA_USE_wxDateTime #include "wx/datetime.h" ! #endif // wxLUA_USE_wxDateTime #if wxLUA_USE_wxDialog --- 271,285 ---- #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL #include "wx/datectrl.h" ! #endif // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL ! #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME #include "wx/datetime.h" ! #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME #include "wx/datetime.h" ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME #if wxLUA_USE_wxDialog *************** *** 526,536 **** #endif // wxLUA_USE_wxTextValidator ! #if wxLUA_USE_wxTimeSpan #include "wx/datetime.h" ! #endif // wxLUA_USE_wxTimeSpan ! #if wxLUA_USE_wxTimer #include "wx/timer.h" ! #endif // wxLUA_USE_wxTimer #if wxLUA_USE_wxToggleButton --- 526,536 ---- #endif // wxLUA_USE_wxTextValidator ! #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME #include "wx/datetime.h" ! #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxTimer && wxUSE_TIMER #include "wx/timer.h" ! #endif // wxLUA_USE_wxTimer && wxUSE_TIMER #if wxLUA_USE_wxToggleButton *************** *** 844,853 **** #endif // wxLUA_USE_wxButton ! #if wxLUA_USE_wxCalendarCtrl extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCalendarCtrl; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCalendarDateAttr; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCalendarEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateEvent; ! #endif // wxLUA_USE_wxCalendarCtrl #if wxLUA_USE_wxCaret --- 844,853 ---- #endif // wxLUA_USE_wxButton ! #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCalendarCtrl; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCalendarDateAttr; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCalendarEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateEvent; ! #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL #if wxLUA_USE_wxCaret *************** *** 928,948 **** #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDatePickerCtrl extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDatePickerCtrl; ! #endif // wxLUA_USE_wxDatePickerCtrl ! #if wxLUA_USE_wxDateSpan extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateSpan; ! #endif // wxLUA_USE_wxDateSpan ! #if wxLUA_USE_wxDateTime extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTime; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTimeArray; ! #endif // wxLUA_USE_wxDateTime ! #if wxLUA_USE_wxDateTimeHolidayAuthority extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTimeHolidayAuthority; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTimeWorkDays; ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority #if wxLUA_USE_wxDialog --- 928,948 ---- #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDatePickerCtrl; ! #endif // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL ! #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateSpan; ! #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTime; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTimeArray; ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTimeHolidayAuthority; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTimeWorkDays; ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME #if wxLUA_USE_wxDialog *************** *** 1295,1306 **** #endif // wxLUA_USE_wxTextValidator ! #if wxLUA_USE_wxTimeSpan extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTimeSpan; ! #endif // wxLUA_USE_wxTimeSpan ! #if wxLUA_USE_wxTimer extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTimer; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTimerEvent; ! #endif // wxLUA_USE_wxTimer #if wxLUA_USE_wxToggleButton --- 1295,1306 ---- #endif // wxLUA_USE_wxTextValidator ! #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTimeSpan; ! #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxTimer && wxUSE_TIMER extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTimer; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTimerEvent; ! #endif // wxLUA_USE_wxTimer && wxUSE_TIMER #if wxLUA_USE_wxToggleButton *************** *** 1756,1760 **** #endif // wxLUA_USE_wxButton ! #if wxLUA_USE_wxCalendarCtrl extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxCalendarCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxCalendarCtrl_methodCount; --- 1756,1760 ---- #endif // wxLUA_USE_wxButton ! #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxCalendarCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxCalendarCtrl_methodCount; *************** *** 1765,1769 **** extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDateEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateEvent_methodCount; ! #endif // wxLUA_USE_wxCalendarCtrl #if wxLUA_USE_wxCaret --- 1765,1769 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDateEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateEvent_methodCount; ! #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL #if wxLUA_USE_wxCaret *************** *** 1879,1905 **** #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDatePickerCtrl extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDatePickerCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDatePickerCtrl_methodCount; ! #endif // wxLUA_USE_wxDatePickerCtrl ! #if wxLUA_USE_wxDateSpan extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDateSpan_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateSpan_methodCount; ! #endif // wxLUA_USE_wxDateSpan ! #if wxLUA_USE_wxDateTime extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDateTime_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTime_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDateTimeArray_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTimeArray_methodCount; ! #endif // wxLUA_USE_wxDateTime ! #if wxLUA_USE_wxDateTimeHolidayAuthority extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDateTimeHolidayAuthority_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTimeHolidayAuthority_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDateTimeWorkDays_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTimeWorkDays_methodCount; ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority #if wxLUA_USE_wxDialog --- 1879,1905 ---- #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDatePickerCtrl_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDatePickerCtrl_methodCount; ! #endif // wxLUA_USE_wxDatePickerCtrl && wxUSE_DATEPICKCTRL ! #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDateSpan_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateSpan_methodCount; ! #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDateTime_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTime_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDateTimeArray_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTimeArray_methodCount; ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDateTimeHolidayAuthority_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTimeHolidayAuthority_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDateTimeWorkDays_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTimeWorkDays_methodCount; ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME #if wxLUA_USE_wxDialog *************** *** 2415,2429 **** #endif // wxLUA_USE_wxTextValidator ! #if wxLUA_USE_wxTimeSpan extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxTimeSpan_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxTimeSpan_methodCount; ! #endif // wxLUA_USE_wxTimeSpan ! #if wxLUA_USE_wxTimer extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxTimer_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxTimer_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxTimerEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxTimerEvent_methodCount; ! #endif // wxLUA_USE_wxTimer #if wxLUA_USE_wxToggleButton --- 2415,2429 ---- #endif // wxLUA_USE_wxTextValidator ! #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxTimeSpan_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxTimeSpan_methodCount; ! #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxTimer && wxUSE_TIMER extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxTimer_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxTimer_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxTimerEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxTimerEvent_methodCount; ! #endif // wxLUA_USE_wxTimer && wxUSE_TIMER #if wxLUA_USE_wxToggleButton *************** *** 2635,2641 **** #endif // wxLUA_USE_wxBusyCursor ! #if wxLUA_USE_wxCalendarCtrl wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxCalendarDateAttr, wxCalendarDateAttr) ! #endif // wxLUA_USE_wxCalendarCtrl #if wxLUA_USE_wxColourPenBrush --- 2635,2641 ---- #endif // wxLUA_USE_wxBusyCursor ! #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxCalendarDateAttr, wxCalendarDateAttr) ! #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL #if wxLUA_USE_wxColourPenBrush *************** *** 2664,2680 **** #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDateSpan wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateSpan, wxDateSpan) ! #endif // wxLUA_USE_wxDateSpan ! #if wxLUA_USE_wxDateTime wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTime, wxDateTime) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTimeArray, wxDateTimeArray) ! #endif // wxLUA_USE_wxDateTime ! #if wxLUA_USE_wxDateTimeHolidayAuthority wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTimeWorkDays, wxDateTimeWorkDays) ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority #if wxLUA_USE_wxDir --- 2664,2680 ---- #endif // wxLUA_USE_wxDataObject ! #if wxLUA_USE_wxDateSpan && wxUSE_DATETIME wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateSpan, wxDateSpan) ! #endif // wxLUA_USE_wxDateSpan && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTime && wxUSE_DATETIME wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTime, wxDateTime) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTimeArray, wxDateTimeArray) ! #endif // wxLUA_USE_wxDateTime && wxUSE_DATETIME ! #if wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTimeWorkDays, wxDateTimeWorkDays) ! #endif // wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME #if wxLUA_USE_wxDir *************** *** 2735,2741 **** #endif // wxLUA_USE_wxTextCtrl ! #if wxLUA_USE_wxTimeSpan wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxTimeSpan, wxTimeSpan) ! #endif // wxLUA_USE_wxTimeSpan #if wxLUA_USE_wxTreeCtrl --- 2735,2741 ---- #endif // wxLUA_USE_wxTextCtrl ! #if wxLUA_USE_wxTimeSpan && wxUSE_DATETIME wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxTimeSpan, wxTimeSpan) ! #endif // wxLUA_USE_wxTimeSpan && wxUSE_DATETIME #if wxLUA_USE_wxTreeCtrl |
|
From: John L. <jr...@us...> - 2007-01-09 06:08:38
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1727/samples Modified Files: wxluasudoku.wx.lua Log Message: more cleanup and tweaks Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** wxluasudoku.wx.lua 8 Jan 2007 23:39:52 -0000 1.62 --- wxluasudoku.wx.lua 9 Jan 2007 06:08:34 -0000 1.63 *************** *** 554,558 **** for n = 1, 9 do for i, cell_table in pairs(sudokuTable.row_values[n]) do ! if TableCount(cell_table) > 1 then for j, cell in pairs(cell_table) do sudokuTable.invalid[cell] = true --- 554,558 ---- for n = 1, 9 do for i, cell_table in pairs(sudokuTable.row_values[n]) do ! if TableCount(cell_table) > 1 then -- if >= 2 then invalid for j, cell in pairs(cell_table) do sudokuTable.invalid[cell] = true *************** *** 649,654 **** for col = 1, 9 do local cell = sudoku.RowColToCell(row, col) ! if not exceptTable[cell] then ! sudokuTable = sudoku.RemoveCellPossible(cell, value, sudokuTable) end end --- 649,654 ---- for col = 1, 9 do local cell = sudoku.RowColToCell(row, col) ! if (not exceptTable[cell]) and sudokuTable.possible[cell][value] then ! sudokuTable.possible[cell][value] = nil end end *************** *** 661,666 **** for row = 1, 9 do local cell = sudoku.RowColToCell(row, col) ! if not exceptTable[cell] then ! sudokuTable = sudoku.RemoveCellPossible(cell, value, sudokuTable) end end --- 661,666 ---- for row = 1, 9 do local cell = sudoku.RowColToCell(row, col) ! if (not exceptTable[cell]) and sudokuTable.possible[cell][value] then ! sudokuTable.possible[cell][value] = nil end end *************** *** 671,681 **** function sudoku.RemovePossibleBlock(block, value, sudokuTable, exceptTable) exceptTable = exceptTable or {} ! local block_row, block_col = sudoku.BlockToRowCol(block) ! for r = block_row, block_row+2 do ! for c = block_col, block_col+2 do ! local cell = sudoku.RowColToCell(r, c) ! if not exceptTable[cell] then ! sudokuTable = sudoku.RemoveCellPossible(cell, value, sudokuTable) ! end end end --- 671,679 ---- function sudoku.RemovePossibleBlock(block, value, sudokuTable, exceptTable) exceptTable = exceptTable or {} ! local block_cell = sudoku.BlockToCell(block) ! for n = 1, 9 do ! local cell = n + block_cell + sudoku.LinearBlockCellTable[n] ! if (not exceptTable[cell]) and sudokuTable.possible[cell][value] then ! sudokuTable.possible[cell][value] = nil end end *************** *** 694,698 **** local row, col = sudoku.CellToRowCol(cell) local block = sudoku.CellToBlock(cell) - local cell_possible = sudoku.GetCellPossible(cell, sudokuTable) --- 692,695 ---- *************** *** 796,800 **** local cache_key = cache_key_flags ! -- convert key, value table to indexed table local count = 0 for n = 1, 9 do --- 793,797 ---- local cache_key = cache_key_flags ! -- convert key, value table to indexed table and a key for the cache local count = 0 for n = 1, 9 do *************** *** 4939,4968 **** local values = { ! 0,0,0, 0,0,8, 9,0,0, ! 0,0,0, 5,7,0, 6,1,0, ! 0,0,0, 0,0,1, 7,3,2, ! 0,6,0, 0,4,0, 0,0,1, ! 0,0,0, 7,0,3, 0,0,0, ! 4,0,0, 0,2,0, 0,8,0, ! 9,7,5, 3,0,0, 0,0,0, ! 0,2,4, 0,5,7, 0,0,0, ! 0,0,3, 2,0,0, 0,0,0 } local solution = { ! 7,1,2, 6,3,8, 9,4,5, ! 3,4,9, 5,7,2, 6,1,8, ! 8,5,6, 4,9,1, 7,3,2, ! 2,6,8, 9,4,5, 3,7,1, ! 5,9,1, 7,8,3, 2,6,4, ! 4,3,7, 1,2,6, 5,8,9, ! 9,7,5, 3,1,4, 8,2,6, ! 6,2,4, 8,5,7, 1,9,3, ! 1,8,3, 2,6,9, 4,5,7 } --- 4936,4965 ---- local values = { ! 5,0,0, 8,0,3, 0,6,0, ! 1,0,6, 0,9,2, 0,8,5, ! 0,0,8, 5,0,7, 0,4,0, ! 0,0,1, 0,3,4, 0,7,0, ! 0,9,0, 0,0,8, 1,3,4, ! 3,0,0, 0,2,0, 5,9,0, ! 0,0,5, 1,0,0, 0,0,3, ! 0,0,0, 0,0,9, 0,0,0, ! 0,0,7, 3,0,0, 4,0,9 } local solution = { ! 5,4,9, 8,1,3, 2,6,7, ! 1,7,6, 4,9,2, 3,8,5, ! 2,3,8, 5,6,7, 9,4,1, ! 8,5,1, 9,3,4, 6,7,2, ! 7,9,2, 6,5,8, 1,3,4, ! 3,6,4, 7,2,1, 5,9,8, ! 9,8,5, 1,4,6, 7,2,3, ! 4,1,3, 2,7,9, 8,5,6, ! 6,2,7, 3,8,5, 4,1,9 } *************** *** 5080,5081 **** --- 5077,5108 ---- ]] + + --[[ + a = {} + + for i = 1, 1000 do + local s = sudoku.GeneratePuzzle() + s = sudoku.GeneratePuzzleDifficulty(35, s, true) + s = sudoku.UpdateTable(s) + local n, h = sudoku.FindAllNakedHiddenGroups(true, s) + + --TableDump(n) + --TableDump(h) + local c = 0 + cnp = TableCount(n.pairs.cells) + cnt = TableCount(n.triplets.cells) + cnq = TableCount(n.quads.cells) + + chp = TableCount(h.pairs.cells) + cht = TableCount(h.triplets.cells) + chq = TableCount(h.quads.cells) + + + print(i, string.format("n %03d %03d %03d h %03d %03d %03d", cnp, cnt, cnq, chp, cht, chq)) + a[string.format("n %03d %03d %03d h %03d %03d %03d", cnp, cnt, cnq, chp, cht, chq)] = TableCopy(s.values) + + if (cnp > 0) and (cnt > 0) and (cnq > 0) and (chp > 0) and (cht > 0) and (chq > 0) then + break + end + end + ]] |
|
From: John L. <jr...@us...> - 2007-01-08 23:39:56
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7387/samples Modified Files: wxluasudoku.wx.lua Log Message: speed up brute force solver by scanning first Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** wxluasudoku.wx.lua 4 Jan 2007 23:28:05 -0000 1.61 --- wxluasudoku.wx.lua 8 Jan 2007 23:39:52 -0000 1.62 *************** *** 36,39 **** --- 36,43 ---- -- ============================================================================ -- Simple functions to count the total number of elements in a table + -- Notes about speed : using for loop and pairs() in TableCount is 2X faster + -- than using while loop and next(table). However using next() is slightly + -- faster than using for k,v in pairs(t) do return true end in TableIsEmpty. + function TableCount(atable) local count = 0 *************** *** 41,58 **** return count end - function TableICount(atable) - local count = 0 - for k, v in ipairs(atable) do count = count + 1 end - return count - end function TableIsEmpty(atable) ! for k, v in pairs(atable) do return false end ! return true end -- Set a value in the table or subtable, first making sure that the subtables -- are created first. ! -- a = TableSetValue(a, 3, "How", "Are", 4, "You") ==> a.How.Are[4].You = 3 ! function TableSetValue(atable, value, ...) if type(atable) ~= "table" then atable = {} end local t = atable -- t moves up levels through t --- 45,56 ---- return count end function TableIsEmpty(atable) ! return next(atable) == nil end -- Set a value in the table or subtable, first making sure that the subtables -- are created first. ! -- a = TableSetValue(3, a, "How", "Are", 4, "You") ==> a.How.Are[4].You = 3 ! function TableSetValue(value, atable, ...) if type(atable) ~= "table" then atable = {} end local t = atable -- t moves up levels through t *************** *** 386,401 **** -- ============================================================================ -- Check the validity of rows, cols, cells, blocks, values - function sudoku.IsValidRowN(row) - return (row >= 1) and (row <= 9) - end - function sudoku.IsValidColN(col) - return (col >= 1) and (col <= 9) - end - function sudoku.IsValidCellN(cell) - return (cell >= 1) and (cell <= 81) - end - function sudoku.IsValidBlockN(block) - return (block >= 1) and (block <= 9) - end function sudoku.IsValidValueN(value) return (value >= 1) and (value <= 9) --- 384,387 ---- *************** *** 509,524 **** -- ============================================================================ - -- Get all the row values for the row as a table[value] = { cell1, cell2... } - -- if no value then table[value] = nil - function sudoku.GetRowValues(row, sudokuTable) - return sudokuTable.row_values[row] - end - function sudoku.GetColValues(col, sudokuTable) - return sudokuTable.col_values[col] - end - function sudoku.GetBlockValues(block, sudokuTable) - return sudokuTable.block_values[block] - end - -- Set the row_values, col_values, block_values in the sudokuTable -- eg. row values table is row_values[row#][value][cell#] = cell# --- 495,498 ---- *************** *** 537,543 **** if not sudokuTable.block_values[block] then sudokuTable.block_values[block] = {} end ! if sudoku.HasCellValue(cell, sudokuTable) then ! local value = sudoku.GetCellValue(cell, sudokuTable) if not sudokuTable.row_values[row][value] then sudokuTable.row_values[row][value] = {[cell] = cell} --- 511,517 ---- if not sudokuTable.block_values[block] then sudokuTable.block_values[block] = {} end ! local value = sudoku.GetCellValue(cell, sudokuTable) + if sudoku.IsValidValueN(value) then if not sudokuTable.row_values[row][value] then sudokuTable.row_values[row][value] = {[cell] = cell} *************** *** 743,749 **** -- gather up all the set values in row, col, and block ! local rowValues = sudoku.GetRowValues(row, sudokuTable) ! local colValues = sudoku.GetColValues(col, sudokuTable) ! local blockValues = sudoku.GetBlockValues(sudoku.RowColToBlock(row, col), sudokuTable) -- remove the set values from the possible values for v = 1, 9 do --- 717,723 ---- -- gather up all the set values in row, col, and block ! local rowValues = sudokuTable.row_values[row] ! local colValues = sudokuTable.col_values[col] ! local blockValues = sudokuTable.block_values[sudoku.RowColToBlock(row, col)] -- remove the set values from the possible values for v = 1, 9 do *************** *** 761,781 **** for cell = 1, 81 do local row, col = sudoku.CellToRowCol(cell) ! if sudoku.HasCellValue(cell, sudokuTable) then ! sudokuTable = sudoku.SetCellPossible(cell, {}, sudokuTable) ! else ! local possible = {} ! local block = sudoku.CellToBlock(cell) for v = 1, 9 do ! if (sudoku.GetRowValues(row, sudokuTable)[v] == nil) and ! (sudoku.GetColValues(col, sudokuTable)[v] == nil) and ! (sudoku.GetBlockValues(block, sudokuTable)[v] == nil) then possible[v] = v end end - sudokuTable = sudoku.SetCellPossible(cell, possible, sudokuTable) end end --- 735,754 ---- for cell = 1, 81 do local row, col = sudoku.CellToRowCol(cell) + local possible = {} ! if not sudoku.HasCellValue(cell, sudokuTable) then ! local block = sudoku.CellToBlock(cell) for v = 1, 9 do ! if (sudokuTable.row_values[row][v] == nil) and ! (sudokuTable.col_values[col][v] == nil) and ! (sudokuTable.block_values[block][v] == nil) then possible[v] = v end end end + + sudokuTable = sudoku.SetCellPossible(cell, possible, sudokuTable) end *************** *** 1268,1272 **** -- first time through find possible to limit choices, subsequent calls ok local s = sudoku.CreateTable() ! s = sudoku.SetValues(sudokuTable.values, s) -- table consists of guesses[cell] = #num -- guesses.current is current guess # --- 1241,1259 ---- -- first time through find possible to limit choices, subsequent calls ok local s = sudoku.CreateTable() ! ! -- finding all the possibilities is slow, but at least do solve scan ! --s.flags[sudoku.ELIMINATE_NAKED_PAIRS] = true ! --s.flags[sudoku.ELIMINATE_HIDDEN_PAIRS] = true ! --s.flags[sudoku.ELIMINATE_NAKED_TRIPLETS] = true ! --s.flags[sudoku.ELIMINATE_HIDDEN_TRIPLETS] = true ! --s.flags[sudoku.ELIMINATE_NAKED_QUADS] = true ! --s.flags[sudoku.ELIMINATE_HIDDEN_QUADS] = true ! ! --s = sudoku.SetValues(sudokuTable.values, s) ! s.values = TableCopy(sudokuTable.values) ! s = sudoku.CalcRowColBlockValues(s) ! s = sudoku.CalcAllPossible(s) ! s = sudoku.SolveScan(s) ! -- table consists of guesses[cell] = #num -- guesses.current is current guess # |
