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-07-04 15:02:49
|
Update of /cvsroot/wxlua/wxLua/bindings/wxaui In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1590/wxLua/bindings/wxaui Modified Files: aui.i Log Message: Don't use wxABI_VERSION for checks use wxCHECK_VERSION Index: aui.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxaui/aui.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aui.i 4 Jul 2007 14:46:11 -0000 1.2 --- aui.i 4 Jul 2007 15:02:43 -0000 1.3 *************** *** 242,250 **** virtual void Split(size_t page, int direction); ! %if (wxABI_VERSION >= 20801) const wxAuiManager& GetAuiManager() const %endif ! %if %wxchkver_2_8_5 //(wxABI_VERSION >= 20805) ABI version is broken <= 2.8.4 // Sets the normal font void SetNormalFont(const wxFont& font); --- 242,250 ---- virtual void Split(size_t page, int direction); ! %if %wxchkver_2_8_1 // (wxABI_VERSION >= 20801) const wxAuiManager& GetAuiManager() const %endif ! %if %wxchkver_2_8_5 //(wxABI_VERSION >= 20805) // Sets the normal font void SetNormalFont(const wxFont& font); |
|
From: John L. <jr...@us...> - 2007-07-04 15:02:47
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindaui/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1590/wxLua/modules/wxbindaui/src Modified Files: aui.cpp Log Message: Don't use wxABI_VERSION for checks use wxCHECK_VERSION Index: aui.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindaui/src/aui.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aui.cpp 4 Jul 2007 14:46:11 -0000 1.2 --- aui.cpp 4 Jul 2007 15:02:43 -0000 1.3 *************** *** 2376,2380 **** ! #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && ((wxABI_VERSION >= 20801 ))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_GetAuiManager[] = { &s_wxluatag_wxAuiNotebook, NULL }; static int LUACALL wxLua_wxAuiNotebook_GetAuiManager(lua_State *L); --- 2376,2380 ---- ! #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,1))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_GetAuiManager[] = { &s_wxluatag_wxAuiNotebook, NULL }; static int LUACALL wxLua_wxAuiNotebook_GetAuiManager(lua_State *L); *************** *** 2395,2399 **** } ! #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && ((wxABI_VERSION >= 20801 ))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) --- 2395,2399 ---- } ! #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,1))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) *************** *** 2947,2953 **** { "GetArtProvider", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetArtProvider, 1, NULL }, ! #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && ((wxABI_VERSION >= 20801 ))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) { "GetAuiManager", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetAuiManager, 1, NULL }, ! #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && ((wxABI_VERSION >= 20801 ))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) --- 2947,2953 ---- { "GetArtProvider", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetArtProvider, 1, NULL }, ! #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,1))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) { "GetAuiManager", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetAuiManager, 1, NULL }, ! #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,1))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) |
|
From: John L. <jr...@us...> - 2007-07-04 14:57:46
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32069/wxLua/build/msw Modified Files: makefile.gcc makefile.vc makefile.wat Log Message: Hopefully fix compiling AUI using makefile.vc Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** makefile.vc 4 Jul 2007 05:39:15 -0000 1.47 --- makefile.vc 4 Jul 2007 14:57:43 -0000 1.48 *************** *** 71,74 **** --- 71,77 ---- RUNTIME_LIBS = dynamic + # Does the wxLua bindings for wxAUI need to be compiled ? [0,1] + USE_WXBINDAUI = 1 + # Does the wxLua bindings for wxSTC 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.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** makefile.wat 4 Jul 2007 05:39:15 -0000 1.46 --- makefile.wat 4 Jul 2007 14:57:43 -0000 1.47 *************** *** 71,74 **** --- 71,77 ---- RUNTIME_LIBS = dynamic + # Does the wxLua bindings for wxAUI need to be compiled ? [0,1] + USE_WXBINDAUI = 1 + # Does the wxLua bindings for wxSTC 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.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** makefile.gcc 4 Jul 2007 05:39:15 -0000 1.44 --- makefile.gcc 4 Jul 2007 14:57:43 -0000 1.45 *************** *** 65,68 **** --- 65,71 ---- RUNTIME_LIBS := dynamic + # Does the wxLua bindings for wxAUI need to be compiled ? [0,1] + USE_WXBINDAUI := 1 + # Does the wxLua bindings for wxSTC need to be compiled ? [0,1] USE_WXBINDSTC := 1 |
|
From: John L. <jr...@us...> - 2007-07-04 14:57:46
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32069/wxLua/build/bakefiles Modified Files: wxlua.bkl Log Message: Hopefully fix compiling AUI using makefile.vc Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxlua.bkl 2 Jul 2007 00:05:13 -0000 1.37 --- wxlua.bkl 4 Jul 2007 14:57:43 -0000 1.38 *************** *** 45,49 **** <!-- modules options --> ! USE_WXBINDSTC USE_WXLUADEBUG USE_WXLUASOCKET USE_LUAMODULE INSTALL_CUSTOM_WXBIND </set> </if> --- 45,49 ---- <!-- modules options --> ! USE_WXBINDAUI USE_WXBINDSTC USE_WXLUADEBUG USE_WXLUASOCKET USE_LUAMODULE INSTALL_CUSTOM_WXBIND </set> </if> |
|
From: John L. <jr...@us...> - 2007-07-04 14:47:09
|
Update of /cvsroot/wxlua/wxLua/apps/wxluafreeze/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27743/wxLua/apps/wxluafreeze/src Modified Files: wxluafreeze.cpp Log Message: Add initialization for aui lib Index: wxluafreeze.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluafreeze/src/wxluafreeze.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxluafreeze.cpp 14 Jun 2007 23:59:41 -0000 1.10 --- wxluafreeze.cpp 4 Jul 2007 14:47:05 -0000 1.11 *************** *** 37,40 **** --- 37,41 ---- extern bool wxLuaBinding_wxlua_init(); // modules/wxlua extern bool wxLuaBinding_wx_init(); // modules/wxbind + extern bool wxLuaBinding_wxaui_init(); // modules/wxauibind //extern bool wxLuaBinding_wxstc_init(); // modules/wxstcbind //extern bool wxLuaBinding_wxluasocket_init(); // modules/wxluasocket *************** *** 107,110 **** --- 108,112 ---- wxLuaBinding_wxlua_init(); wxLuaBinding_wx_init(); + wxLuaBinding_wxaui_init(); //wxLuaBinding_wxstc_init(); |
|
From: John L. <jr...@us...> - 2007-07-04 14:47:09
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27743/wxLua/samples Modified Files: bindings.wx.lua Log Message: Add initialization for aui lib Index: bindings.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** bindings.wx.lua 30 Jun 2007 00:12:27 -0000 1.14 --- bindings.wx.lua 4 Jul 2007 14:47:05 -0000 1.15 *************** *** 130,133 **** --- 130,134 ---- list_colors = { ["purple"] = wx.wxColour("purple"), + ["green"] = wx.wxColour(0, 180, 0), } *************** *** 470,474 **** for j = 2, #cfunc_t do local cft = {item[1].." func "..j-1, cfunc_t[j][2], "", "", cfunc_t[j][3], cfunc_t[j][4], cfunc_t[j][5], cfunc_t[j][6]} ! if string.find(cfunc_t[j][2], "Overload", 1, 1) then cft.color = wx.wxGREEN end table.insert(t, cft) end --- 471,475 ---- for j = 2, #cfunc_t do local cft = {item[1].." func "..j-1, cfunc_t[j][2], "", "", cfunc_t[j][3], cfunc_t[j][4], cfunc_t[j][5], cfunc_t[j][6]} ! if string.find(cfunc_t[j][2], "Overload", 1, 1) then cft.color = list_colors.green end table.insert(t, cft) end *************** *** 919,922 **** --- 920,925 ---- -- These are classes that wxLua doesn't wrap since they're not necessary local unwrappedBaseClasses = { + ["wxAnimationBase"] = 1, + ["wxAnimationCtrlBase"] = 1, ["wxDCBase"] = 1, ["wxFileDialogBase"] = 1, |
|
From: John L. <jr...@us...> - 2007-07-04 14:47:08
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27743/wxLua/apps/wxluaedit/src Modified Files: wxluaedit.cpp Log Message: Add initialization for aui lib Index: wxluaedit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** wxluaedit.cpp 30 Jun 2007 00:12:17 -0000 1.35 --- wxluaedit.cpp 4 Jul 2007 14:47:05 -0000 1.36 *************** *** 43,46 **** --- 43,47 ---- extern bool wxLuaBinding_wxlua_init(); // modules/wxlua extern bool wxLuaBinding_wx_init(); // modules/wxbind + extern bool wxLuaBinding_wxaui_init(); // modules/wxauibind extern bool wxLuaBinding_wxstc_init(); // modules/wxstcbind extern bool wxLuaBinding_wxluasocket_init(); // modules/wxluasocket *************** *** 173,176 **** --- 174,178 ---- wxLuaBinding_wxlua_init(); wxLuaBinding_wx_init(); + wxLuaBinding_wxaui_init(); wxLuaBinding_wxstc_init(); wxLuaBinding_wxluasocket_init(); |
|
From: John L. <jr...@us...> - 2007-07-04 14:47:08
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27743/wxLua/apps/wxlua/src Modified Files: wxlua.cpp Log Message: Add initialization for aui lib Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** wxlua.cpp 14 Jun 2007 01:23:06 -0000 1.47 --- wxlua.cpp 4 Jul 2007 14:47:05 -0000 1.48 *************** *** 46,49 **** --- 46,50 ---- extern bool wxLuaBinding_wxlua_init(); // modules/wxlua extern bool wxLuaBinding_wx_init(); // modules/wxbind + extern bool wxLuaBinding_wxaui_init(); // modules/wxauibind extern bool wxLuaBinding_wxstc_init(); // modules/wxstcbind extern bool wxLuaBinding_wxluasocket_init(); // modules/wxluasocket *************** *** 146,149 **** --- 147,151 ---- wxLuaBinding_wxlua_init(); wxLuaBinding_wx_init(); + wxLuaBinding_wxaui_init(); wxLuaBinding_wxstc_init(); wxLuaBinding_wxluasocket_init(); |
|
From: John L. <jr...@us...> - 2007-07-04 14:46:15
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27321/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Fix for wxABI_VERSION being broken in 2.8.4 (release = 99 for some reason) Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** wxstc_datatypes.lua 30 Jun 2007 00:12:20 -0000 1.71 --- wxstc_datatypes.lua 4 Jul 2007 14:46:11 -0000 1.72 *************** *** 4143,4146 **** --- 4143,4147 ---- wxLUA_USE_Geometry = "wxLUA_USE_Geometry", wxLUA_USE_MDI = "wxLUA_USE_MDI", + wxLUA_USE_wxAUI = "wxLUA_USE_wxAUI", wxLUA_USE_wxAboutDialog = "wxLUA_USE_wxAboutDialog", wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable", *************** *** 4289,4292 **** --- 4290,4294 ---- wxUSE_ANIMATIONCTRL = "wxUSE_ANIMATIONCTRL", wxUSE_APPLE_IEEE = "wxUSE_APPLE_IEEE", + wxUSE_AUI = "wxUSE_AUI", wxUSE_BITMAPCOMBOBOX = "wxUSE_BITMAPCOMBOBOX", wxUSE_BMPBUTTON = "wxUSE_BMPBUTTON", |
|
From: John L. <jr...@us...> - 2007-07-04 14:46:15
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindaui/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27321/wxLua/modules/wxbindaui/src Modified Files: aui.cpp Log Message: Fix for wxABI_VERSION being broken in 2.8.4 (release = 99 for some reason) Index: aui.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindaui/src/aui.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** aui.cpp 4 Jul 2007 05:39:20 -0000 1.1 --- aui.cpp 4 Jul 2007 14:46:11 -0000 1.2 *************** *** 2375,2378 **** --- 2375,2380 ---- } + + #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && ((wxABI_VERSION >= 20801 ))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_GetAuiManager[] = { &s_wxluatag_wxAuiNotebook, NULL }; static int LUACALL wxLua_wxAuiNotebook_GetAuiManager(lua_State *L); *************** *** 2393,2396 **** --- 2395,2401 ---- } + #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && ((wxABI_VERSION >= 20801 ))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_GetHeightForPageHeight[] = { &s_wxluatag_wxAuiNotebook, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxAuiNotebook_GetHeightForPageHeight(lua_State *L); *************** *** 2413,2416 **** --- 2418,2423 ---- } + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_GetPage[] = { &s_wxluatag_wxAuiNotebook, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxAuiNotebook_GetPage(lua_State *L); *************** *** 2536,2539 **** --- 2543,2548 ---- } + + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_GetTabCtrlHeight[] = { &s_wxluatag_wxAuiNotebook, NULL }; static int LUACALL wxLua_wxAuiNotebook_GetTabCtrlHeight(lua_State *L); *************** *** 2554,2557 **** --- 2563,2567 ---- } + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxBitmap) *************** *** 2626,2630 **** ! #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_SetFont[] = { &s_wxluatag_wxAuiNotebook, &s_wxluatag_wxFont, NULL }; static int LUACALL wxLua_wxAuiNotebook_SetFont(lua_State *L); --- 2636,2640 ---- ! #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_SetFont[] = { &s_wxluatag_wxAuiNotebook, &s_wxluatag_wxFont, NULL }; static int LUACALL wxLua_wxAuiNotebook_SetFont(lua_State *L); *************** *** 2681,2685 **** } ! #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxBitmap) --- 2691,2695 ---- } ! #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxBitmap) *************** *** 2731,2735 **** ! #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_SetSelectedFont[] = { &s_wxluatag_wxAuiNotebook, &s_wxluatag_wxFont, NULL }; static int LUACALL wxLua_wxAuiNotebook_SetSelectedFont(lua_State *L); --- 2741,2745 ---- ! #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_SetSelectedFont[] = { &s_wxluatag_wxAuiNotebook, &s_wxluatag_wxFont, NULL }; static int LUACALL wxLua_wxAuiNotebook_SetSelectedFont(lua_State *L); *************** *** 2749,2753 **** } ! #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_SetSelection[] = { &s_wxluatag_wxAuiNotebook, &s_wxluaarg_Number, NULL }; --- 2759,2763 ---- } ! #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_SetSelection[] = { &s_wxluatag_wxAuiNotebook, &s_wxluaarg_Number, NULL }; *************** *** 2936,2941 **** --- 2946,2958 ---- { "DeletePage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_DeletePage, 1, NULL }, { "GetArtProvider", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetArtProvider, 1, NULL }, + + #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && ((wxABI_VERSION >= 20801 ))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) { "GetAuiManager", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetAuiManager, 1, NULL }, + #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && ((wxABI_VERSION >= 20801 ))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) { "GetHeightForPageHeight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetHeightForPageHeight, 1, NULL }, + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) + { "GetPage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetPage, 1, NULL }, *************** *** 2948,2952 **** --- 2965,2972 ---- { "GetPageText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetPageText, 1, NULL }, { "GetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetSelection, 1, NULL }, + + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) { "GetTabCtrlHeight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetTabCtrlHeight, 1, NULL }, + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxBitmap) *************** *** 2957,2965 **** { "SetArtProvider", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetArtProvider, 1, NULL }, ! #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) { "SetFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetFont, 1, NULL }, { "SetMeasuringFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetMeasuringFont, 1, NULL }, { "SetNormalFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetNormalFont, 1, NULL }, ! #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxBitmap) --- 2977,2985 ---- { "SetArtProvider", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetArtProvider, 1, NULL }, ! #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) { "SetFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetFont, 1, NULL }, { "SetMeasuringFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetMeasuringFont, 1, NULL }, { "SetNormalFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetNormalFont, 1, NULL }, ! #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxBitmap) *************** *** 2969,2975 **** { "SetPageText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetPageText, 1, NULL }, ! #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) { "SetSelectedFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetSelectedFont, 1, NULL }, ! #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) { "SetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetSelection, 1, NULL }, --- 2989,2995 ---- { "SetPageText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetPageText, 1, NULL }, ! #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) { "SetSelectedFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetSelectedFont, 1, NULL }, ! #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) { "SetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetSelection, 1, NULL }, |
|
From: John L. <jr...@us...> - 2007-07-04 14:46:15
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27321/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua Log Message: Fix for wxABI_VERSION being broken in 2.8.4 (release = 99 for some reason) Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** wx_datatypes.lua 30 Jun 2007 00:12:20 -0000 1.81 --- wx_datatypes.lua 4 Jul 2007 14:46:11 -0000 1.82 *************** *** 4132,4135 **** --- 4132,4136 ---- wxLUA_USE_Geometry = "wxLUA_USE_Geometry", wxLUA_USE_MDI = "wxLUA_USE_MDI", + wxLUA_USE_wxAUI = "wxLUA_USE_wxAUI", wxLUA_USE_wxAboutDialog = "wxLUA_USE_wxAboutDialog", wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable", *************** *** 4278,4281 **** --- 4279,4283 ---- wxUSE_ANIMATIONCTRL = "wxUSE_ANIMATIONCTRL", wxUSE_APPLE_IEEE = "wxUSE_APPLE_IEEE", + wxUSE_AUI = "wxUSE_AUI", wxUSE_BITMAPCOMBOBOX = "wxUSE_BITMAPCOMBOBOX", wxUSE_BMPBUTTON = "wxUSE_BMPBUTTON", |
|
From: John L. <jr...@us...> - 2007-07-04 14:46:15
|
Update of /cvsroot/wxlua/wxLua/bindings/wxaui In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27321/wxLua/bindings/wxaui Modified Files: aui.i Log Message: Fix for wxABI_VERSION being broken in 2.8.4 (release = 99 for some reason) Index: aui.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxaui/aui.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** aui.i 4 Jul 2007 05:39:13 -0000 1.1 --- aui.i 4 Jul 2007 14:46:11 -0000 1.2 *************** *** 242,250 **** virtual void Split(size_t page, int direction); ! //#if wxABI_VERSION >= 20801 const wxAuiManager& GetAuiManager() const ! //#endif ! //#if wxABI_VERSION >= 20805 // Sets the normal font void SetNormalFont(const wxFont& font); --- 242,250 ---- virtual void Split(size_t page, int direction); ! %if (wxABI_VERSION >= 20801) const wxAuiManager& GetAuiManager() const ! %endif ! %if %wxchkver_2_8_5 //(wxABI_VERSION >= 20805) ABI version is broken <= 2.8.4 // Sets the normal font void SetNormalFont(const wxFont& font); *************** *** 264,268 **** // Gets the height of the notebook for a given page height int GetHeightForPageHeight(int pageHeight); ! //#endif %endclass --- 264,268 ---- // Gets the height of the notebook for a given page height int GetHeightForPageHeight(int pageHeight); ! %endif %endclass |
|
From: John L. <jr...@us...> - 2007-07-04 14:46:14
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27321/wxLua/bindings Modified Files: genwxbind.lua Log Message: Fix for wxABI_VERSION being broken in 2.8.4 (release = 99 for some reason) Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.142 retrieving revision 1.143 diff -C2 -d -r1.142 -r1.143 *** genwxbind.lua 4 Jul 2007 05:39:13 -0000 1.142 --- genwxbind.lua 4 Jul 2007 14:46:10 -0000 1.143 *************** *** 57,62 **** -- Table of delimiters in the binding text that separate different elements. -- Used in SplitString when reading the binding files. ! bindingDelimiters = { "[]", "==", "&&", "||", "//", "/*", "*/", "*", "&", "|", "(", ")", "[", "]", ",", "=", "{", "}", "!", ";", "\t", "\r", "\n", " " } ! bindingDelimsToKeep = { "[]", "==", "&&", "||", "//", "/*", "*/", "*", "&", "|", "(", ")", "[", "]", ",", "=", "{", "!" } bindingDelimiters_hash = {} --- 57,62 ---- -- Table of delimiters in the binding text that separate different elements. -- Used in SplitString when reading the binding files. ! bindingDelimiters = { "[]", "==", ">=", "<=", "&&", "||", "//", "/*", "*/", "*", "&", "|", "(", ")", "[", "]", ",", "=", "{", "}", "!", ";", "\t", "\r", "\n", " " } ! bindingDelimsToKeep = { "[]", "==", ">=", "<=", "&&", "||", "//", "/*", "*/", "*", "&", "|", "(", ")", "[", "]", ",", "=", "{", "!" } bindingDelimiters_hash = {} |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:58
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/wxbind/src Modified Files: Makefile Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile 17 Jun 2007 18:36:13 -0000 1.15 --- Makefile 4 Jul 2007 05:39:20 -0000 1.16 *************** *** 10,120 **** WXLUASETUP = wxluasetup.h - # --- wxLua parameters ------------------------------------------------------- - WXLUA_LIBVERSION_CURRENT = 2 - WXLUA_LIBVERSION_REVISION = 8 - WXLUA_LIBVERSION_AGE = 0 - - WXLUA_DIR = ../../.. - WXLUA_LIBDIR = $(WXLIB_DIR) - WXLUA_WXLUASETUP_DIR = $(WXLUA_DIR)/modules/wxbind/setup - - LUA = $(WXLUA_DIR)/bin/lua # ---------------------------------------------------------------------------- - # --- wxWidgets parameters from wx-config ------------------------------------ - WXCONFIG := wx-config - WXPREFIX = $(shell $(WXCONFIG) --prefix) - WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) - WXBASENAME = $(shell $(WXCONFIG) --basename) - WXVERSION = $(shell $(WXCONFIG) --version) - WXRELEASE = $(shell $(WXCONFIG) --release) - WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) - WXLDLIBS = $(shell $(WXCONFIG) --libs) - WXCXX = $(shell $(WXCONFIG) --cxx) - WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- ! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall -fPIC ! LDLIBS = $(WXLDLIBS) ! CXX = $(WXCXX) ! GCC_PROFILE = #-pg ! APPEXTRADEFS = $(GCC_PROFILE) -I$(WXLUA_WXLUASETUP_DIR) -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXPREFIX)/contrib/include -DLUACALL= ! APPEXTRALIBS = $(GCC_PROFILE) ! WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluabind-$(WXRELEASE) ! WXBIND_TARGET_LIBDIR = $(WXLUA_LIBDIR) ! WXBIND_TARGET_LIB_STATIC = $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIBNAME).a ! WXBIND_TARGET_LIB_SHARED = $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE) ! WXBIND_TARGET_LIB_LINK1 = $(WXBIND_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT) ! WXBIND_TARGET_LIB_LINK2 = $(WXBIND_TARGET_LIBNAME).so ! RM = rm -f ! AR = ar ! AROPTIONS = rcu ! RANLIB = ranlib ! LN_S = ln -s HEADERS = - SOURCES = \ ! ../../../modules/wxbind/src/appframe.cpp \ ! ../../../modules/wxbind/src/clipdrag.cpp \ ! ../../../modules/wxbind/src/config.cpp \ ! ../../../modules/wxbind/src/controls.cpp \ ! ../../../modules/wxbind/src/data.cpp \ ! ../../../modules/wxbind/src/datetime.cpp \ ! ../../../modules/wxbind/src/defsutil.cpp \ ! ../../../modules/wxbind/src/dialogs.cpp\ ! ../../../modules/wxbind/src/event.cpp \ ! ../../../modules/wxbind/src/file.cpp \ ! ../../../modules/wxbind/src/gdi.cpp \ ! ../../../modules/wxbind/src/geometry.cpp \ ! ../../../modules/wxbind/src/grid.cpp \ ! ../../../modules/wxbind/src/help.cpp \ ! ../../../modules/wxbind/src/html.cpp \ ! ../../../modules/wxbind/src/image.cpp \ ! ../../../modules/wxbind/src/mdi.cpp \ ! ../../../modules/wxbind/src/menutool.cpp \ ! ../../../modules/wxbind/src/picker.cpp \ ! ../../../modules/wxbind/src/print.cpp \ ! ../../../modules/wxbind/src/regex.cpp \ ! ../../../modules/wxbind/src/sizer.cpp \ ! ../../../modules/wxbind/src/socket.cpp \ ! ../../../modules/wxbind/src/thread.cpp \ ! ../../../modules/wxbind/src/wave.cpp \ ! ../../../modules/wxbind/src/windows.cpp \ ! ../../../modules/wxbind/src/wx_bind.cpp \ ! ../../../modules/wxbind/src/wxlhtmlwin.cpp \ ! ../../../modules/wxbind/src/wxlprint.cpp \ ! ../../../modules/wxbind/src/wxlua.cpp \ ! ../../../modules/wxbind/src/xml.cpp OBJECTS=$(SOURCES:.cpp=.o) DEPFILES=$(OBJECTS:.o=.d) .cpp.o: $(CXX) -include $(WXLUASETUP) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) ! $(WXBIND_TARGET_LIB_STATIC): $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) $(RANLIB) $@ ! $(WXBIND_TARGET_LIB_SHARED): $(OBJECTS) ! $(CXX) -shared -o $@ $(OBJECTS) $(APPEXTRALIBS) ! cd $(WXBIND_TARGET_LIBDIR) \ ! && $(RM) $(WXBIND_TARGET_LIB_LINK1) $(WXBIND_TARGET_LIB_LINK2) \ ! && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(WXBIND_TARGET_LIB_LINK1) \ ! && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(WXBIND_TARGET_LIB_LINK2) clean: rm -f core $(OBJECTS) $(DEPFILES) \ ! $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) \ ! $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK1) \ ! $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK2) -include $(DEPFILES) --- 10,100 ---- WXLUASETUP = wxluasetup.h # ---------------------------------------------------------------------------- + # Set path to root of wxLua + WXLUA_DIR = ../../.. # ---------------------------------------------------------------------------- + # Include wxLua settings using wx-config for wxWidgets parameters ! include $(WXLUA_DIR)/build/Makefile_wx-config.in ! # ---------------------------------------------------------------------------- ! TARGET_LIBNAME = lib$(WXLUABIND_LIB) ! TARGET_LIBDIR = $(WXLUA_LIBDIR) ! TARGET_LIB_STATIC = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).a ! TARGET_LIB_SHARED = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE) ! TARGET_LIB_LINK1 = $(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT) ! TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so ! # ---------------------------------------------------------------------------- HEADERS = SOURCES = \ ! 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 \ ! picker.cpp \ ! print.cpp \ ! regex.cpp \ ! sizer.cpp \ ! socket.cpp \ ! thread.cpp \ ! wave.cpp \ ! windows.cpp \ ! wx_bind.cpp \ ! wxlhtmlwin.cpp \ ! wxlprint.cpp \ ! wxlua.cpp \ ! xml.cpp OBJECTS=$(SOURCES:.cpp=.o) DEPFILES=$(OBJECTS:.o=.d) + # ---------------------------------------------------------------------------- + .cpp.o: $(CXX) -include $(WXLUASETUP) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) ! $(TARGET_LIB_STATIC) : $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) $(RANLIB) $@ ! $(TARGET_LIB_SHARED): $(OBJECTS) ! $(CXX) -shared -o $@ $(OBJECTS) $(LIBEXTRALIBS) ! cd $(TARGET_LIBDIR) \ ! && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ ! && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ ! && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK2) clean: rm -f core $(OBJECTS) $(DEPFILES) \ ! $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) ! ! # ---------------------------------------------------------------------------- ! # Include wxLua targets using wx-config for wxWidgets parameters ! ! include $(WXLUA_DIR)/build/Makefile_wx-config_targets.in -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:58
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/wxlua/src Modified Files: Makefile Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 14 Jun 2007 12:23:04 -0000 1.14 --- Makefile 4 Jul 2007 05:39:21 -0000 1.15 *************** *** 7,44 **** # Makefile for wxLua library using gmake - # --- wxLua parameters ------------------------------------------------------- - WXLUA_LIBVERSION_CURRENT = 2 - WXLUA_LIBVERSION_REVISION = 8 - WXLUA_LIBVERSION_AGE = 0 - - WXLUA_DIR = ../../.. - WXLUA_LIBDIR = $(WXLIB_DIR) - WXLUA_WXLUASETUP_DIR = $(WXLUA_DIR)/modules/wxbind/setup - - LUA = $(WXLUA_DIR)/bin/lua # ---------------------------------------------------------------------------- - # --- wxWidgets parameters from wx-config ------------------------------------ - WXCONFIG := wx-config - WXPREFIX = $(shell $(WXCONFIG) --prefix) - WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) - WXBASENAME = $(shell $(WXCONFIG) --basename) - WXVERSION = $(shell $(WXCONFIG) --version) - WXRELEASE = $(shell $(WXCONFIG) --release) - WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) - WXLDLIBS = $(shell $(WXCONFIG) --libs) - WXCXX = $(shell $(WXCONFIG) --cxx) - WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- ! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall -fPIC ! LDLIBS = $(WXLDLIBS) ! CXX = $(WXCXX) ! GCC_PROFILE = #-pg ! APPEXTRADEFS = $(GCC_PROFILE) -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXPREFIX)/contrib/include -DLUACALL= ! APPEXTRALIBS = $(GCC_PROFILE) ! TARGET_LIBNAME = lib$(WXBASENAME)_wxlua-$(WXRELEASE) TARGET_LIBDIR = $(WXLUA_LIBDIR) --- 7,22 ---- # Makefile for wxLua library using gmake # ---------------------------------------------------------------------------- + # Set path to root of wxLua + WXLUA_DIR = ../../.. # ---------------------------------------------------------------------------- + # Include wxLua settings using wx-config for wxWidgets parameters ! include $(WXLUA_DIR)/build/Makefile_wx-config.in ! # ---------------------------------------------------------------------------- ! TARGET_LIBNAME = lib$(WXLUA_LIB) TARGET_LIBDIR = $(WXLUA_LIBDIR) *************** *** 48,56 **** TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so ! RM = rm -f ! AR = ar ! AROPTIONS = rcu ! RANLIB = ranlib ! LN_S = ln -s HEADERS = \ --- 26,30 ---- TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so ! # ---------------------------------------------------------------------------- HEADERS = \ *************** *** 66,74 **** wxlstate.cpp \ wxlua_bind.cpp \ ! wxlua.cpp OBJECTS=$(SOURCES:.cpp=.o) DEPFILES=$(OBJECTS:.o=.d) .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< --- 40,50 ---- wxlstate.cpp \ wxlua_bind.cpp \ ! wxlua.cpp OBJECTS=$(SOURCES:.cpp=.o) DEPFILES=$(OBJECTS:.o=.d) + # ---------------------------------------------------------------------------- + .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< *************** *** 82,86 **** $(TARGET_LIB_SHARED): $(OBJECTS) ! $(CXX) -shared -o $@ $(OBJECTS) $(APPEXTRALIBS) cd $(TARGET_LIBDIR) \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ --- 58,62 ---- $(TARGET_LIB_SHARED): $(OBJECTS) ! $(CXX) -shared -o $@ $(OBJECTS) $(LIBEXTRALIBS) cd $(TARGET_LIBDIR) \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ *************** *** 94,96 **** --- 70,77 ---- $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) + # ---------------------------------------------------------------------------- + # Include wxLua targets using wx-config for wxWidgets parameters + + include $(WXLUA_DIR)/build/Makefile_wx-config_targets.in + -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:58
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** makefile.vc 17 Jun 2007 18:36:10 -0000 1.68 --- makefile.vc 4 Jul 2007 05:39:18 -0000 1.69 *************** *** 73,77 **** THREADING = multi ! # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 --- 73,80 ---- THREADING = multi ! # Does the wxLua bindings for wxAUI need to be compiled ? [0,1] ! USE_WXBINDAUI = 1 [...1018 lines suppressed...] + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_lib_aui.obj: ..\..\wxbindaui\src\aui.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBINDAUI_LIB_CXXFLAGS) $** + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_lib_wxaui_bind.obj: ..\..\wxbindaui\src\wxaui_bind.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBINDAUI_LIB_CXXFLAGS) $** + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_lib_dummy.obj: ..\..\wxbindaui\src\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBINDAUI_LIB_CXXFLAGS) /Ycwx/wxprec.h $** + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_aui.obj: ..\..\wxbindaui\src\aui.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBINDAUI_DLL_CXXFLAGS) $** + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_wxaui_bind.obj: ..\..\wxbindaui\src\wxaui_bind.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBINDAUI_DLL_CXXFLAGS) $** + + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_dummy.obj: ..\..\wxbindaui\src\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXBINDAUI_DLL_CXXFLAGS) /Ycwx/wxprec.h $** + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_dummy.obj: ..\..\wxluadebug\src\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUADEBUG_LIB_CXXFLAGS) /Ycwx/wxprec.h $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** makefile.bcc 17 Jun 2007 18:36:09 -0000 1.69 --- makefile.bcc 4 Jul 2007 05:39:18 -0000 1.70 *************** *** 110,114 **** !endif ! # Does the wxLua bindings for STC need to be compiled ? [0,1] !ifndef USE_WXBINDSTC USE_WXBINDSTC = 1 --- 110,119 ---- !endif ! # Does the wxLua bindings for wxAUI need to be compiled ? [0,1] ! !ifndef USE_WXBINDAUI ! USE_WXBINDAUI = 1 ! !endif ! ! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1] !ifndef USE_WXBINDSTC USE_WXBINDSTC = 1 *************** *** 138,142 **** ### Variables: ### ! LUA_LIB_CFLAGS = -I$(BCCDIR)\include $(VAR) $(VAR_48) $(CPPFLAGS) $(CFLAGS) LUA_LIB_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj \ --- 143,147 ---- ### Variables: ### ! LUA_LIB_CFLAGS = -I$(BCCDIR)\include $(VAR) $(VAR_57) $(CPPFLAGS) $(CFLAGS) LUA_LIB_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj \ *************** *** 169,173 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_loadlib.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_linit.obj ! LUA_DLL_CFLAGS = -I$(BCCDIR)\include $(VAR) $(VAR_48) -DLUA_BUILD_AS_DLL \ $(CPPFLAGS) $(CFLAGS) LUA_DLL_OBJECTS = \ --- 174,178 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_loadlib.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_linit.obj ! LUA_DLL_CFLAGS = -I$(BCCDIR)\include $(VAR) $(VAR_57) -DLUA_BUILD_AS_DLL \ $(CPPFLAGS) $(CFLAGS) LUA_DLL_OBJECTS = \ *************** *** 205,209 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_48) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_lib.csm \ --- 210,214 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_lib.csm \ *************** *** 220,224 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_48) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_dll.csm \ --- 225,229 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_dll.csm \ *************** *** 235,239 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_48) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbind_lib.csm \ --- 240,244 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbind_lib.csm \ *************** *** 276,280 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_48) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBIND \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbind_dll.csm \ --- 281,285 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBIND \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbind_dll.csm \ *************** *** 317,321 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_48) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindstc_lib.csm \ --- 322,326 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindstc_lib.csm \ *************** *** 329,333 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_48) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindstc_dll.csm \ --- 334,338 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindstc_dll.csm \ *************** *** 337,345 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_wxstc_bind.obj WXLUADEBUG_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_48) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluadebug_lib.csm \ --- 342,374 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_wxstc_bind.obj + WXBINDAUI_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ + $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ + -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include \ + -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindaui_lib.csm \ + -Hu $(CPPFLAGS) $(CXXFLAGS) + WXBINDAUI_LIB_OBJECTS = \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_lib_aui.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_lib_wxaui_bind.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_lib_dummy.obj + WXBINDAUI_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ + -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ + $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ + -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDAUI \ + -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindaui_dll.csm \ + -Hu $(CPPFLAGS) $(CXXFLAGS) + WXBINDAUI_DLL_OBJECTS = \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_aui.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_wxaui_bind.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_dummy.obj WXLUADEBUG_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluadebug_lib.csm \ *************** *** 353,357 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_48) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluadebug_dll.csm \ --- 382,386 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluadebug_dll.csm \ *************** *** 365,369 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_48) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluasocket_lib.csm \ --- 394,398 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluasocket_lib.csm \ *************** *** 380,384 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_48) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluasocket_dll.csm \ --- 409,413 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluasocket_dll.csm \ *************** *** 394,398 **** $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_48) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ --- 423,427 ---- $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ ! $(VAR_57) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ -I$(LUA_DIR)\include -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ *************** *** 411,467 **** !endif !if "$(SHARED)" == "0" && "$(USE_SYSTEM_LUA)" == "0" ! __lua_lib___depname = ..\..\..\lib\bcc_$(VAR_44)\lua5.1.lib !endif !if "$(SHARED)" == "1" && "$(USE_SYSTEM_LUA)" == "0" ! __lua_dll___depname = ..\..\..\lib\bcc_$(VAR_44)\lua5.1.dll !endif !if "$(SHARED)" == "0" __wxlua_lib___depname = \ ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib !endif !if "$(SHARED)" == "1" __wxlua_dll___depname = \ ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll !endif !if "$(SHARED)" == "0" __wxbind_lib___depname = \ ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib !endif !if "$(SHARED)" == "1" __wxbind_dll___depname = \ ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll !endif !if "$(SHARED)" == "0" && "$(USE_WXBINDSTC)" == "1" __wxbindstc_lib___depname = \ ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib !endif !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" __wxbindstc_dll___depname = \ ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll !endif !if "$(SHARED)" == "0" && "$(USE_WXLUADEBUG)" == "1" __wxluadebug_lib___depname = \ ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib !endif !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" __wxluadebug_dll___depname = \ ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll !endif !if "$(SHARED)" == "0" && "$(USE_WXLUASOCKET)" == "1" __wxluasocket_lib___depname = \ ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib !endif !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" __wxluasocket_dll___depname = \ ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\bcc_$(VAR_50)\wx.dll !endif !if "$(SHARED)" == "0" ! VAR_44 = lib !endif !if "$(SHARED)" == "1" ! VAR_44 = dll !endif !if "$(WX_SHARED)" == "0" --- 440,504 ---- !endif !if "$(SHARED)" == "0" && "$(USE_SYSTEM_LUA)" == "0" ! __lua_lib___depname = ..\..\..\lib\bcc_$(VAR_53)\lua5.1.lib !endif !if "$(SHARED)" == "1" && "$(USE_SYSTEM_LUA)" == "0" ! __lua_dll___depname = ..\..\..\lib\bcc_$(VAR_53)\lua5.1.dll !endif !if "$(SHARED)" == "0" __wxlua_lib___depname = \ ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib !endif !if "$(SHARED)" == "1" __wxlua_dll___depname = \ ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll !endif !if "$(SHARED)" == "0" __wxbind_lib___depname = \ ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib !endif !if "$(SHARED)" == "1" __wxbind_dll___depname = \ ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll !endif !if "$(SHARED)" == "0" && "$(USE_WXBINDSTC)" == "1" __wxbindstc_lib___depname = \ ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib !endif !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" __wxbindstc_dll___depname = \ ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll ! !endif ! !if "$(SHARED)" == "0" && "$(USE_WXBINDAUI)" == "1" ! __wxbindaui_lib___depname = \ ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib ! !endif ! !if "$(SHARED)" == "1" && "$(USE_WXBINDAUI)" == "1" ! __wxbindaui_dll___depname = \ ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.dll !endif !if "$(SHARED)" == "0" && "$(USE_WXLUADEBUG)" == "1" __wxluadebug_lib___depname = \ ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib !endif !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" __wxluadebug_dll___depname = \ ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll !endif !if "$(SHARED)" == "0" && "$(USE_WXLUASOCKET)" == "1" __wxluasocket_lib___depname = \ ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib !endif !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" __wxluasocket_dll___depname = \ ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\bcc_$(VAR_59)\wx.dll !endif !if "$(SHARED)" == "0" ! VAR_53 = lib !endif !if "$(SHARED)" == "1" ! VAR_53 = dll !endif !if "$(WX_SHARED)" == "0" *************** *** 499,512 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_4 = i !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_4 = !endif !if "$(THREADING)" == "multi" ! __THREADING_4 = mt !endif !if "$(THREADING)" == "single" ! __THREADING_4 = !endif !if "$(THREADING)" == "multi" --- 536,549 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_5 = i !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_5 = !endif !if "$(THREADING)" == "multi" ! __THREADING_5 = mt !endif !if "$(THREADING)" == "single" ! __THREADING_5 = !endif !if "$(THREADING)" == "multi" *************** *** 601,604 **** --- 638,653 ---- !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)d_aui.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)ud_aui.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)_aui.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)u_aui.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif *************** *** 631,650 **** !endif !if "$(BUILD)" == "debug" ! VAR_48 = -v !endif !if "$(BUILD)" == "release" ! VAR_48 = -v- !endif !if "$(SHARED)" == "0" ! VAR_50 = lib !endif !if "$(SHARED)" == "0" ! VAR_50 = lib !endif !if "$(SHARED)" == "1" ! VAR_50 = dll !endif !if "$(SHARED)" == "1" ! VAR_50 = dll !endif --- 680,699 ---- !endif !if "$(BUILD)" == "debug" ! VAR_57 = -v !endif !if "$(BUILD)" == "release" ! VAR_57 = -v- !endif !if "$(SHARED)" == "0" ! VAR_59 = lib !endif !if "$(SHARED)" == "0" ! VAR_59 = lib !endif !if "$(SHARED)" == "1" ! VAR_59 = dll !endif !if "$(SHARED)" == "1" ! VAR_59 = dll !endif *************** *** 656,660 **** ### Targets: ### ! all: test_for_selected_wxbuild $(__lua_lib___depname) $(__lua_dll___depname) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) $(__mod_luamodule___depname) clean: --- 705,709 ---- ### Targets: ### ! all: test_for_selected_wxbuild $(__lua_lib___depname) $(__lua_dll___depname) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxbindaui_lib___depname) $(__wxbindaui_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) $(__mod_luamodule___depname) clean: *************** *** 662,719 **** -if exist bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res -if exist bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.csm del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.csm ! -if exist ..\..\..\lib\bcc_$(VAR_44)\lua5.1.lib del ..\..\..\lib\bcc_$(VAR_44)\lua5.1.lib ! -if exist ..\..\..\lib\bcc_$(VAR_44)\lua5.1.dll del ..\..\..\lib\bcc_$(VAR_44)\lua5.1.dll ! -if exist ..\..\..\lib\bcc_$(VAR_44)\lua5.1.tds del ..\..\..\lib\bcc_$(VAR_44)\lua5.1.tds ! -if exist ..\..\..\lib\bcc_$(VAR_44)\lua5.1.ilc del ..\..\..\lib\bcc_$(VAR_44)\lua5.1.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_44)\lua5.1.ild del ..\..\..\lib\bcc_$(VAR_44)\lua5.1.ild ! -if exist ..\..\..\lib\bcc_$(VAR_44)\lua5.1.ilf del ..\..\..\lib\bcc_$(VAR_44)\lua5.1.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_44)\lua5.1.ils del ..\..\..\lib\bcc_$(VAR_44)\lua5.1.ils ! -if exist ..\..\..\lib\bcc_$(VAR_44)\lua5.1.lib del ..\..\..\lib\bcc_$(VAR_44)\lua5.1.lib ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.tds del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.tds ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ilc del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ild del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ild ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ilf del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ils del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ils ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.tds del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.tds ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ilc del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ild del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ild ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ilf del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ils del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ils ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.tds del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.tds ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ilc del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ild del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ild ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ilf del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ils del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ils ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.tds del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.tds ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ilc del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ild del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ild ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ilf del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ils del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ils ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.tds del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.tds ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ilc del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ild del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ild ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ilf del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils ! -if exist ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.dll del ..\..\..\lib\bcc_$(VAR_50)\wx.dll ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.tds del ..\..\..\lib\bcc_$(VAR_50)\wx.tds ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.ilc del ..\..\..\lib\bcc_$(VAR_50)\wx.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.ild del ..\..\..\lib\bcc_$(VAR_50)\wx.ild ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.ilf del ..\..\..\lib\bcc_$(VAR_50)\wx.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_50)\wx.ils del ..\..\..\lib\bcc_$(VAR_50)\wx.ils test_for_selected_wxbuild: --- 711,776 ---- -if exist bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.res -if exist bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.csm del bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\*.csm ! -if exist ..\..\..\lib\bcc_$(VAR_53)\lua5.1.lib del ..\..\..\lib\bcc_$(VAR_53)\lua5.1.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\lua5.1.dll del ..\..\..\lib\bcc_$(VAR_53)\lua5.1.dll ! -if exist ..\..\..\lib\bcc_$(VAR_53)\lua5.1.tds del ..\..\..\lib\bcc_$(VAR_53)\lua5.1.tds ! -if exist ..\..\..\lib\bcc_$(VAR_53)\lua5.1.ilc del ..\..\..\lib\bcc_$(VAR_53)\lua5.1.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_53)\lua5.1.ild del ..\..\..\lib\bcc_$(VAR_53)\lua5.1.ild ! -if exist ..\..\..\lib\bcc_$(VAR_53)\lua5.1.ilf del ..\..\..\lib\bcc_$(VAR_53)\lua5.1.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_53)\lua5.1.ils del ..\..\..\lib\bcc_$(VAR_53)\lua5.1.ils ! -if exist ..\..\..\lib\bcc_$(VAR_53)\lua5.1.lib del ..\..\..\lib\bcc_$(VAR_53)\lua5.1.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.tds del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.tds ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ilc del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ild del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ild ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ilf del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ils del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.ils ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.tds del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.tds ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ilc del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ild del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ild ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ilf del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ils del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.ils ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.tds del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.tds ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ilc del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ild del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ild ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ilf del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ils del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.ils ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.dll del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.dll ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.tds del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.tds ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.ilc del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.ild del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.ild ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.ilf del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.ils del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.ils ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.tds del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.tds ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ilc del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ild del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ild ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ilf del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ils del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.ils ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.tds del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.tds ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ilc del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ild del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ild ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ilf del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils ! -if exist ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\bcc_$(VAR_59)\wx.dll del ..\..\..\lib\bcc_$(VAR_59)\wx.dll ! -if exist ..\..\..\lib\bcc_$(VAR_59)\wx.tds del ..\..\..\lib\bcc_$(VAR_59)\wx.tds ! -if exist ..\..\..\lib\bcc_$(VAR_59)\wx.ilc del ..\..\..\lib\bcc_$(VAR_59)\wx.ilc ! -if exist ..\..\..\lib\bcc_$(VAR_59)\wx.ild del ..\..\..\lib\bcc_$(VAR_59)\wx.ild ! -if exist ..\..\..\lib\bcc_$(VAR_59)\wx.ilf del ..\..\..\lib\bcc_$(VAR_59)\wx.ilf ! -if exist ..\..\..\lib\bcc_$(VAR_59)\wx.ils del ..\..\..\lib\bcc_$(VAR_59)\wx.ils test_for_selected_wxbuild: *************** *** 730,734 **** !if "$(SHARED)" == "0" && "$(USE_SYSTEM_LUA)" == "0" ! ..\..\..\lib\bcc_$(VAR_44)\lua5.1.lib: make_dir_lua_lib $(LUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 787,791 ---- !if "$(SHARED)" == "0" && "$(USE_SYSTEM_LUA)" == "0" ! ..\..\..\lib\bcc_$(VAR_53)\lua5.1.lib: make_dir_lua_lib $(LUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 738,756 **** make_dir_lua_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_44) mkdir ..\..\..\lib\bcc_$(VAR_44) !if "$(SHARED)" == "1" && "$(USE_SYSTEM_LUA)" == "0" ! ..\..\..\lib\bcc_$(VAR_44)\lua5.1.dll: make_dir_lua_dll $(LUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(VAR_48) @&&| c0d32.obj $(LUA_DLL_OBJECTS),$@,, import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_$(VAR_44)\lua5.1 $@ !endif make_dir_lua_dll: ! if not exist ..\..\..\lib\bcc_$(VAR_44) mkdir ..\..\..\lib\bcc_$(VAR_44) !if "$(SHARED)" == "0" ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj make_dir_wxlua_lib $(WXLUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 795,813 ---- make_dir_lua_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) !if "$(SHARED)" == "1" && "$(USE_SYSTEM_LUA)" == "0" ! ..\..\..\lib\bcc_$(VAR_53)\lua5.1.dll: make_dir_lua_dll $(LUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(VAR_57) @&&| c0d32.obj $(LUA_DLL_OBJECTS),$@,, import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_$(VAR_53)\lua5.1 $@ !endif make_dir_lua_dll: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) !if "$(SHARED)" == "0" ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj make_dir_wxlua_lib $(WXLUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 760,778 **** make_dir_wxlua_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_44) mkdir ..\..\..\lib\bcc_$(VAR_44) !if "$(SHARED)" == "1" ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.obj make_dir_wxlua_dll $(WXLUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_48) -L..\..\..\lib\bcc_$(VAR_50) -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$(__THREADING_4)$(__RUNTIME_LIBS_4).lib,, | ! implib -f ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ !endif make_dir_wxlua_dll: ! if not exist ..\..\..\lib\bcc_$(VAR_44) mkdir ..\..\..\lib\bcc_$(VAR_44) !if "$(SHARED)" == "0" ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_dummy.obj make_dir_wxbind_lib $(WXBIND_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 817,835 ---- make_dir_wxlua_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) !if "$(SHARED)" == "1" ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.obj make_dir_wxlua_dll $(WXLUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_57) -L..\..\..\lib\bcc_$(VAR_59) -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_AUI_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$(__THREADING_5)$(__RUNTIME_LIBS_5).lib,, | ! implib -f ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ !endif make_dir_wxlua_dll: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) !if "$(SHARED)" == "0" ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_dummy.obj make_dir_wxbind_lib $(WXBIND_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 782,800 **** make_dir_wxbind_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_44) mkdir ..\..\..\lib\bcc_$(VAR_44) !if "$(SHARED)" == "1" ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_dummy.obj make_dir_wxbind_dll $(WXBIND_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_48) -L..\..\..\lib\bcc_$(VAR_50) -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$(__THREADING_4)$(__RUNTIME_LIBS_4).lib,, | ! implib -f ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ !endif make_dir_wxbind_dll: ! if not exist ..\..\..\lib\bcc_$(VAR_44) mkdir ..\..\..\lib\bcc_$(VAR_44) !if "$(SHARED)" == "0" && "$(USE_WXBINDSTC)" == "1" ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_dummy.obj make_dir_wxbindstc_lib $(WXBINDSTC_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 839,857 ---- make_dir_wxbind_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) !if "$(SHARED)" == "1" ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_dummy.obj make_dir_wxbind_dll $(WXBIND_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_57) -L..\..\..\lib\bcc_$(VAR_59) -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_AUI_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$(__THREADING_5)$(__RUNTIME_LIBS_5).lib,, | ! implib -f ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ !endif make_dir_wxbind_dll: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) !if "$(SHARED)" == "0" && "$(USE_WXBINDSTC)" == "1" ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_dummy.obj make_dir_wxbindstc_lib $(WXBINDSTC_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 804,822 **** make_dir_wxbindstc_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_44) mkdir ..\..\..\lib\bcc_$(VAR_44) !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_dummy.obj make_dir_wxbindstc_dll $(WXBINDSTC_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_48) -L..\..\..\lib\bcc_$(VAR_50) -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$(__THREADING_4)$(__RUNTIME_LIBS_4).lib,, | ! implib -f ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ !endif make_dir_wxbindstc_dll: ! if not exist ..\..\..\lib\bcc_$(VAR_44) mkdir ..\..\..\lib\bcc_$(VAR_44) !if "$(SHARED)" == "0" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_dummy.obj make_dir_wxluadebug_lib $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 861,901 ---- make_dir_wxbindstc_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_dummy.obj make_dir_wxbindstc_dll $(WXBINDSTC_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_57) -L..\..\..\lib\bcc_$(VAR_59) -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_AUI_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$(__THREADING_5)$(__RUNTIME_LIBS_5).lib,, | ! implib -f ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ !endif make_dir_wxbindstc_dll: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) ! ! !if "$(SHARED)" == "0" && "$(USE_WXBINDAUI)" == "1" ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_lib_dummy.obj make_dir_wxbindaui_lib $(WXBINDAUI_LIB_OBJECTS) ! if exist $@ del $@ ! tlib /a /p4096 $@ @&&| ! $(WXBINDAUI_LIB_OBJECTS) ! | ! !endif ! ! make_dir_wxbindaui_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) ! ! !if "$(SHARED)" == "1" && "$(USE_WXBINDAUI)" == "1" ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_dummy.obj make_dir_wxbindaui_dll $(WXBINDAUI_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_57) -L..\..\..\lib\bcc_$(VAR_59) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBINDAUI_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_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) $(__WXLIB_AUI_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$(__THREADING_5)$(__RUNTIME_LIBS_5).lib,, ! | ! implib -f ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui $@ ! !endif ! ! make_dir_wxbindaui_dll: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) !if "$(SHARED)" == "0" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_dummy.obj make_dir_wxluadebug_lib $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 826,844 **** make_dir_wxluadebug_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_44) mkdir ..\..\..\lib\bcc_$(VAR_44) !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_dummy.obj make_dir_wxluadebug_dll $(WXLUADEBUG_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_48) -L..\..\..\lib\bcc_$(VAR_50) -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$(__THREADING_4)$(__RUNTIME_LIBS_4).lib,, | ! implib -f ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ !endif make_dir_wxluadebug_dll: ! if not exist ..\..\..\lib\bcc_$(VAR_44) mkdir ..\..\..\lib\bcc_$(VAR_44) !if "$(SHARED)" == "0" && "$(USE_WXLUASOCKET)" == "1" ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_dummy.obj make_dir_wxluasocket_lib $(WXLUASOCKET_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 905,923 ---- make_dir_wxluadebug_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_dummy.obj make_dir_wxluadebug_dll $(WXLUADEBUG_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_57) -L..\..\..\lib\bcc_$(VAR_59) -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_AUI_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$(__THREADING_5)$(__RUNTIME_LIBS_5).lib,, | ! implib -f ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ !endif make_dir_wxluadebug_dll: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) !if "$(SHARED)" == "0" && "$(USE_WXLUASOCKET)" == "1" ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_dummy.obj make_dir_wxluasocket_lib $(WXLUASOCKET_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 848,873 **** make_dir_wxluasocket_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_44) mkdir ..\..\..\lib\bcc_$(VAR_44) !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ! ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj make_dir_wxluasocket_dll $(WXLUASOCKET_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_48) -L..\..\..\lib\bcc_$(VAR_50) -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$(__THREADING_4)$(__RUNTIME_LIBS_4).lib,, | ! implib -f ..\..\..\lib\bcc_$(VAR_44)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ !endif make_dir_wxluasocket_dll: ! if not exist ..\..\..\lib\bcc_$(VAR_44) mkdir ..\..\..\lib\bcc_$(VAR_44) !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\bcc_$(VAR_50)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_48) -L..\..\..\lib\bcc_$(VAR_44) -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_MEDIA_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$(__THREADING_4)$(__RUNTIME_LIBS_4).lib,, | !endif make_dir_mod_luamodule: ! if not exist ..\..\..\lib\bcc_$(VAR_50) mkdir ..\..\..\lib\bcc_$(VAR_50) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\lua_lib_lapi.obj: ..\..\lua\src\lapi.c --- 927,952 ---- make_dir_wxluasocket_lib: ! if not exist ..\..\..\lib\bcc_$(VAR_53) mkdir ..\..\..\lib\bcc_$(VAR_53) !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ! ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj make_dir_wxluasocket_dll $(WXLUASOCKET_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_57) -L..\..\..\lib\bcc_$(VAR_59) -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_AUI_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$(__THREADING_5)$(__RUNTIME_LIBS_5).lib,, | ! implib -f ..\..\..\lib\bcc_$(VAR_53)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ !endif ... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:58
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxluasetup.h 2 Jul 2007 00:05:13 -0000 1.18 --- wxluasetup.h 4 Jul 2007 05:39:20 -0000 1.19 *************** *** 13,16 **** --- 13,17 ---- #define wxLUA_USE_wxArrayString 1 #define wxLUA_USE_wxArtProvider 1 + #define wxLUA_USE_wxAUI 1 #define wxLUA_USE_wxBitmap 1 #define wxLUA_USE_wxBitmapComboBox 1 |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:58
|
Update of /cvsroot/wxlua/wxLua/modules/luamodule/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/luamodule/src Modified Files: Makefile Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/luamodule/src/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 23 May 2007 20:17:24 -0000 1.4 --- Makefile 4 Jul 2007 05:39:19 -0000 1.5 *************** *** 7,58 **** # Makefile for wxLua standalone sample using gmake - # --- wxLua parameters ------------------------------------------------------- - WXLUA_LIBVERSION_CURRENT = 2 - WXLUA_LIBVERSION_REVISION = 8 - WXLUA_LIBVERSION_AGE = 0 - - WXLUA_DIR = ../../.. - WXLUA_LIBDIR = $(WXPREFIX)/lib - WXLUA_WXLUASETUP_DIR = $(WXLUA_DIR)/modules/wxbind/setup - - LUA = $(WXLUA_DIR)/bin/lua - - # --- wxWidgets parameters from wx-config ------------------------------------ - WXCONFIG := wx-config - WXPREFIX = $(shell $(WXCONFIG) --prefix) - WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) - WXBASENAME = $(shell $(WXCONFIG) --basename) - WXVERSION = $(shell $(WXCONFIG) --version) - WXRELEASE = $(shell $(WXCONFIG) --release) - WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) - WXLDLIBS = $(shell $(WXCONFIG) --libs) - WXCXX = $(shell $(WXCONFIG) --cxx) - WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- ! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall -fPIC ! LDLIBS = $(WXLDLIBS) ! CXX = $(WXCXX) ! ! PROGRAM = wx.so ! ! LUA_LIBS = $(WXLUA_DIR)/lib/liblua.a ! WXLUA_LIB = $(WXBASENAME)_wxlua-$(WXRELEASE) ! WXLUADEBUG_LIB = $(WXBASENAME)_wxluadebug-$(WXRELEASE) ! WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE) ! WXLUABIND_LIB = $(WXBASENAME)_wxluabind-$(WXRELEASE) ! WXLUASTC_LIB = $(WXBASENAME)_wxluastc-$(WXRELEASE) ! WXSTC_LIB = $(WXBASENAME)_stc-$(WXRELEASE) ! WXXRC_LIB = $(WXBASENAME)_xrc-$(WXRELEASE) ! WXFL_LIB = $(WXBASENAME)_fl-$(WXRELEASE) ! ! APPEXTRADEFS = -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXPREFIX)/contrib/include -DLUACALL= ! # This will build a static wxLua app, staticly linked to .a libs ! #APPEXTRALIBS=-L$(WXLIB_DIR) $(WXLIB_DIR)/lib$(WXLUA_LIB).a $(WXLIB_DIR)/lib$(STC_LIB).a $(WXLIB_DIR)/lib$(WXXRC_LIB).a $(WXLIB_DIR)/lib$(WXFL_LIB).a $(LUA_LIBS) ! # This will build a shared wxLua app, dynamicly linked to .so libs ! # -l$(WXFL_LIB) ! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUASTC_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) #OBJECTS=luamodule.o --- 7,20 ---- # Makefile for wxLua standalone sample using gmake # ---------------------------------------------------------------------------- + # Set path to root of wxLua + WXLUA_DIR = ../../.. ! # ---------------------------------------------------------------------------- ! # Include wxLua settings using wx-config for wxWidgets parameters ! include $(WXLUA_DIR)/build/Makefile_wx-config.in ! # ---------------------------------------------------------------------------- #OBJECTS=luamodule.o *************** *** 71,117 **** $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings wxSTCBindings wx.so ! wx.so: luamodule.cpp $(OBJECTS) $(LUA_LIBS) wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings ! $(CXX) $(CXXFLAGS) $(APPEXTRADEFS) -g -O -shared -o wx.so -fpic \ $(LDLIBS) $(APPEXTRALIBS) \ luamodule.cpp - lua: - @(cd $(WXLUA_DIR)/modules/lua && make linux) - - wxwidgets_bindings: - @(cd $(WXLUA_DIR)/bindings/wxwidgets && make) - - wxstc_bindings: - @(cd $(WXLUA_DIR)/bindings/wxstc && make) - - wxLuaBindings: - @(cd $(WXLUA_DIR)/modules/wxbind/src && make) - - wxSTCBindings: - @(cd $(WXLUA_DIR)/modules/wxbindstc/src && make) - - wxLuaLib: - @(cd $(WXLUA_DIR)/modules/wxlua/src && make) - - wxLuaDebugLib: - @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make) - - wxLuaSocketLib: - @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make) - clean: rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core ! cleanall: ! rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core ! @(cd $(WXLUA_DIR)/modules/lua && make clean) ! @(cd $(WXLUA_DIR)/bindings/wxwidgets && make clean) ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxbindstc/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxlua/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make clean) ! #-include $(DEPFILES) --- 33,50 ---- $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: Lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindLib wxSTCBindLib wxAUIBindLib wx.so ! wx.so: luamodule.cpp $(OBJECTS) $(LUA_LIBS) wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindLib ! $(CXX) $(CXXFLAGS) $(APPEXTRADEFS) -g -O -shared -o wx.so -fPIC \ $(LDLIBS) $(APPEXTRALIBS) \ luamodule.cpp clean: rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core ! # ---------------------------------------------------------------------------- ! # Include wxLua targets using wx-config for wxWidgets parameters ! include $(WXLUA_DIR)/build/Makefile_wx-config_targets.in ! ! -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:57
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** makefile.vc 24 Apr 2007 14:39:53 -0000 1.46 --- makefile.vc 4 Jul 2007 05:39:15 -0000 1.47 *************** *** 71,75 **** RUNTIME_LIBS = dynamic ! # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 --- 71,75 ---- RUNTIME_LIBS = dynamic ! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 113,120 **** USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \ ! 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)" --- 113,121 ---- USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \ ! USE_WXBINDAUI="$(USE_WXBINDAUI)" 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.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** makefile.bcc 24 Apr 2007 13:48:47 -0000 1.41 --- makefile.bcc 4 Jul 2007 05:39:15 -0000 1.42 *************** *** 115,119 **** !endif ! # Does the wxLua bindings for STC need to be compiled ? [0,1] !ifndef USE_WXBINDSTC USE_WXBINDSTC = 1 --- 115,124 ---- !endif ! # Does the wxLua bindings for wxAUI need to be compiled ? [0,1] ! !ifndef USE_WXBINDAUI ! USE_WXBINDAUI = 1 ! !endif ! ! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1] !ifndef USE_WXBINDSTC USE_WXBINDSTC = 1 *************** *** 175,180 **** -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ -DLUA_DIR="$(LUA_DIR)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \ ! -DTHREADING="$(THREADING)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \ -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ --- 180,185 ---- -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ -DLUA_DIR="$(LUA_DIR)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \ ! -DTHREADING="$(THREADING)" -DUSE_WXBINDAUI="$(USE_WXBINDAUI)" \ ! -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.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** makefile.wat 24 Apr 2007 14:39:54 -0000 1.45 --- makefile.wat 4 Jul 2007 05:39:15 -0000 1.46 *************** *** 71,75 **** RUNTIME_LIBS = dynamic ! # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 --- 71,75 ---- RUNTIME_LIBS = dynamic ! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 165,172 **** USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" & RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" & ! 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)" --- 165,173 ---- USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" & RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" & ! USE_WXBINDAUI="$(USE_WXBINDAUI)" 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.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** makefile.gcc 24 Apr 2007 13:48:47 -0000 1.43 --- makefile.gcc 4 Jul 2007 05:39:15 -0000 1.44 *************** *** 65,69 **** RUNTIME_LIBS := dynamic ! # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC := 1 --- 65,69 ---- RUNTIME_LIBS := dynamic ! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1] USE_WXBINDSTC := 1 *************** *** 107,114 **** USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \ ! 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 ---- USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \ ! USE_WXBINDAUI="$(USE_WXBINDAUI)" 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: John L. <jr...@us...> - 2007-07-04 05:39:57
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/build/msvc8 Modified Files: modules.sln modules_mod_luamodule.vcproj modules_mod_wxbind.vcproj modules_mod_wxbindstc.vcproj modules_mod_wxlua.vcproj modules_mod_wxluadebug.vcproj modules_mod_wxluasocket.vcproj Added Files: modules_mod_wxbindaui.vcproj Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: modules.sln =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules.sln,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** modules.sln 24 Apr 2007 14:39:58 -0000 1.2 --- modules.sln 4 Jul 2007 05:39:17 -0000 1.3 *************** *** 9,12 **** --- 9,14 ---- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_wxbindstc", "modules_mod_wxbindstc.vcproj", "{B9DF0956-B44A-5B5C-900D-ABFDB262C4F9}" EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_wxbindaui", "modules_mod_wxbindaui.vcproj", "{4E407FCD-BE1C-5FA7-A1E1-C020135508F4}" + EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_wxluadebug", "modules_mod_wxluadebug.vcproj", "{3C4DCF2C-7D6E-5CE5-A328-3DD913BDBF83}" EndProject *************** *** 163,166 **** --- 165,200 ---- {B9DF0956-B44A-5B5C-900D-ABFDB262C4F9}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 {B9DF0956-B44A-5B5C-900D-ABFDB262C4F9}.Debug Multilib|Win32.Build.0 = Debug Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode DLL Monolithic|Win32.ActiveCfg = Release Unicode DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode DLL Monolithic|Win32.Build.0 = Release Unicode DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode DLL Multilib|Win32.ActiveCfg = Release Unicode DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode DLL Multilib|Win32.Build.0 = Release Unicode DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode Monolithic|Win32.ActiveCfg = Release Unicode Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode Monolithic|Win32.Build.0 = Release Unicode Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode Multilib|Win32.ActiveCfg = Release Unicode Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Unicode Multilib|Win32.Build.0 = Release Unicode Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release DLL Monolithic|Win32.ActiveCfg = Release DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release DLL Monolithic|Win32.Build.0 = Release DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release DLL Multilib|Win32.ActiveCfg = Release DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release DLL Multilib|Win32.Build.0 = Release DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Monolithic|Win32.ActiveCfg = Release Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Monolithic|Win32.Build.0 = Release Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Multilib|Win32.ActiveCfg = Release Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Release Multilib|Win32.Build.0 = Release Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode DLL Monolithic|Win32.ActiveCfg = Debug Unicode DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode DLL Monolithic|Win32.Build.0 = Debug Unicode DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode DLL Multilib|Win32.ActiveCfg = Debug Unicode DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode DLL Multilib|Win32.Build.0 = Debug Unicode DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode Monolithic|Win32.ActiveCfg = Debug Unicode Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode Monolithic|Win32.Build.0 = Debug Unicode Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode Multilib|Win32.ActiveCfg = Debug Unicode Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Unicode Multilib|Win32.Build.0 = Debug Unicode Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug DLL Monolithic|Win32.ActiveCfg = Debug DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug DLL Monolithic|Win32.Build.0 = Debug DLL Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug DLL Multilib|Win32.ActiveCfg = Debug DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug DLL Multilib|Win32.Build.0 = Debug DLL Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Monolithic|Win32.ActiveCfg = Debug Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Monolithic|Win32.Build.0 = Debug Monolithic|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Multilib|Win32.ActiveCfg = Debug Multilib|Win32 + {4E407FCD-BE1C-5FA7-A1E1-C020135508F4}.Debug Multilib|Win32.Build.0 = Debug Multilib|Win32 {3C4DCF2C-7D6E-5CE5-A328-3DD913BDBF83}.Release Unicode DLL Monolithic|Win32.ActiveCfg = Release Unicode DLL Monolithic|Win32 {3C4DCF2C-7D6E-5CE5-A328-3DD913BDBF83}.Release Unicode DLL Monolithic|Win32.Build.0 = Release Unicode DLL Monolithic|Win32 Index: modules_mod_wxlua.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxlua.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxlua.vcproj 14 Jun 2007 12:23:04 -0000 1.4 --- modules_mod_wxlua.vcproj 4 Jul 2007 05:39:17 -0000 1.5 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 42,46 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 42,46 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 93,97 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 93,97 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 110,114 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 110,114 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUA"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 161,165 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 161,165 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 178,182 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 178,182 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 229,233 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 229,233 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 246,250 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 246,250 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUA;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_aui.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxlua.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> Index: modules_mod_wxluasocket.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxluasocket.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxluasocket.vcproj 24 May 2007 00:59:44 -0000 1.4 --- modules_mod_wxluasocket.vcproj 4 Jul 2007 05:39:17 -0000 1.5 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 42,46 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 42,46 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28u_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 93,97 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 93,97 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 110,114 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 110,114 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUASOCKET"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 161,165 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 161,165 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 178,182 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 178,182 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28ud_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 229,233 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 229,233 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 246,250 **** <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 246,250 ---- <Tool AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup,$(WXWIN)\lib\vc_dll\mswd,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include,$(WXWIN)\contrib\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUASOCKET;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbind.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_aui.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" ImportLibrary=".\..\..\..\lib\vc_dll\\wxlua_msw28d_wxluasocket.lib" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> Index: modules_mod_luamodule.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_luamodule.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_luamodule.vcproj 4 May 2007 20:22:26 -0000 1.3 --- modules_mod_luamodule.vcproj 4 Jul 2007 05:39:17 -0000 1.4 *************** *** 25,29 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 25,29 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 42,46 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxlua.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 42,46 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbind.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_aui.lib wxmsw28u_media.lib wxmsw28u_adv.lib wxbase28u_net.lib wxbase28u_xml.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 59,63 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 59,63 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 76,80 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxlua.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 76,80 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_LUAMODULE"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbind.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_aui.lib wxmsw28_media.lib wxmsw28_adv.lib wxbase28_net.lib wxbase28_xml.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 93,97 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxlua.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> --- 93,97 ---- <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_LUAMODULE;_DEBUG"/> <Tool Name="VCPreLinkEventTool"/> ! <Tool AdditionalDependencies="wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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" AdditionalLibraryDirectories="$(WXWIN)\lib\vc_dll,..\..\..\lib\vc_dll,..\..\..\modules\lua\lib" AdditionalOptions="" GenerateDebugInformation="true" GenerateManifest="true" LinkIncremental="1" Name="VCLinkerTool" OutputFile="..\..\..\lib\vc_dll\wx.dll" ProgramDatabaseFile="..\..\..\lib\vc_dll\wx.pdb" SuppressStartupBanner="true" TargetMachine="1"/> <Tool Name="VCALinkTool"/> <Tool Name="VCXDCMakeTool"/> *************** *** 110,114 **** <Tool AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud,$(WXWIN)\include,..\..\..\modules,.\..\..\..,..\..\..\modules\lua\include" Culture="1033" Name="VCResourceCompilerTool" PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:57
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/build/msvc6 Modified Files: modules.dsw modules_mod_luamodule.dsp modules_mod_wxbind.dsp modules_mod_wxbindstc.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Added Files: modules_mod_wxbindaui.dsp Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: modules_mod_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxlua.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxlua.dsp 14 Jun 2007 12:23:04 -0000 1.4 --- modules_mod_wxlua.dsp 4 Jul 2007 05:39:17 -0000 1.5 *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.lib" ! # ADD LINK32 lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Release Unicode Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.lib" ! # ADD LINK32 lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Release Unicode Monolithic" *************** *** 187,192 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.lib" ! # ADD LINK32 lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Release Monolithic" --- 187,192 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.lib" ! # ADD LINK32 lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Release Monolithic" *************** *** 283,288 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.lib" /debug ! # ADD LINK32 lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Debug Unicode Monolithic" --- 283,288 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.lib" /debug ! # ADD LINK32 lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Debug Unicode Monolithic" *************** *** 379,384 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.lib" /debug ! # ADD LINK32 lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Debug Monolithic" --- 379,384 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_aui.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.lib" /debug ! # ADD LINK32 lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_aui.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Debug Monolithic" Index: modules_mod_wxbind.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbind.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxbind.dsp 17 Jun 2007 18:36:08 -0000 1.4 --- modules_mod_wxbind.dsp 4 Jul 2007 05:39:16 -0000 1.5 *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbind.lib" ! # ADD LINK32 wxlua_msw28u_wxlua.lib lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbind.lib" !ELSEIF "$(CFG)" == "mod_wxbind - Win32 Release Unicode Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbind.lib" ! # ADD LINK32 wxlua_msw28u_wxlua.lib lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbind.lib" !ELSEIF "$(CFG)" == "mod_wxbind - Win32 Release Unicode Monolithic" *************** *** 187,192 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbind.lib" ! # ADD LINK32 wxlua_msw28_wxlua.lib lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_html.lib wxmsw28_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbind.lib" !ELSEIF "$(CFG)" == "mod_wxbind - Win32 Release Monolithic" --- 187,192 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbind.lib" ! # ADD LINK32 wxlua_msw28_wxlua.lib lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbind.lib" !ELSEIF "$(CFG)" == "mod_wxbind - Win32 Release Monolithic" *************** *** 283,288 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbind.lib" /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbind.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbind - Win32 Debug Unicode Monolithic" --- 283,288 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbind.lib" /debug ! # ADD LINK32 wxlua_msw28ud_wxlua.lib lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbind.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbind - Win32 Debug Unicode Monolithic" *************** *** 379,384 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbind.lib" /debug ! # ADD LINK32 wxlua_msw28d_wxlua.lib lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbind.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbind - Win32 Debug Monolithic" --- 379,384 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_aui.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbind.lib" /debug ! # ADD LINK32 wxlua_msw28d_wxlua.lib lua5.1.lib wxbase28d.lib wxmsw28d_core.lib wxbase28d_xml.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_media.lib wxmsw28d_aui.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbind.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbind.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbind - Win32 Debug Monolithic" --- NEW FILE: modules_mod_wxbindaui.dsp --- # Microsoft Developer Studio Project File - Name="modules_mod_wxbindaui" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=mod_wxbindaui - Win32 Debug Multilib !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxbindaui.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxbindaui.mak" CFG="mod_wxbindaui - Win32 Debug Multilib" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "mod_wxbindaui - Win32 Release Unicode DLL Monolithic" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbindaui - Win32 Release Unicode DLL Multilib" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbindaui - Win32 Release Unicode Monolithic" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbindaui - Win32 Release Unicode Multilib" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbindaui - Win32 Release DLL Monolithic" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbindaui - Win32 Release DLL Multilib" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbindaui - Win32 Release Monolithic" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbindaui - Win32 Release Multilib" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbindaui - Win32 Debug Unicode DLL Monolithic" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbindaui - Win32 Debug Unicode DLL Multilib" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbindaui - Win32 Debug Unicode Monolithic" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbindaui - Win32 Debug Unicode Multilib" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbindaui - Win32 Debug DLL Monolithic" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbindaui - Win32 Debug DLL Multilib" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxbindaui - Win32 Debug Monolithic" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxbindaui - Win32 Debug Multilib" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "mod_wxbindaui - Win32 Release Unicode DLL Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswu_dll\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswu_dll\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswu_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswu_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXBINDAUI # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXBINDAUI BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindaui.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindaui.lib" # ADD LINK32 wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindaui.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindaui.lib" !ELSEIF "$(CFG)" == "mod_wxbindaui - Win32 Release Unicode DLL Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswu_dll\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswu_dll\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswu_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswu_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28u_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXBINDAUI # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXBINDAUI BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxmsw28u_aui.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindaui.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindaui.lib" # ADD LINK32 wxlua_msw28u_wxbind.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxbase28u.lib wxmsw28u_core.lib wxbase28u_xml.lib wxbase28u_net.lib wxmsw28u_adv.lib wxmsw28u_media.lib wxmsw28u_aui.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxmsw28u_aui.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindaui.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindaui.lib" !ELSEIF "$(CFG)" == "mod_wxbindaui - Win32 Release Unicode Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "vcmswu\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "vcmswu\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswu\wxprec_wxbindaui_lib.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw28u_wxbindaui.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswu\wxprec_wxbindaui_lib.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw28u_wxbindaui.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28u_wxbindaui.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28u_wxbindaui.lib" !ELSEIF "$(CFG)" == "mod_wxbindaui - Win32 Release Unicode Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "vcmswu\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "vcmswu\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswu\wxprec_wxbindaui_lib.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw28u_wxbindaui.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswu\wxprec_wxbindaui_lib.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw28u_wxbindaui.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28u_wxbindaui.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28u_wxbindaui.lib" !ELSEIF "$(CFG)" == "mod_wxbindaui - Win32 Release DLL Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmsw_dll\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmsw_dll\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXBINDAUI # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXBINDAUI BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindaui.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindaui.lib" # ADD LINK32 wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindaui.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindaui.lib" !ELSEIF "$(CFG)" == "mod_wxbindaui - Win32 Release DLL Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmsw_dll\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmsw_dll\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw28_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXBINDAUI # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXBINDAUI BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_xrc.lib wxmsw28_aui.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindaui.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindaui.lib" # ADD LINK32 wxlua_msw28_wxbind.lib wxlua_msw28_wxlua.lib lua5.1.lib wxbase28.lib wxmsw28_core.lib wxbase28_xml.lib wxbase28_net.lib wxmsw28_adv.lib wxmsw28_media.lib wxmsw28_aui.lib wxmsw28_html.lib wxmsw28_xrc.lib wxmsw28_aui.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindaui.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindaui.lib" !ELSEIF "$(CFG)" == "mod_wxbindaui - Win32 Release Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "vcmsw\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "vcmsw\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw\wxprec_wxbindaui_lib.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw28_wxbindaui.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw\wxprec_wxbindaui_lib.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw28_wxbindaui.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28_wxbindaui.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28_wxbindaui.lib" !ELSEIF "$(CFG)" == "mod_wxbindaui - Win32 Release Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "vcmsw\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "vcmsw\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw\wxprec_wxbindaui_lib.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw28_wxbindaui.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmsw\wxprec_wxbindaui_lib.pch" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw28_wxbindaui.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28_wxbindaui.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28_wxbindaui.lib" !ELSEIF "$(CFG)" == "mod_wxbindaui - Win32 Debug Unicode DLL Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswud_dll\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswud_dll\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswud_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswud_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXBINDAUI" /d _DEBUG # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXBINDAUI" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindaui.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindaui.lib" /debug # ADD LINK32 wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindaui.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindaui.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindaui - Win32 Debug Unicode DLL Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswud_dll\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswud_dll\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswud_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswud_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXBINDAUI" /d _DEBUG # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXBINDAUI" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxmsw28ud_aui.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindaui.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindaui.lib" /debug # ADD LINK32 wxlua_msw28ud_wxbind.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxbase28ud.lib wxmsw28ud_core.lib wxbase28ud_xml.lib wxbase28ud_net.lib wxmsw28ud_adv.lib wxmsw28ud_media.lib wxmsw28ud_aui.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxmsw28ud_aui.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindaui.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindaui.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindaui - Win32 Debug Unicode Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "vcmswud\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "vcmswud\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswud\wxprec_wxbindaui_lib.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28ud_wxbindaui.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswud\wxprec_wxbindaui_lib.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28ud_wxbindaui.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28ud_wxbindaui.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28ud_wxbindaui.lib" !ELSEIF "$(CFG)" == "mod_wxbindaui - Win32 Debug Unicode Multilib" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "vcmswud\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "vcmswud\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswud\wxprec_wxbindaui_lib.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28ud_wxbindaui.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswud\wxprec_wxbindaui_lib.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw28ud_wxbindaui.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28ud_wxbindaui.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw28ud_wxbindaui.lib" !ELSEIF "$(CFG)" == "mod_wxbindaui - Win32 Debug DLL Monolithic" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "vcmswd_dll\mod_wxbindaui" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "vcmswd_dll\mod_wxbindaui" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswd_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Yu"wx/wxprec.h" /Fp"vcmswd_dll\wxprec_wxbindaui_dll.pch" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw28d_wxbindaui.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXMAKINGDLL_WXBINDAUI" /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXBINDAUI" /d _DEBUG # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXBINDAUI" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxlua_msw28d_wxbind.lib wxlua_msw28d... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:52
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** makefile.vc 24 May 2007 00:59:43 -0000 1.68 --- makefile.vc 4 Jul 2007 05:39:12 -0000 1.69 *************** *** 85,89 **** USE_WXLUAFREEZEAPP = 1 ! # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 --- 85,89 ---- USE_WXLUAFREEZEAPP = 1 ! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 319,322 **** --- 319,334 ---- !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)d_aui.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)ud_aui.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)_aui.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)u_aui.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif *************** *** 495,499 **** ..\..\..\bin\vc_$(____app_27)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_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 << !endif --- 507,511 ---- ..\..\..\bin\vc_$(____app_27)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 << !endif *************** *** 505,509 **** ..\..\..\bin\vc_$(____app_27)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)$(WXLIBPATH) @<< ! $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_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 << !endif --- 517,521 ---- ..\..\..\bin\vc_$(____app_27)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)$(WXLIBPATH) @<< ! $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 << !endif *************** *** 515,519 **** ..\..\..\bin\vc_$(____app_27)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib 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_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_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 << !endif --- 527,531 ---- ..\..\..\bin\vc_$(____app_27)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 << !endif *************** *** 525,529 **** ..\..\..\bin\vc_$(____app_27)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib 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_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_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 << !endif --- 537,541 ---- ..\..\..\bin\vc_$(____app_27)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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 << !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** makefile.bcc 24 May 2007 00:59:43 -0000 1.68 --- makefile.bcc 4 Jul 2007 05:39:11 -0000 1.69 *************** *** 130,134 **** !endif ! # Does the wxLua bindings for STC need to be compiled ? [0,1] !ifndef USE_WXBINDSTC USE_WXBINDSTC = 1 --- 130,134 ---- !endif ! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1] !ifndef USE_WXBINDSTC USE_WXBINDSTC = 1 *************** *** 311,314 **** --- 311,326 ---- !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)d_aui.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)ud_aui.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)_aui.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)u_aui.lib + !endif + !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif *************** *** 511,515 **** ..\..\..\bin\bcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif --- 523,527 ---- ..\..\..\bin\bcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif *************** *** 521,525 **** ..\..\..\bin\bcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)$(WXLIBPATH) @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif --- 533,537 ---- ..\..\..\bin\bcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)$(WXLIBPATH) @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif *************** *** 531,535 **** ..\..\..\bin\bcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib 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_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif --- 543,547 ---- ..\..\..\bin\bcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif *************** *** 541,545 **** ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib 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_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif --- 553,557 ---- ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** makefile.wat 24 May 2007 00:59:43 -0000 1.69 --- makefile.wat 4 Jul 2007 05:39:12 -0000 1.70 *************** *** 85,89 **** USE_WXLUAFREEZEAPP = 1 ! # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 --- 85,89 ---- USE_WXLUAFREEZEAPP = 1 ! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 251,254 **** --- 251,283 ---- !endif !endif + __WXLIB_AUI_NAME_p = + !ifeq BUILD debug + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 0 + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)d_aui.lib + !endif + !endif + !endif + !ifeq BUILD debug + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 1 + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)ud_aui.lib + !endif + !endif + !endif + !ifeq BUILD release + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 0 + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)_aui.lib + !endif + !endif + !endif + !ifeq BUILD release + !ifeq WX_MONOLITHIC 0 + !ifeq UNICODE 1 + __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)u_aui.lib + !endif + !endif + !endif __WXLIB_MEDIA_NAME_p = !ifeq BUILD debug *************** *** 640,644 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_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)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option stack=%i --- 669,673 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option stack=%i *************** *** 660,664 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)$(WXLIBPATH) @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_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)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option stack=%i --- 689,693 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)$(WXLIBPATH) @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option stack=%i *************** *** 678,682 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib 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_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_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)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option stack=%i --- 707,711 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option stack=%i *************** *** 695,699 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAFREEZE_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib 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_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_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)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option stack=%i --- 724,728 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAFREEZE_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_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)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option stack=%i Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** makefile.gcc 24 May 2007 00:59:43 -0000 1.68 --- makefile.gcc 4 Jul 2007 05:39:12 -0000 1.69 *************** *** 73,77 **** USE_WXLUAFREEZEAPP := 1 ! # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC := 1 --- 73,77 ---- USE_WXLUAFREEZEAPP := 1 ! # Does the wxLua bindings for wxSTC need to be compiled ? [0,1] USE_WXBINDSTC := 1 *************** *** 286,289 **** --- 286,317 ---- ifeq ($(WX_MONOLITHIC),0) ifeq ($(UNICODE),0) + __WXLIB_AUI_NAME_p = -lwxmsw$(WX_VERSION)d_aui + endif + endif + endif + ifeq ($(BUILD),debug) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),1) + __WXLIB_AUI_NAME_p = -lwxmsw$(WX_VERSION)ud_aui + endif + endif + endif + ifeq ($(BUILD),release) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),0) + __WXLIB_AUI_NAME_p = -lwxmsw$(WX_VERSION)_aui + endif + endif + endif + ifeq ($(BUILD),release) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),1) + __WXLIB_AUI_NAME_p = -lwxmsw$(WX_VERSION)u_aui + endif + endif + endif + ifeq ($(BUILD),debug) + ifeq ($(WX_MONOLITHIC),0) + ifeq ($(UNICODE),0) __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)d_media endif *************** *** 559,563 **** ifeq ($(USE_WXLUADEBUG),1) ..\..\..\bin\gcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif --- 587,591 ---- ifeq ($(USE_WXLUADEBUG),1) ..\..\..\bin\gcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif *************** *** 570,574 **** ifeq ($(USE_WXLUAEDITAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o ! $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -L$(WXSTEDIT_DIR)$(WXLIBPATH) -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif --- 598,602 ---- ifeq ($(USE_WXLUAEDITAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o ! $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -L$(WXSTEDIT_DIR)$(WXLIBPATH) -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif *************** *** 579,583 **** ifeq ($(USE_WXLUACANAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o ! $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif --- 607,611 ---- ifeq ($(USE_WXLUACANAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o ! $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif *************** *** 587,591 **** ifeq ($(USE_WXLUAFREEZEAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o ! $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif --- 615,619 ---- ifeq ($(USE_WXLUAFREEZEAPP),1) ..\..\..\bin\gcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o ! $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_DIR)\lib -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:52
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/build/bakefiles Modified Files: common.bkl modules.bkl options.bkl Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** options.bkl 19 Dec 2006 21:12:00 -0000 1.13 --- options.bkl 4 Jul 2007 05:39:16 -0000 1.14 *************** *** 20,23 **** --- 20,24 ---- see wxLua/build/autoconf/configure.ac --> + <set var="USE_WXBINDAUI_DEFAULT">1</set> <set var="USE_WXBINDSTC_DEFAULT">1</set> <set var="USE_WXLUADEBUG_DEFAULT">1</set> *************** *** 34,41 **** <if cond="TARGETING_IDE=='0'"> <option name="USE_WXBINDSTC"> <values>0,1</values> <default-value>$(USE_WXBINDSTC_DEFAULT)</default-value> ! <description>Does the wxLua bindings for STC need to be compiled ?</description> </option> --- 35,48 ---- <if cond="TARGETING_IDE=='0'"> + <option name="USE_WXBINDAUI"> + <values>0,1</values> + <default-value>$(USE_WXBINDAUI_DEFAULT)</default-value> + <description>Does the wxLua bindings for wxAUI need to be compiled ?</description> + </option> + <option name="USE_WXBINDSTC"> <values>0,1</values> <default-value>$(USE_WXBINDSTC_DEFAULT)</default-value> ! <description>Does the wxLua bindings for wxSTC need to be compiled ?</description> </option> *************** *** 72,75 **** --- 79,83 ---- We don't want this: we want to generate DSP for all modules: the choice of the modules to compile will be left to the user through the IDE GUI... --> + <set var="USE_WXBINDAUI">1</set> <set var="USE_WXBINDSTC">1</set> <set var="USE_WXLUADEBUG">1</set> Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** common.bkl 24 Apr 2007 14:21:09 -0000 1.11 --- common.bkl 4 Jul 2007 05:39:16 -0000 1.12 *************** *** 46,49 **** --- 46,52 ---- <set var="WXBIND_HDR">$(fileList('wxbind/include/*.h'))</set> + <set var="WXBINDAUI_SRC">$(fileList('wxbindaui/src/*.cpp'))</set> + <set var="WXBINDAUI_HDR">$(fileList('wxbindaui/include/*.h'))</set> + <set var="WXBINDSTC_SRC">$(fileList('wxbindstc/src/*.cpp'))</set> <set var="WXBINDSTC_HDR">$(fileList('wxbindstc/include/*.h'))</set> *************** *** 131,134 **** --- 134,138 ---- <wx-lib>xrc</wx-lib> <wx-lib>html</wx-lib> + <wx-lib>aui</wx-lib> <wx-lib>media</wx-lib> <wx-lib>adv</wx-lib> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** modules.bkl 4 May 2007 20:22:25 -0000 1.45 --- modules.bkl 4 Jul 2007 05:39:16 -0000 1.46 *************** *** 46,50 **** <!-- the lua lib & dll: these are needed by all wxLua modules, specially for linking the "mod_luamodule" (see below); in fact, compiling statically the ! lua interpreter into "mod_luamodule" is not a Good Thing ! See http://lua-users.org/wiki/BuildingModules to understand why (basically because lua core gets duplicated). --- 46,50 ---- <!-- the lua lib & dll: these are needed by all wxLua modules, specially for linking the "mod_luamodule" (see below); in fact, compiling statically the ! lua interpreter into "mod_luamodule" is not a Good Thing ! See http://lua-users.org/wiki/BuildingModules to understand why (basically because lua core gets duplicated). *************** *** 140,143 **** --- 140,155 ---- </wxlua_stddll> + <!-- the wxBindAUI lib & dll --> + <wxlua_stdlib id="wxbindaui_lib" cond="SHARED=='0' and USE_WXBINDAUI=='1'"> + <module-name>WXBINDAUI</module-name> + </wxlua_stdlib> + <wxlua_stddll id="wxbindaui_dll" cond="SHARED=='1' and USE_WXBINDAUI=='1'"> + <module-name>WXBINDAUI</module-name> + <wxlua-lib>wxbind</wxlua-lib> + <wxlua-lib>wxlua</wxlua-lib> + <wxlua-lib>lua</wxlua-lib> + <wx-lib>aui</wx-lib> + </wxlua_stddll> + <!-- the wxLuaDebug lib & dll --> <wxlua_stdlib id="wxluadebug_lib" cond="SHARED=='0' and USE_WXLUADEBUG=='1'"> *************** *** 178,185 **** <!-- we won't use <wxlua-allstdlibs> because it links to the non-verbatim version of lua, while we need the verbatim one (lua5.1.so/.dll) --> ! <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> <wxlua-lib>lua</wxlua-lib> --- 190,199 ---- <!-- we won't use <wxlua-allstdlibs> because it links to the non-verbatim version of lua, while we need the verbatim one (lua5.1.so/.dll) --> ! <wxlua-lib>wxbindstc</wxlua-lib> ! <wxlua-lib>wxbindaui</wxlua-lib> <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxluadebug</wxlua-lib> + <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> *************** *** 197,200 **** --- 211,215 ---- mod_wxlua=wxlua_lib+wxlua_dll mod_wxbind=wxbind_lib+wxbind_dll + mod_wxbindaui=wxbindaui_lib+wxbindaui_dll mod_wxbindstc=wxbindstc_lib+wxbindstc_dll mod_wxluadebug=wxluadebug_lib+wxluadebug_dll |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:52
|
Update of /cvsroot/wxlua/wxLua/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/build/msvc6 Modified Files: wxLua.dsw Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msvc6/wxLua.dsw,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxLua.dsw 8 May 2007 22:20:14 -0000 1.6 --- wxLua.dsw 4 Jul 2007 05:39:15 -0000 1.7 *************** *** 52,55 **** --- 52,58 ---- End Project Dependency Begin Project Dependency + Project_Dep_Name mod_wxbindaui + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_wxbindstc End Project Dependency *************** *** 106,109 **** --- 109,115 ---- End Project Dependency Begin Project Dependency + Project_Dep_Name mod_wxbindaui + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_wxbindstc End Project Dependency *************** *** 136,139 **** --- 142,148 ---- End Project Dependency Begin Project Dependency + Project_Dep_Name mod_wxbindaui + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_wxbindstc End Project Dependency *************** *** 184,187 **** --- 193,208 ---- ############################################################################### + Project: "mod_wxbindaui"=..\..\modules\build\msvc6\modules_mod_wxbindaui.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "mod_wxbindstc"=..\..\modules\build\msvc6\modules_mod_wxbindstc.dsp - Package Owner=<4> *************** *** 238,241 **** --- 259,265 ---- End Project Dependency Begin Project Dependency + Project_Dep_Name mod_wxbindaui + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_wxbindstc End Project Dependency |
|
From: John L. <jr...@us...> - 2007-07-04 05:39:52
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/bindings/wxstc Modified Files: stc.i Log Message: Add wxAUI library and rebuild all build files Cleanup Makefiles using wx-config and include common bits to simplify them Index: stc.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/stc.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** stc.i 18 Jun 2007 02:56:23 -0000 1.13 --- stc.i 4 Jul 2007 05:39:14 -0000 1.14 *************** *** 1,3 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxStyledTextCtrl from contribs // Author: J Winwood, John Labenski --- 1,3 ---- ! // =========================================================================== // Purpose: wxStyledTextCtrl from contribs // Author: J Winwood, John Labenski *************** *** 5,9 **** // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ! ///////////////////////////////////////////////////////////////////////////// --- 5,9 ---- // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ! // =========================================================================== |
