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...> - 2008-01-17 22:37:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11473/wxLua/modules/wxbind/src Modified Files: wxadv_adv.cpp wxcore_controls.cpp wxcore_windows.cpp wxgl_gl.cpp Log Message: Fix bindings with args missing default values and check for that in the generator. Index: wxcore_windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_windows.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxcore_windows.cpp 22 Dec 2007 06:07:14 -0000 1.11 --- wxcore_windows.cpp 17 Jan 2008 22:37:29 -0000 1.12 *************** *** 8940,8945 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxStaticBitmap_Create[] = { &g_wxluatype_wxStaticBitmap, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxBitmap, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxStaticBitmap_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxStaticBitmap_Create[1] = {{ wxLua_wxStaticBitmap_Create, WXLUAMETHOD_METHOD, 4, 8, s_wxluatypeArray_wxLua_wxStaticBitmap_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& label = wxNullBitmap, const wxPoint& pos, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxStaticBitmap") static int LUACALL wxLua_wxStaticBitmap_Create(lua_State *L) { --- 8940,8945 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxStaticBitmap_Create[] = { &g_wxluatype_wxStaticBitmap, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxBitmap, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxStaticBitmap_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxStaticBitmap_Create[1] = {{ wxLua_wxStaticBitmap_Create, WXLUAMETHOD_METHOD, 3, 8, s_wxluatypeArray_wxLua_wxStaticBitmap_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& label = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxStaticBitmap") static int LUACALL wxLua_wxStaticBitmap_Create(lua_State *L) { *************** *** 8952,8957 **** // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); ! // const wxPoint pos ! const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxPoint); // const wxBitmap label = wxNullBitmap const wxBitmap * label = (argCount >= 4 ? (const wxBitmap *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxBitmap) : &wxNullBitmap); --- 8952,8957 ---- // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); ! // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxPoint) : &wxDefaultPosition); // const wxBitmap label = wxNullBitmap const wxBitmap * label = (argCount >= 4 ? (const wxBitmap *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxBitmap) : &wxNullBitmap); Index: wxgl_gl.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxgl_gl.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxgl_gl.cpp 9 Jan 2008 05:02:53 -0000 1.7 --- wxgl_gl.cpp 17 Jan 2008 22:37:29 -0000 1.8 *************** *** 439,450 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_constructor2[] = { &g_wxluatype_TBOOLEAN, &g_wxluatype_wxGLCanvas, &g_wxluatype_wxPalette, &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLContext_constructor2(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_constructor2[1] = {{ wxLua_wxGLContext_constructor2, WXLUAMETHOD_CONSTRUCTOR, 3, 4, s_wxluatypeArray_wxLua_wxGLContext_constructor2 }}; ! // wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other) static int LUACALL wxLua_wxGLContext_constructor2(lua_State *L) { // get number of arguments int argCount = lua_gettop(L); ! // const wxGLContext other ! const wxGLContext * other = (const wxGLContext *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxGLContext); // const wxPalette palette = wxNullPalette const wxPalette * palette = (argCount >= 3 ? (const wxPalette *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxPalette) : &wxNullPalette); --- 439,450 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_constructor2[] = { &g_wxluatype_TBOOLEAN, &g_wxluatype_wxGLCanvas, &g_wxluatype_wxPalette, &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLContext_constructor2(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_constructor2[1] = {{ wxLua_wxGLContext_constructor2, WXLUAMETHOD_CONSTRUCTOR, 2, 4, s_wxluatypeArray_wxLua_wxGLContext_constructor2 }}; ! // wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other = NULL) static int LUACALL wxLua_wxGLContext_constructor2(lua_State *L) { // get number of arguments int argCount = lua_gettop(L); ! // const wxGLContext other = NULL ! const wxGLContext * other = (argCount >= 4 ? (const wxGLContext *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxGLContext) : NULL); // const wxPalette palette = wxNullPalette const wxPalette * palette = (argCount >= 3 ? (const wxPalette *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxPalette) : &wxNullPalette); *************** *** 543,547 **** #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) ! { wxLua_wxGLContext_constructor2, WXLUAMETHOD_CONSTRUCTOR, 3, 4, s_wxluatypeArray_wxLua_wxGLContext_constructor2 }, #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) --- 543,547 ---- #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) ! { wxLua_wxGLContext_constructor2, WXLUAMETHOD_CONSTRUCTOR, 2, 4, s_wxluatypeArray_wxLua_wxGLContext_constructor2 }, #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) Index: wxadv_adv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_adv.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxadv_adv.cpp 8 Jan 2008 00:55:35 -0000 1.11 --- wxadv_adv.cpp 17 Jan 2008 22:37:29 -0000 1.12 *************** *** 1467,1472 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Create[] = { &g_wxluatype_wxBitmapComboBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxBitmapComboBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Create[1] = {{ wxLua_wxBitmapComboBox_Create, WXLUAMETHOD_METHOD, 5, 10, s_wxluatypeArray_wxLua_wxBitmapComboBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") static int LUACALL wxLua_wxBitmapComboBox_Create(lua_State *L) { --- 1467,1472 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_Create[] = { &g_wxluatype_wxBitmapComboBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxBitmapComboBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_Create[1] = {{ wxLua_wxBitmapComboBox_Create, WXLUAMETHOD_METHOD, 4, 10, s_wxluatypeArray_wxLua_wxBitmapComboBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") static int LUACALL wxLua_wxBitmapComboBox_Create(lua_State *L) { *************** *** 1479,1484 **** // long style = 0 long style = (argCount >= 8 ? (long)wxlua_getnumbertype(L, 8) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 7); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); --- 1479,1484 ---- // long style = 0 long style = (argCount >= 8 ? (long)wxlua_getnumbertype(L, 8) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 7 ? wxlua_getwxArrayString(L, 7) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 1640,1645 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxBitmapComboBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_constructor1[1] = {{ wxLua_wxBitmapComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 4, 9, s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1 }}; ! // wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") static int LUACALL wxLua_wxBitmapComboBox_constructor1(lua_State *L) { --- 1640,1645 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxBitmapComboBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxBitmapComboBox_constructor1[1] = {{ wxLua_wxBitmapComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 9, s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1 }}; ! // wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") static int LUACALL wxLua_wxBitmapComboBox_constructor1(lua_State *L) { *************** *** 1652,1657 **** // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 6); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); --- 1652,1657 ---- // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 6 ? wxlua_getwxArrayString(L, 6) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 1739,1743 **** #if (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxBitmapComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 4, 9, s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1 }, #endif // (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxBitmapComboBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, --- 1739,1743 ---- #if (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxBitmapComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 9, s_wxluatypeArray_wxLua_wxBitmapComboBox_constructor1 }, #endif // (((wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxBitmapComboBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, Index: wxcore_controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxcore_controls.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxcore_controls.cpp 22 Dec 2007 06:07:12 -0000 1.10 --- wxcore_controls.cpp 17 Jan 2008 22:37:29 -0000 1.11 *************** *** 1483,1488 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxChoice_Create[] = { &g_wxluatype_wxChoice, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxChoice_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxChoice_Create[1] = {{ wxLua_wxChoice_Create, WXLUAMETHOD_METHOD, 4, 9, s_wxluatypeArray_wxLua_wxChoice_Create }}; ! // bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") static int LUACALL wxLua_wxChoice_Create(lua_State *L) { --- 1483,1488 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxChoice_Create[] = { &g_wxluatype_wxChoice, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxChoice_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxChoice_Create[1] = {{ wxLua_wxChoice_Create, WXLUAMETHOD_METHOD, 3, 9, s_wxluatypeArray_wxLua_wxChoice_Create }}; ! // bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") static int LUACALL wxLua_wxChoice_Create(lua_State *L) { *************** *** 1495,1500 **** // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 6); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); --- 1495,1500 ---- // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 6 ? wxlua_getwxArrayString(L, 6) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 1537,1542 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxChoice_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxChoice_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxChoice_constructor1[1] = {{ wxLua_wxChoice_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatypeArray_wxLua_wxChoice_constructor1 }}; ! // wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") static int LUACALL wxLua_wxChoice_constructor1(lua_State *L) { --- 1537,1542 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxChoice_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxChoice_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxChoice_constructor1[1] = {{ wxLua_wxChoice_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatypeArray_wxLua_wxChoice_constructor1 }}; ! // wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") static int LUACALL wxLua_wxChoice_constructor1(lua_State *L) { *************** *** 1549,1554 **** // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 5); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); --- 1549,1554 ---- // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 5 ? wxlua_getwxArrayString(L, 5) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 1595,1599 **** #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxChoice && wxUSE_CHOICE)) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxChoice_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatypeArray_wxLua_wxChoice_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxChoice && wxUSE_CHOICE)) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxChoice_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, --- 1595,1599 ---- #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxChoice && wxUSE_CHOICE)) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxChoice_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatypeArray_wxLua_wxChoice_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxChoice && wxUSE_CHOICE)) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxChoice_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, *************** *** 1729,1734 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxComboBox_Create[] = { &g_wxluatype_wxComboBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxComboBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxComboBox_Create[1] = {{ wxLua_wxComboBox_Create, WXLUAMETHOD_METHOD, 4, 10, s_wxluatypeArray_wxLua_wxComboBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") static int LUACALL wxLua_wxComboBox_Create(lua_State *L) { --- 1729,1734 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxComboBox_Create[] = { &g_wxluatype_wxComboBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxComboBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxComboBox_Create[1] = {{ wxLua_wxComboBox_Create, WXLUAMETHOD_METHOD, 3, 10, s_wxluatypeArray_wxLua_wxComboBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") static int LUACALL wxLua_wxComboBox_Create(lua_State *L) { *************** *** 1741,1746 **** // long style = 0 long style = (argCount >= 8 ? (long)wxlua_getnumbertype(L, 8) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 7); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); --- 1741,1746 ---- // long style = 0 long style = (argCount >= 8 ? (long)wxlua_getnumbertype(L, 8) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 7 ? wxlua_getwxArrayString(L, 7) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 1995,2000 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxComboBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxComboBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxComboBox_constructor1[1] = {{ wxLua_wxComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 9, s_wxluatypeArray_wxLua_wxComboBox_constructor1 }}; ! // wxComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") static int LUACALL wxLua_wxComboBox_constructor1(lua_State *L) { --- 1995,2000 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxComboBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxComboBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxComboBox_constructor1[1] = {{ wxLua_wxComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 9, s_wxluatypeArray_wxLua_wxComboBox_constructor1 }}; ! // wxComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") static int LUACALL wxLua_wxComboBox_constructor1(lua_State *L) { *************** *** 2007,2012 **** // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 6); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); --- 2007,2012 ---- // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 6 ? wxlua_getwxArrayString(L, 6) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 2055,2059 **** #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxComboBox && wxUSE_COMBOBOX) ! { wxLua_wxComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 9, s_wxluatypeArray_wxLua_wxComboBox_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxComboBox && wxUSE_COMBOBOX) { wxLua_wxComboBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, --- 2055,2059 ---- #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxComboBox && wxUSE_COMBOBOX) ! { wxLua_wxComboBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 9, s_wxluatypeArray_wxLua_wxComboBox_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxComboBox && wxUSE_COMBOBOX) { wxLua_wxComboBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, *************** *** 2428,2433 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxListBox_Create[] = { &g_wxluatype_wxListBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxListBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxListBox_Create[1] = {{ wxLua_wxListBox_Create, WXLUAMETHOD_METHOD, 4, 9, s_wxluatypeArray_wxLua_wxListBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") static int LUACALL wxLua_wxListBox_Create(lua_State *L) { --- 2428,2433 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxListBox_Create[] = { &g_wxluatype_wxListBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxListBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxListBox_Create[1] = {{ wxLua_wxListBox_Create, WXLUAMETHOD_METHOD, 3, 9, s_wxluatypeArray_wxLua_wxListBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") static int LUACALL wxLua_wxListBox_Create(lua_State *L) { *************** *** 2440,2445 **** // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 6); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); --- 2440,2445 ---- // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 6 ? wxlua_getwxArrayString(L, 6) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 2641,2646 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxListBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxListBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxListBox_constructor1[1] = {{ wxLua_wxListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatypeArray_wxLua_wxListBox_constructor1 }}; ! // wxListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") static int LUACALL wxLua_wxListBox_constructor1(lua_State *L) { --- 2641,2646 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxListBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxListBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxListBox_constructor1[1] = {{ wxLua_wxListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatypeArray_wxLua_wxListBox_constructor1 }}; ! // wxListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") static int LUACALL wxLua_wxListBox_constructor1(lua_State *L) { *************** *** 2653,2658 **** // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 5); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); --- 2653,2658 ---- // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 5 ? wxlua_getwxArrayString(L, 5) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 2699,2703 **** #if (((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatypeArray_wxLua_wxListBox_constructor1 }, #endif // (((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxListBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, --- 2699,2703 ---- #if (((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatypeArray_wxLua_wxListBox_constructor1 }, #endif // (((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxValidator && wxUSE_VALIDATORS)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxListBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, *************** *** 2778,2783 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxCheckListBox_Create[] = { &g_wxluatype_wxCheckListBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxCheckListBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxCheckListBox_Create[1] = {{ wxLua_wxCheckListBox_Create, WXLUAMETHOD_METHOD, 4, 9, s_wxluatypeArray_wxLua_wxCheckListBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") static int LUACALL wxLua_wxCheckListBox_Create(lua_State *L) { --- 2778,2783 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxCheckListBox_Create[] = { &g_wxluatype_wxCheckListBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxCheckListBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxCheckListBox_Create[1] = {{ wxLua_wxCheckListBox_Create, WXLUAMETHOD_METHOD, 3, 9, s_wxluatypeArray_wxLua_wxCheckListBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") static int LUACALL wxLua_wxCheckListBox_Create(lua_State *L) { *************** *** 2790,2795 **** // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 6); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); --- 2790,2795 ---- // long style = 0 long style = (argCount >= 7 ? (long)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 6 ? wxlua_getwxArrayString(L, 6) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 2834,2839 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxCheckListBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxCheckListBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxCheckListBox_constructor1[1] = {{ wxLua_wxCheckListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatypeArray_wxLua_wxCheckListBox_constructor1 }}; ! // wxCheckListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") static int LUACALL wxLua_wxCheckListBox_constructor1(lua_State *L) { --- 2834,2839 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxCheckListBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxCheckListBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxCheckListBox_constructor1[1] = {{ wxLua_wxCheckListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatypeArray_wxLua_wxCheckListBox_constructor1 }}; ! // wxCheckListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") static int LUACALL wxLua_wxCheckListBox_constructor1(lua_State *L) { *************** *** 2846,2851 **** // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 5); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); --- 2846,2851 ---- // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 5 ? wxlua_getwxArrayString(L, 5) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 2892,2896 **** #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && ((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxCheckListBox && wxUSE_CHECKLISTBOX))) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxCheckListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 8, s_wxluatypeArray_wxLua_wxCheckListBox_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && ((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxCheckListBox && wxUSE_CHECKLISTBOX))) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxCheckListBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, --- 2892,2896 ---- #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && ((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxCheckListBox && wxUSE_CHECKLISTBOX))) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxCheckListBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatypeArray_wxLua_wxCheckListBox_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && ((wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxCheckListBox && wxUSE_CHECKLISTBOX))) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxCheckListBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, *************** *** 5841,5846 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxRadioBox_Create[] = { &g_wxluatype_wxRadioBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxRadioBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRadioBox_Create[1] = {{ wxLua_wxRadioBox_Create, WXLUAMETHOD_METHOD, 5, 11, s_wxluatypeArray_wxLua_wxRadioBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") static int LUACALL wxLua_wxRadioBox_Create(lua_State *L) { --- 5841,5846 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxRadioBox_Create[] = { &g_wxluatype_wxRadioBox, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxRadioBox_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxRadioBox_Create[1] = {{ wxLua_wxRadioBox_Create, WXLUAMETHOD_METHOD, 4, 11, s_wxluatypeArray_wxLua_wxRadioBox_Create }}; ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") static int LUACALL wxLua_wxRadioBox_Create(lua_State *L) { *************** *** 5855,5860 **** // int majorDimension = 0 int majorDimension = (argCount >= 8 ? (int)wxlua_getnumbertype(L, 8) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 7); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); --- 5855,5860 ---- // int majorDimension = 0 int majorDimension = (argCount >= 8 ? (int)wxlua_getnumbertype(L, 8) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 7 ? wxlua_getwxArrayString(L, 7) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxluaT_getuserdatatype(L, 6, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 6071,6076 **** static wxLuaArgType s_wxluatypeArray_wxLua_wxRadioBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxRadioBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxRadioBox_constructor1[1] = {{ wxLua_wxRadioBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 4, 10, s_wxluatypeArray_wxLua_wxRadioBox_constructor1 }}; ! // wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") static int LUACALL wxLua_wxRadioBox_constructor1(lua_State *L) { --- 6071,6076 ---- static wxLuaArgType s_wxluatypeArray_wxLua_wxRadioBox_constructor1[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_wxArrayString, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_wxValidator, &g_wxluatype_TSTRING, NULL }; static int LUACALL wxLua_wxRadioBox_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxRadioBox_constructor1[1] = {{ wxLua_wxRadioBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 10, s_wxluatypeArray_wxLua_wxRadioBox_constructor1 }}; ! // wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") static int LUACALL wxLua_wxRadioBox_constructor1(lua_State *L) { *************** *** 6085,6090 **** // int majorDimension = 0 int majorDimension = (argCount >= 7 ? (int)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices ! wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 6); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); --- 6085,6090 ---- // int majorDimension = 0 int majorDimension = (argCount >= 7 ? (int)wxlua_getnumbertype(L, 7) : 0); ! // const wxArrayString choices = wxLuaNullSmartwxArrayString ! wxLuaSmartwxArrayString choices = (argCount >= 6 ? wxlua_getwxArrayString(L, 6) : wxLuaNullSmartwxArrayString); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxluaT_getuserdatatype(L, 5, g_wxluatype_wxSize) : &wxDefaultSize); *************** *** 6144,6148 **** #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxRadioBox && wxUSE_RADIOBOX)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxRadioBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 4, 10, s_wxluatypeArray_wxLua_wxRadioBox_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxRadioBox && wxUSE_RADIOBOX)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxRadioBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, --- 6144,6148 ---- #if (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxRadioBox && wxUSE_RADIOBOX)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxRadioBox_constructor1, WXLUAMETHOD_CONSTRUCTOR, 3, 10, s_wxluatypeArray_wxLua_wxRadioBox_constructor1 }, #endif // (((wxLUA_USE_wxValidator && wxUSE_VALIDATORS) && (wxLUA_USE_wxArrayString)) && (wxLUA_USE_wxRadioBox && wxUSE_RADIOBOX)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxRadioBox_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, |
|
From: John L. <jr...@us...> - 2008-01-17 22:37:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11473/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp Log Message: Fix bindings with args missing default values and check for that in the generator. Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.115 retrieving revision 1.116 diff -C2 -d -r1.115 -r1.116 *** wxlbind.cpp 15 Jan 2008 01:04:04 -0000 1.115 --- wxlbind.cpp 17 Jan 2008 22:37:30 -0000 1.116 *************** *** 23,26 **** --- 23,29 ---- //#include "wxluadebug/include/wxldebug.h" // for debugging only + const wxLuaSmartwxArrayString wxLuaNullSmartwxArrayString(NULL, true); + + #include "wx/listimpl.cpp" WX_DEFINE_LIST(wxLuaBindingList); *************** *** 767,771 **** } ! errmsg += fnOverloadList; wxlua_error(L, errmsg); --- 770,774 ---- } ! errmsg += wxT("\n") + fnOverloadList; wxlua_error(L, errmsg); *************** *** 823,827 **** { // optional args? ! if ((wxluacfuncs[i].minargs < wxluacfuncs[i].maxargs) && (arg == wxluacfuncs[i].minargs)) { if (arg > 0) funcStr += wxT(" "); --- 826,830 ---- { // optional args? ! if ((wxluacfuncs[i].minargs < wxluacfuncs[i].maxargs) && (arg+1 == wxluacfuncs[i].minargs)) { if (arg > 0) funcStr += wxT(" "); |
|
From: John L. <jr...@us...> - 2008-01-17 22:37:40
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11473/wxLua/bindings/wxwidgets Modified Files: wxadv_adv.i wxcore_controls.i wxcore_windows.i wxgl_gl.i Log Message: Fix bindings with args missing default values and check for that in the generator. Index: wxcore_windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_windows.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxcore_windows.i 18 Dec 2007 01:03:32 -0000 1.3 --- wxcore_windows.i 17 Jan 2008 22:37:29 -0000 1.4 *************** *** 936,940 **** wxStaticBitmap() wxStaticBitmap(wxWindow* parent, wxWindowID id, const wxBitmap& label = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxStaticBitmap") ! bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& label = wxNullBitmap, const wxPoint& pos, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxStaticBitmap") wxBitmap GetBitmap() const --- 936,940 ---- wxStaticBitmap() wxStaticBitmap(wxWindow* parent, wxWindowID id, const wxBitmap& label = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxStaticBitmap") ! bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& label = wxNullBitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxStaticBitmap") wxBitmap GetBitmap() const Index: wxadv_adv.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_adv.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxadv_adv.i 8 Jan 2008 00:55:35 -0000 1.3 --- wxadv_adv.i 17 Jan 2008 22:37:29 -0000 1.4 *************** *** 147,153 **** wxBitmapComboBox() //wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "comboBox") ! wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") //bool Create(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n, const wxString choices[], long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap) --- 147,153 ---- wxBitmapComboBox() //wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "comboBox") ! wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") //bool Create(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n, const wxString choices[], long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox") int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap) Index: wxgl_gl.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxgl_gl.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxgl_gl.i 9 Jan 2008 05:00:49 -0000 1.2 --- wxgl_gl.i 17 Jan 2008 22:37:29 -0000 1.3 *************** *** 65,69 **** %if !%wxchkver_2_8 wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette) ! wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other) const wxWindow* GetWindow() --- 65,69 ---- %if !%wxchkver_2_8 wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette) ! wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other = NULL) const wxWindow* GetWindow() Index: wxcore_controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_controls.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxcore_controls.i 22 Dec 2007 06:07:08 -0000 1.3 --- wxcore_controls.i 17 Jan 2008 22:37:29 -0000 1.4 *************** *** 167,172 **** %class wxChoice, wxControlWithItems wxChoice() ! wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") ! bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") int GetCurrentSelection() const --- 167,172 ---- %class wxChoice, wxControlWithItems wxChoice() ! wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") ! bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") int GetCurrentSelection() const *************** *** 191,196 **** %class wxComboBox, wxControlWithItems wxComboBox() ! wxComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") bool CanCopy() const --- 191,196 ---- %class wxComboBox, wxControlWithItems wxComboBox() ! wxComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") bool CanCopy() const *************** *** 267,272 **** %class wxListBox, wxControlWithItems wxListBox() ! wxListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") void Deselect(int n) --- 267,272 ---- %class wxListBox, wxControlWithItems wxListBox() ! wxListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") void Deselect(int n) *************** *** 296,301 **** %class wxCheckListBox, wxListBox wxCheckListBox() ! wxCheckListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") void Check(int item, bool check = true) --- 296,301 ---- %class wxCheckListBox, wxListBox wxCheckListBox() ! wxCheckListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") void Check(int item, bool check = true) *************** *** 605,610 **** %class wxRadioBox, wxControl wxRadioBox() ! wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") // these are marked deprecated in 2.6, use wxWindow::Get/SetLabel and Get/SetString below --- 605,610 ---- %class wxRadioBox, wxControl wxRadioBox() ! wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") // these are marked deprecated in 2.6, use wxWindow::Get/SetLabel and Get/SetString below |
|
From: John L. <jr...@us...> - 2008-01-17 22:37:40
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11473/wxLua/bindings Modified Files: genwxbind.lua Log Message: Fix bindings with args missing default values and check for that in the generator. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.158 retrieving revision 1.159 diff -C2 -d -r1.158 -r1.159 *** genwxbind.lua 8 Jan 2008 00:55:35 -0000 1.158 --- genwxbind.lua 17 Jan 2008 22:37:29 -0000 1.159 *************** *** 3540,3543 **** --- 3540,3545 ---- if not member.Params[arg].DefaultValue then requiredParamCount = requiredParamCount + 1 + elseif member.Params[arg+1] and (not member.Params[arg+1].DefaultValue) then + print("ERROR: Missing default arg #"..tostring(arg+1).." in function. "..LineTableErrString(member)) end end |
|
From: John L. <jr...@us...> - 2008-01-17 22:37:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11473/wxLua/modules/wxlua/include Modified Files: wxlbind.h Log Message: Fix bindings with args missing default values and check for that in the generator. Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** wxlbind.h 8 Jan 2008 06:19:53 -0000 1.78 --- wxlbind.h 17 Jan 2008 22:37:30 -0000 1.79 *************** *** 404,409 **** --- 404,416 ---- return *this; } + wxLuaSmartwxArrayString& operator = (const wxArrayString& arr) + { + *GetArray() = arr; + return *this; + } }; + extern const WXDLLIMPEXP_DATA_WXLUA(wxLuaSmartwxArrayString) wxLuaNullSmartwxArrayString; + // ---------------------------------------------------------------------------- // wxLuaSmartwxSortedArrayString - Wraps a "new" wxSortedArrayString with an automatic |
|
From: John L. <jr...@us...> - 2008-01-17 18:26:31
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9816/wxLua/modules/wxbind/src Modified Files: wxaui_aui.cpp wxaui_bind.cpp Log Message: %wxchkver_2_8_6 for some wxAui items. Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxaui_bind.cpp 22 Dec 2007 06:07:11 -0000 1.5 --- wxaui_bind.cpp 17 Jan 2008 18:26:28 -0000 1.6 *************** *** 147,151 **** --- 147,157 ---- { "wxAUI_NB_DEFAULT_STYLE", wxAUI_NB_DEFAULT_STYLE }, { "wxAUI_NB_LEFT", wxAUI_NB_LEFT }, + #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI + + #if (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) { "wxAUI_NB_MIDDLE_CLICK_CLOSE", wxAUI_NB_MIDDLE_CLICK_CLOSE }, + #endif // (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + + #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI { "wxAUI_NB_RIGHT", wxAUI_NB_RIGHT }, { "wxAUI_NB_SCROLL_BUTTONS", wxAUI_NB_SCROLL_BUTTONS }, Index: wxaui_aui.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_aui.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxaui_aui.cpp 22 Dec 2007 06:07:11 -0000 1.14 --- wxaui_aui.cpp 17 Jan 2008 18:26:28 -0000 1.15 *************** *** 1659,1667 **** #endif // (wxCHECK_VERSION(2,8,5)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) ! #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxDC) static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_IsTabVisible[] = { &g_wxluatype_wxAuiTabCtrl, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_wxDC, &g_wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxAuiTabCtrl_IsTabVisible(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_IsTabVisible[1] = {{ wxLua_wxAuiTabCtrl_IsTabVisible, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxAuiTabCtrl_IsTabVisible }}; ! // bool IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd); static int LUACALL wxLua_wxAuiTabCtrl_IsTabVisible(lua_State *L) { --- 1659,1667 ---- #endif // (wxCHECK_VERSION(2,8,5)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) ! #if ((wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxDC) static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_IsTabVisible[] = { &g_wxluatype_wxAuiTabCtrl, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_wxDC, &g_wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxAuiTabCtrl_IsTabVisible(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_IsTabVisible[1] = {{ wxLua_wxAuiTabCtrl_IsTabVisible, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxAuiTabCtrl_IsTabVisible }}; ! // %wxchkver_2_8_6 bool IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd); static int LUACALL wxLua_wxAuiTabCtrl_IsTabVisible(lua_State *L) { *************** *** 1684,1693 **** } ! #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxDC) static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_MakeTabVisible[] = { &g_wxluatype_wxAuiTabCtrl, &g_wxluatype_TNUMBER, &g_wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxAuiTabCtrl_MakeTabVisible(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_MakeTabVisible[1] = {{ wxLua_wxAuiTabCtrl_MakeTabVisible, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiTabCtrl_MakeTabVisible }}; ! // void MakeTabVisible(int tabPage, wxWindow* win); static int LUACALL wxLua_wxAuiTabCtrl_MakeTabVisible(lua_State *L) { --- 1684,1694 ---- } ! #endif // ((wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxDC) + #if (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_MakeTabVisible[] = { &g_wxluatype_wxAuiTabCtrl, &g_wxluatype_TNUMBER, &g_wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxAuiTabCtrl_MakeTabVisible(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_MakeTabVisible[1] = {{ wxLua_wxAuiTabCtrl_MakeTabVisible, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiTabCtrl_MakeTabVisible }}; ! // %wxchkver_2_8_6 void MakeTabVisible(int tabPage, wxWindow* win); static int LUACALL wxLua_wxAuiTabCtrl_MakeTabVisible(lua_State *L) { *************** *** 1704,1707 **** --- 1705,1710 ---- } + #endif // (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_MovePage[] = { &g_wxluatype_wxAuiTabCtrl, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxAuiTabCtrl_MovePage(lua_State *L); *************** *** 2037,2045 **** #endif // (wxCHECK_VERSION(2,8,5)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) ! #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxDC) { "IsTabVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_IsTabVisible, 1, NULL }, ! #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxDC) { "MakeTabVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_MakeTabVisible, 1, NULL }, { "MovePage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_MovePage, 1, NULL }, { "RemoveButton", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_RemoveButton, 1, NULL }, --- 2040,2051 ---- #endif // (wxCHECK_VERSION(2,8,5)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) ! #if ((wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxDC) { "IsTabVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_IsTabVisible, 1, NULL }, ! #endif // ((wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxDC) + #if (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) { "MakeTabVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_MakeTabVisible, 1, NULL }, + #endif // (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + { "MovePage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_MovePage, 1, NULL }, { "RemoveButton", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_RemoveButton, 1, NULL }, |
|
From: John L. <jr...@us...> - 2008-01-17 18:26:31
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9816/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua wxaui_aui.i Log Message: %wxchkver_2_8_6 for some wxAui items. Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** wx_datatypes.lua 18 Dec 2007 01:03:32 -0000 1.90 --- wx_datatypes.lua 17 Jan 2008 18:26:27 -0000 1.91 *************** *** 4368,4371 **** --- 4368,4372 ---- ["%wxchkver_2_8_4"] = "wxCHECK_VERSION(2,8,4)", ["%wxchkver_2_8_5"] = "wxCHECK_VERSION(2,8,5)", + ["%wxchkver_2_8_6"] = "wxCHECK_VERSION(2,8,6)", ["%wxcompat_2_4"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)", ["%wxcompat_2_6"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", Index: wxaui_aui.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxaui_aui.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxaui_aui.i 18 Dec 2007 01:03:32 -0000 1.3 --- wxaui_aui.i 17 Jan 2008 18:26:27 -0000 1.4 *************** *** 35,39 **** wxAUI_NB_CLOSE_ON_ACTIVE_TAB wxAUI_NB_CLOSE_ON_ALL_TABS ! wxAUI_NB_MIDDLE_CLICK_CLOSE wxAUI_NB_DEFAULT_STYLE //= wxAUI_NB_TOP|wxAUI_NB_TAB_SPLIT|wxAUI_NB_TAB_MOVE|wxAUI_NB_SCROLL_BUTTONS|wxAUI_NB_CLOSE_ON_ACTIVE_TAB|wxAUI_NB_MIDDLE_CLICK_CLOSE --- 35,39 ---- wxAUI_NB_CLOSE_ON_ACTIVE_TAB wxAUI_NB_CLOSE_ON_ALL_TABS ! %wxchkver_2_8_6 wxAUI_NB_MIDDLE_CLICK_CLOSE wxAUI_NB_DEFAULT_STYLE //= wxAUI_NB_TOP|wxAUI_NB_TAB_SPLIT|wxAUI_NB_TAB_MOVE|wxAUI_NB_SCROLL_BUTTONS|wxAUI_NB_CLOSE_ON_ACTIVE_TAB|wxAUI_NB_MIDDLE_CLICK_CLOSE *************** *** 215,220 **** void SetTabOffset(size_t offset); ! bool IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd); ! void MakeTabVisible(int tabPage, wxWindow* win); %wxchkver_2_8_5 bool IsDragging() const --- 215,220 ---- void SetTabOffset(size_t offset); ! %wxchkver_2_8_6 bool IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd); ! %wxchkver_2_8_6 void MakeTabVisible(int tabPage, wxWindow* win); %wxchkver_2_8_5 bool IsDragging() const |
|
From: John L. <jr...@us...> - 2008-01-17 15:20:31
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1855/wxLua/apps/build/bakefiles Modified Files: apps.bkl Log Message: Make wxLuaFreeze link to all the binding so it's complete Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** apps.bkl 17 Jan 2008 00:37:35 -0000 1.62 --- apps.bkl 17 Jan 2008 15:19:54 -0000 1.63 *************** *** 217,221 **** <wx-mac-app-bundle>wxLuaFreeze</wx-mac-app-bundle> ! <wxlua-allstdlibs/> <wx-alllibs-req-bywxlua/> </exe> --- 217,222 ---- <wx-mac-app-bundle>wxLuaFreeze</wx-mac-app-bundle> ! <wxlua-alllibs/> ! <wx-lib>stc</wx-lib> <wx-alllibs-req-bywxlua/> </exe> |
|
From: John L. <jr...@us...> - 2008-01-17 15:20:05
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1855/wxLua/apps/build/msvc6 Modified Files: apps_app_wxluafreeze.dsp Log Message: Make wxLuaFreeze link to all the binding so it's complete Index: apps_app_wxluafreeze.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluafreeze.dsp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** apps_app_wxluafreeze.dsp 17 Jan 2008 00:37:36 -0000 1.12 --- apps_app_wxluafreeze.dsp 17 Jan 2008 15:19:55 -0000 1.13 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_gl.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_gl.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release Unicode DLL Multilib" *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release Unicode Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release Unicode Monolithic" *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release Unicode Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_gl.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_gl.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release Unicode Multilib" *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release DLL Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release DLL Monolithic" *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release DLL Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_gl.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_gl.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release DLL Multilib" *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release Monolithic" *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_gl.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_gl.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Release Multilib" *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug Unicode DLL Monolithic" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug Unicode DLL Monolithic" *************** *** 266,271 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug Unicode DLL Multilib" --- 266,271 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_gl.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_gl.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug Unicode DLL Multilib" *************** *** 291,296 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug Unicode Monolithic" --- 291,296 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug Unicode Monolithic" *************** *** 316,321 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug Unicode Multilib" --- 316,321 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_gl.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_gl.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug Unicode Multilib" *************** *** 341,346 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug DLL Monolithic" --- 341,346 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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 /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug DLL Monolithic" *************** *** 366,371 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug DLL Multilib" --- 366,371 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug DLL Multilib" *************** *** 391,396 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug Monolithic" --- 391,396 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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 /machine:i386 /out:"..\..\..\bin\vc_dll\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluafreeze.pdb" !ELSEIF "$(CFG)" == "app_wxluafreeze - Win32 Debug Monolithic" *************** *** 416,421 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.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 oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluafreeze.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluafreeze.pdb" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.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... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-17 15:20:04
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1855/wxLua/apps/build/msvc8 Modified Files: apps_app_wxluafreeze.vcproj Log Message: Make wxLuaFreeze link to all the binding so it's complete Index: apps_app_wxluafreeze.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxluafreeze.vcproj,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** apps_app_wxluafreeze.vcproj 17 Jan 2008 00:37:36 -0000 1.12 --- apps_app_wxluafreeze.vcproj 17 Jan 2008 15:19:55 -0000 1.13 *************** *** 80,84 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" --- 80,84 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" *************** *** 173,177 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" --- 173,177 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" *************** *** 266,270 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" --- 266,270 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" *************** *** 359,363 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" --- 359,363 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_xrc.lib wxmsw28u_html.lib wxmsw28u_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" *************** *** 451,455 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" --- 451,455 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" *************** *** 543,547 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" --- 543,547 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" *************** *** 635,639 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" --- 635,639 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" *************** *** 727,731 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" --- 727,731 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_xrc.lib wxmsw28_html.lib wxmsw28_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" *************** *** 820,824 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" --- 820,824 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" *************** *** 914,918 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" --- 914,918 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" *************** *** 1008,1012 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" --- 1008,1012 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" *************** *** 1102,1106 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" --- 1102,1106 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_xrc.lib wxmsw28ud_html.lib wxmsw28ud_gl.lib wxmsw28ud_aui.lib wxmsw28ud_media.lib wxmsw28ud_adv.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxbase28ud.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" *************** *** 1195,1199 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" --- 1195,1199 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" *************** *** 1288,1292 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" --- 1288,1292 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" *************** *** 1381,1385 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" --- 1381,1385 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_gl.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" *************** *** 1474,1478 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" --- 1474,1478 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_xrc.lib wxmsw28d_html.lib wxmsw28d_gl.lib wxmsw28d_aui.lib wxmsw28d_media.lib wxmsw28d_adv.lib wxbase28d_net.lib wxbase28d_xml.lib wxmsw28d_core.lib wxbase28d.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" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" |
|
From: John L. <jr...@us...> - 2008-01-17 15:20:04
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1855/wxLua/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Make wxLuaFreeze link to all the binding so it's complete Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** makefile.vc 17 Jan 2008 00:37:36 -0000 1.78 --- makefile.vc 17 Jan 2008 15:19:56 -0000 1.79 *************** *** 630,634 **** ..\..\..\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) /pdb:"..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__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 --- 630,634 ---- ..\..\..\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) /pdb:"..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.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) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__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.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** makefile.bcc 17 Jan 2008 00:37:36 -0000 1.78 --- makefile.bcc 17 Jan 2008 15:19:56 -0000 1.79 *************** *** 667,671 **** ..\..\..\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_LIB_DIR) -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)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__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 --- 667,671 ---- ..\..\..\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_LIB_DIR) -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)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.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) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__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.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** makefile.wat 17 Jan 2008 00:37:37 -0000 1.79 --- makefile.wat 17 Jan 2008 15:19:56 -0000 1.80 *************** *** 818,822 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_LIB_DIR) 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)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__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 --- 818,822 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_LIB_DIR) 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)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.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) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__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.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** makefile.gcc 17 Jan 2008 00:37:36 -0000 1.78 --- makefile.gcc 17 Jan 2008 15:19:56 -0000 1.79 *************** *** 707,711 **** 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_LIB_DIR) -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl $(__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 --- 707,711 ---- 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_LIB_DIR) -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -llua5.1 -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl $(__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...> - 2008-01-17 15:20:04
|
Update of /cvsroot/wxlua/wxLua/apps/wxluafreeze/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1855/wxLua/apps/wxluafreeze/src Modified Files: wxluafreeze.cpp Log Message: Make wxLuaFreeze link to all the binding so it's complete Index: wxluafreeze.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluafreeze/src/wxluafreeze.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxluafreeze.cpp 15 Jan 2008 01:04:04 -0000 1.14 --- wxluafreeze.cpp 17 Jan 2008 15:19:57 -0000 1.15 *************** *** 42,58 **** #include "wxbind/include/wxbinddefs.h" ! WXLUA_DECLARE_BIND_WXLUA ! // WXLUA_DECLARE_BIND_WXLUASOCKET ! WXLUA_DECLARE_BIND_WXBASE ! WXLUA_DECLARE_BIND_WXCORE ! WXLUA_DECLARE_BIND_WXADV ! WXLUA_DECLARE_BIND_WXNET ! WXLUA_DECLARE_BIND_WXXML ! WXLUA_DECLARE_BIND_WXXRC ! WXLUA_DECLARE_BIND_WXHTML ! WXLUA_DECLARE_BIND_WXAUI ! WXLUA_DECLARE_BIND_WXMEDIA ! WXLUA_DECLARE_BIND_WXGL ! // WXLUA_DECLARE_BIND_WXSTC // unique identifier to return for missing script --- 42,46 ---- #include "wxbind/include/wxbinddefs.h" ! WXLUA_DECLARE_BIND_ALL // unique identifier to return for missing script *************** *** 119,134 **** //WXLUA_IMPLEMENT_BIND_ALL ! WXLUA_IMPLEMENT_BIND_WXLUA ! //WXLUA_IMPLEMENT_BIND_WXLUASOCKET ! WXLUA_IMPLEMENT_BIND_WXBASE ! WXLUA_IMPLEMENT_BIND_WXCORE ! WXLUA_IMPLEMENT_BIND_WXADV ! WXLUA_IMPLEMENT_BIND_WXNET ! WXLUA_IMPLEMENT_BIND_WXXML ! WXLUA_IMPLEMENT_BIND_WXXRC ! WXLUA_IMPLEMENT_BIND_WXHTML ! WXLUA_IMPLEMENT_BIND_WXAUI ! WXLUA_IMPLEMENT_BIND_WXMEDIA ! WXLUA_IMPLEMENT_BIND_WXGL //WXLUA_IMPLEMENT_BIND_WXSTC --- 107,122 ---- //WXLUA_IMPLEMENT_BIND_ALL ! WXLUA_IMPLEMENT_BIND_WXLUA ! //WXLUA_IMPLEMENT_BIND_WXLUASOCKET ! WXLUA_IMPLEMENT_BIND_WXBASE ! WXLUA_IMPLEMENT_BIND_WXCORE ! WXLUA_IMPLEMENT_BIND_WXADV ! WXLUA_IMPLEMENT_BIND_WXNET ! WXLUA_IMPLEMENT_BIND_WXXML ! WXLUA_IMPLEMENT_BIND_WXXRC ! WXLUA_IMPLEMENT_BIND_WXHTML ! WXLUA_IMPLEMENT_BIND_WXAUI ! WXLUA_IMPLEMENT_BIND_WXMEDIA ! WXLUA_IMPLEMENT_BIND_WXGL //WXLUA_IMPLEMENT_BIND_WXSTC |
|
From: John L. <jr...@us...> - 2008-01-17 05:32:11
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30597/samples Modified Files: bindings.wx.lua Log Message: Show what binding the classes are from when displaying them all Index: bindings.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/bindings.wx.lua,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** bindings.wx.lua 22 Dec 2007 06:07:17 -0000 1.19 --- bindings.wx.lua 17 Jan 2008 05:32:05 -0000 1.20 *************** *** 912,916 **** local t = { {"..", ["icon"] = list_images.folder}, ! ["col_labels"] = {"wxLua Class Name (1st line) / wxClassInfo Name (2nd line)"}, ["object_type"] = "All wxLua Classes" } --- 912,916 ---- local t = { {"..", ["icon"] = list_images.folder}, ! ["col_labels"] = {"Binding", "wxLua Class Name (1st line) / wxClassInfo Name (2nd line)"}, ["object_type"] = "All wxLua Classes" } *************** *** 966,973 **** -- this string is to force the wxLua classname and the wxClassInfo names -- to be together and the first char is to keep bindings together ! local a = string.format("%s%03d. ", string.char(string.byte('a')+b-1), i) local c = classTable[i] ! local c_table = {["color"] = wx.wxBLUE} -- check for mistakes in the bindings --- 966,973 ---- -- this string is to force the wxLua classname and the wxClassInfo names -- to be together and the first char is to keep bindings together ! local a = string.format("%s %03d", binding.GetBindingName, i) local c = classTable[i] ! local c_table = {a, ["color"] = wx.wxBLUE} -- check for mistakes in the bindings *************** *** 994,998 **** if c.classInfo then local ci = c.classInfo ! local c_table2 = {} while ci do --- 994,998 ---- if c.classInfo then local ci = c.classInfo ! local c_table2 = {a.."c"} while ci do *************** *** 1019,1028 **** end - t[#t][1] = a..t[#t][1] - c_table2[1] = a..c_table2[1] if max_cols < #c_table2 then max_cols = #c_table2 end table.insert(t, c_table2) - else - t[#t][1] = a..t[#t][1] end --- 1019,1024 ---- *************** *** 1031,1035 **** -- Set the col labels after counting them ! for i = 2, max_cols do t.col_labels[i] = "Base class "..tostring(i-1) end --- 1027,1031 ---- -- Set the col labels after counting them ! for i = 3, max_cols do t.col_labels[i] = "Base class "..tostring(i-1) end |
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10385/wxLua/modules/build/msvc8 Modified Files: modules_mod_luamodule.vcproj modules_mod_wxbindadv.vcproj modules_mod_wxbindaui.vcproj modules_mod_wxbindbase.vcproj modules_mod_wxbindcore.vcproj modules_mod_wxbindgl.vcproj modules_mod_wxbindhtml.vcproj modules_mod_wxbindmedia.vcproj modules_mod_wxbindnet.vcproj modules_mod_wxbindrichtext.vcproj modules_mod_wxbindstc.vcproj modules_mod_wxbindxml.vcproj modules_mod_wxbindxrc.vcproj modules_mod_wxlua.vcproj modules_mod_wxluadebug.vcproj modules_mod_wxluasocket.vcproj Log Message: For some reason this doesn't work <set var="DEF_wxLUA_USEBINDING_WXADV"> <if cond="USE_WXBINDADV='0'"> wxLUA_USEBINDING_WXADV=0 </if> </set> but this does. <define>wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV)</define> Change is in wxluabase.bkl. Index: modules_mod_wxbindgl.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindgl.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** modules_mod_wxbindgl.vcproj 16 Jan 2008 19:54:28 -0000 1.6 --- modules_mod_wxbindgl.vcproj 17 Jan 2008 00:37:38 -0000 1.7 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 76,80 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" /> <Tool --- 76,80 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDGL" /> <Tool *************** *** 145,149 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 145,149 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDGL" /> <Tool *************** *** 398,402 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 398,402 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 419,423 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" /> <Tool --- 419,423 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDGL" /> <Tool *************** *** 487,491 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 487,491 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 508,512 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" /> <Tool --- 508,512 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDGL" /> <Tool *************** *** 739,743 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 739,743 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 760,764 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool --- 760,764 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool *************** *** 830,834 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 830,834 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 851,855 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool --- 851,855 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool *************** *** 1084,1088 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1084,1088 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1105,1109 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool --- 1105,1109 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool *************** *** 1174,1178 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1174,1178 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1195,1199 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool --- 1195,1199 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool Index: modules_mod_wxbindnet.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindnet.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** modules_mod_wxbindnet.vcproj 16 Jan 2008 19:54:29 -0000 1.6 --- modules_mod_wxbindnet.vcproj 17 Jan 2008 00:37:38 -0000 1.7 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 76,80 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" /> <Tool --- 76,80 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDNET" /> <Tool *************** *** 145,149 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 145,149 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDNET" /> <Tool *************** *** 398,402 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 398,402 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 419,423 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" /> <Tool --- 419,423 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDNET" /> <Tool *************** *** 487,491 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 487,491 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 508,512 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" /> <Tool --- 508,512 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDNET" /> <Tool *************** *** 739,743 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 739,743 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 760,764 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool --- 760,764 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool *************** *** 830,834 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 830,834 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 851,855 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool --- 851,855 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool *************** *** 1084,1088 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1084,1088 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1105,1109 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool --- 1105,1109 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool *************** *** 1174,1178 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1174,1178 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1195,1199 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool --- 1195,1199 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool Index: modules_mod_wxluadebug.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxluadebug.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** modules_mod_wxluadebug.vcproj 16 Jan 2008 19:54:29 -0000 1.9 --- modules_mod_wxluadebug.vcproj 17 Jan 2008 00:37:38 -0000 1.10 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 76,80 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" /> <Tool --- 76,80 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" /> <Tool *************** *** 145,149 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 145,149 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" /> <Tool *************** *** 398,402 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 398,402 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 419,423 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" /> <Tool --- 419,423 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" /> <Tool *************** *** 487,491 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 487,491 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 508,512 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" /> <Tool --- 508,512 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" /> <Tool *************** *** 739,743 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 739,743 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 760,764 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool --- 760,764 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool *************** *** 830,834 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 830,834 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 851,855 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool --- 851,855 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool *************** *** 1084,1088 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1084,1088 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1105,1109 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool --- 1105,1109 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool *************** *** 1174,1178 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1174,1178 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1195,1199 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool --- 1195,1199 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool Index: modules_mod_wxbindrichtext.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindrichtext.vcproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** modules_mod_wxbindrichtext.vcproj 16 Jan 2008 19:54:29 -0000 1.6 --- modules_mod_wxbindrichtext.vcproj 17 Jan 2008 00:37:38 -0000 1.7 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 76,80 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool --- 76,80 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool *************** *** 145,149 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 145,149 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool *************** *** 398,402 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 398,402 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 419,423 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool --- 419,423 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool *************** *** 487,491 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 487,491 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 508,512 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool --- 508,512 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool *************** *** 739,743 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 739,743 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 760,764 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" /> <Tool --- 760,764 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" /> <Tool *************** *** 830,834 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 830,834 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 851,855 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" /> <Tool --- 851,855 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" /> <Tool *************** *** 1084,1088 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1084,1088 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1105,1109 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" /> <Tool --- 1105,1109 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" /> <Tool *************** *** 1174,1178 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1174,1178 ---- AdditionalOptions="" RuntimeLibrary="3" ! Pre... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-17 00:38:13
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10385/wxLua/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: For some reason this doesn't work <set var="DEF_wxLUA_USEBINDING_WXADV"> <if cond="USE_WXBINDADV='0'"> wxLUA_USEBINDING_WXADV=0 </if> </set> but this does. <define>wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV)</define> Change is in wxluabase.bkl. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** makefile.vc 16 Jan 2008 19:54:22 -0000 1.77 --- makefile.vc 17 Jan 2008 00:37:36 -0000 1.78 *************** *** 142,153 **** /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\lua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_CONSOLE \ ! $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj --- 142,147 ---- /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\lua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_CONSOLE $(CPPFLAGS) \ ! $(CFLAGS) APP_LUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj *************** *** 156,167 **** /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\luac.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_CONSOLE \ ! $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ --- 150,155 ---- /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\luac.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_CONSOLE $(CPPFLAGS) \ ! $(CFLAGS) APP_LUAC_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ *************** *** 172,182 **** $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_WINDOWS /GR \ ! /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ --- 160,176 ---- $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) \ ! /DwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) \ ! /DwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) \ ! /DwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) \ ! /DwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) \ ! /DwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) \ ! /DwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) \ ! /DwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) \ ! /DwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) \ ! /DwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) \ ! /DwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) \ ! /DwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) /D_WINDOWS /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ *************** *** 188,197 **** $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_WINDOWS \ /I$(WXSTEDIT_DIR)\include /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) \ $(CXXFLAGS) --- 182,197 ---- $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) \ ! /DwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) \ ! /DwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) \ ! /DwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) \ ! /DwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) \ ! /DwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) \ ! /DwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) \ ! /DwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) \ ! /DwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) \ ! /DwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) \ ! /DwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) \ ! /DwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) /D_WINDOWS \ /I$(WXSTEDIT_DIR)\include /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 205,214 **** $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluacan.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_WINDOWS \ /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ --- 205,220 ---- $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluacan.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) \ ! /DwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) \ ! /DwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) \ ! /DwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) \ ! /DwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) \ ! /DwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) \ ! /DwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) \ ! /DwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) \ ! /DwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) \ ! /DwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) \ ! /DwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) \ ! /DwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) /D_WINDOWS \ /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ *************** *** 224,234 **** $(____app_19) $(______app) \ /Fd..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb /I..\..\..\modules \ ! /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /DDEF_wxLUA_USEBINDING_WXADV \ ! /DDEF_wxLUA_USEBINDING_WXAUI /DDEF_wxLUA_USEBINDING_WXBASE \ ! /DDEF_wxLUA_USEBINDING_WXCORE /DDEF_wxLUA_USEBINDING_WXGL \ ! /DDEF_wxLUA_USEBINDING_WXHTML /DDEF_wxLUA_USEBINDING_WXMEDIA \ ! /DDEF_wxLUA_USEBINDING_WXNET /DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! /DDEF_wxLUA_USEBINDING_WXSTC /DDEF_wxLUA_USEBINDING_WXXML \ ! /DDEF_wxLUA_USEBINDING_WXXRC /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj \ --- 230,247 ---- $(____app_19) $(______app) \ /Fd..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb /I..\..\..\modules \ ! /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) \ ! /DwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) \ ! /DwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) \ ! /DwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) \ ! /DwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) \ ! /DwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) \ ! /DwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) \ ! /DwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) \ ! /DwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) \ ! /DwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) \ ! /DwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) \ ! /DwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) /D_WINDOWS /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj \ *************** *** 640,644 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d DEF_wxLUA_USEBINDING_WXADV /d DEF_wxLUA_USEBINDING_WXAUI /d DEF_wxLUA_USEBINDING_WXBASE /d DEF_wxLUA_USEBINDING_WXCORE /d DEF_wxLUA_USEBINDING_WXGL /d DEF_wxLUA_USEBINDING_WXHTML /d DEF_wxLUA_USEBINDING_WXMEDIA /d DEF_wxLUA_USEBINDING_WXNET /d DEF_wxLUA_USEBINDING_WXRICHTEXT /d DEF_wxLUA_USEBINDING_WXSTC /d DEF_wxLUA_USEBINDING_WXXML /d DEF_wxLUA_USEBINDING_WXXRC /d _WINDOWS ..\..\wxlua\src\wxlua.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 653,657 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) /d wxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) /d wxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) /d wxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) /d wxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) /d wxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) /d wxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) /d wxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) /d wxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) /d wxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) /d wxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) /d wxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) /d _WINDOWS ..\..\wxlua\src\wxlua.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 649,653 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d DEF_wxLUA_USEBINDING_WXADV /d DEF_wxLUA_USEBINDING_WXAUI /d DEF_wxLUA_USEBINDING_WXBASE /d DEF_wxLUA_USEBINDING_WXCORE /d DEF_wxLUA_USEBINDING_WXGL /d DEF_wxLUA_USEBINDING_WXHTML /d DEF_wxLUA_USEBINDING_WXMEDIA /d DEF_wxLUA_USEBINDING_WXNET /d DEF_wxLUA_USEBINDING_WXRICHTEXT /d DEF_wxLUA_USEBINDING_WXSTC /d DEF_wxLUA_USEBINDING_WXXML /d DEF_wxLUA_USEBINDING_WXXRC /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include ..\..\wxluaedit\src\wxluaedit.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp --- 662,666 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) /d wxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) /d wxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) /d wxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) /d wxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) /d wxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) /d wxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) /d wxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) /d wxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) /d wxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) /d wxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) /d wxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include ..\..\wxluaedit\src\wxluaedit.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp *************** *** 667,671 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d DEF_wxLUA_USEBINDING_WXADV /d DEF_wxLUA_USEBINDING_WXAUI /d DEF_wxLUA_USEBINDING_WXBASE /d DEF_wxLUA_USEBINDING_WXCORE /d DEF_wxLUA_USEBINDING_WXGL /d DEF_wxLUA_USEBINDING_WXHTML /d DEF_wxLUA_USEBINDING_WXMEDIA /d DEF_wxLUA_USEBINDING_WXNET /d DEF_wxLUA_USEBINDING_WXRICHTEXT /d DEF_wxLUA_USEBINDING_WXSTC /d DEF_wxLUA_USEBINDING_WXXML /d DEF_wxLUA_USEBINDING_WXXRC /d _WINDOWS /i ..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 680,684 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) /d wxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) /d wxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) /d wxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) /d wxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) /d wxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) /d wxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) /d wxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) /d wxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) /d wxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) /d wxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) /d wxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) /d _WINDOWS /i ..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 673,676 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d DEF_wxLUA_USEBINDING_WXADV /d DEF_wxLUA_USEBINDING_WXAUI /d DEF_wxLUA_USEBINDING_WXBASE /d DEF_wxLUA_USEBINDING_WXCORE /d DEF_wxLUA_USEBINDING_WXGL /d DEF_wxLUA_USEBINDING_WXHTML /d DEF_wxLUA_USEBINDING_WXMEDIA /d DEF_wxLUA_USEBINDING_WXNET /d DEF_wxLUA_USEBINDING_WXRICHTEXT /d DEF_wxLUA_USEBINDING_WXSTC /d DEF_wxLUA_USEBINDING_WXXML /d DEF_wxLUA_USEBINDING_WXXRC /d _WINDOWS ..\..\wxluafreeze\src\wxluafreeze.rc --- 686,689 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) /d wxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) /d wxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) /d wxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) /d wxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) /d wxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) /d wxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) /d wxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) /d wxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) /d wxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) /d wxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) /d wxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) /d _WINDOWS ..\..\wxluafreeze\src\wxluafreeze.rc Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** makefile.bcc 16 Jan 2008 19:54:21 -0000 1.77 --- makefile.bcc 17 Jan 2008 00:37:36 -0000 1.78 *************** *** 217,227 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj --- 217,221 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj *************** *** 230,240 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ --- 224,228 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ *************** *** 244,254 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ --- 232,247 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) \ ! -DwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) \ ! -DwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) \ ! -DwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) \ ! -DwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) \ ! -DwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) \ ! -DwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) \ ! -DwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) \ ! -DwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) \ ! -DwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) \ ! -DwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) \ ! -DwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ *************** *** 258,268 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WXSTEDIT_DIR)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ --- 251,266 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) \ ! -DwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) \ ! -DwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) \ ! -DwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) \ ! -DwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) \ ! -DwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) \ ! -DwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) \ ! -DwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) \ ! -DwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) \ ! -DwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) \ ! -DwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) \ ! -DwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) -I$(WXSTEDIT_DIR)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ *************** *** 273,284 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ --- 271,287 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) \ ! -DwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) \ ! -DwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) \ ! -DwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) \ ! -DwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) \ ! -DwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) \ ! -DwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) \ ! -DwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) \ ! -DwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) \ ! -DwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) \ ! -DwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) \ ! -DwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) -I..\..\..\modules\wxbind\setup \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ *************** *** 291,301 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj --- 294,309 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) \ ! -DwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) \ ! -DwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) \ ! -DwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) \ ! -DwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) \ ! -DwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) \ ! -DwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) \ ! -DwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) \ ! -DwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) \ ! -DwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) \ ! -DwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) \ ! -DwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj *************** *** 682,686 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC ..\..\wxlua\src\wxlua.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 690,694 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) -dwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) -dwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) -dwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) -dwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) -dwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) -dwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) -dwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) -dwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) -dwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) -dwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) -dwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) ..\..\wxlua\src\wxlua.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 691,695 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include ..\..\wxluaedit\src\wxluaedit.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp --- 699,703 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) -dwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) -dwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) -dwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) -dwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) -dwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) -dwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) -dwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) -dwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) -dwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) -dwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) -dwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include ..\..\wxluaedit\src\wxluaedit.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp *************** *** 709,713 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC -i..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 717,721 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) -dwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) -dwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) -dwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) -dwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) -dwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) -dwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) -dwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) -dwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) -dwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) -dwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) -dwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) -i..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 715,718 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC ..\..\wxluafreeze\src\wxluafreeze.rc --- 723,726 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) -dwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) -dwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) -dwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) -dwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) -dwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) -dwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) -dwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) -dwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) -dwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) -dwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) -dwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) ..\..\wxluafreeze\src\wxluafreeze.rc Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** makefile.wat 16 Jan 2008 19:54:22 -0000 1.78 --- makefile.wat 17 Jan 2008 00:37:37 -0000 1.79 *************** *** 585,595 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) & $(CFLAGS) APP_LUA_OBJECTS = & --- 585,589 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $(CPPFLAGS) & $(CFLAGS) APP_LUA_OBJECTS = & *************** *** 599,609 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) & $(CFLAGS) APP_LUAC_OBJECTS = & --- 593,597 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $(CPPFLAGS) & $(CFLAGS) APP_LUAC_OBJECTS = & *************** *** 615,625 **** $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) & ! $(CXXFLAGS) APP_WXLUA_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj & --- 603,618 ---- $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) & ! -dwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) & ! -dwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) & ! -dwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) & ! -dwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) & ! -dwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) & ! -dwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) & ! -dwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) & ! -dwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) & ! -dwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) & ! -dwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) & ! -dwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj & *************** *** 630,641 **** $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC & ! -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $(CPPFLAGS) & ! $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj & --- 623,639 ---- $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) & ! -dwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) & ! -dwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) & ! -dwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) & ! -dwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) & ! -dwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) & ! -dwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) & ! -dwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) & ! -dwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) & ! -dwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) & ! -dwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) & ! -dwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) -i=$(WXSTEDIT_DIR)\include & ! -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj & *************** *** 646,655 **** $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC & -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & --- 644,659 ---- $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) & ! -dwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) & ! -dwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) & ! -dwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) & ! -dwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) & ! -dwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) & ! -dwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) & ! -dwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) & ! -dwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) & ! -dwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) & ! -dwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) & ! -dwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) & -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & *************** *** 664,674 **** $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) & ! $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj --- 668,683 ---- $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) & ! -dwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) & ! -dwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) & ! -dwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) & ! -dwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) & ! -dwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) & ! -dwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) & ! -dwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) & ! -dwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) & ! -dwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) & ! -dwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) & ! -dwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj *************** *** 834,838 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj : .AUTODEPEND ..\..\wxluaedit\src\wxledit.cpp --- 843,847 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) -dwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) -dwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) -dwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) -dwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) -dwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) -dwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) -dwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) -dwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) -dwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) -dwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) -dwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj : .AUTODEPEND ..\..\wxluaedit\src\wxledit.cpp *************** *** 843,847 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res : .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp --- 852,856 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res : .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) -dwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) -dwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) -dwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) -dwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) -dwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) -dwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) -dwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) -dwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) -dwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) -dwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) -dwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp *************** *** 861,865 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res : .AUTODEPEND ..\..\wxluacan\src\cansim.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC -i=..\..\..\modules\wxbind\setup $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.cpp --- 870,874 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res : .AUTODEPEND ..\..\wxluacan\src\cansim.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) -dwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) -dwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) -dwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) -dwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) -dwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) -dwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) -dwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) -dwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) -dwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) -dwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) -dwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) -i=..\..\..\modules\wxbind\setup $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 867,870 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $< --- 876,879 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) -dwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) -dwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) -dwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) -dwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) -dwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) -dwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) -dwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) -dwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) -dwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) -dwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) -dwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** makefile.gcc 16 Jan 2008 19:54:21 -0000 1.77 --- makefile.gcc 17 Jan 2008 00:37:36 -0000 1.78 *************** *** 131,141 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.o --- 131,135 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.o *************** *** 144,154 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.o \ --- 138,142 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.o \ *************** *** 158,168 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \ --- 146,161 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) \ ! -DwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) \ ! -DwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) \ ! -DwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) \ ! -DwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) \ ! -DwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) \ ! -DwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) \ ! -DwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) \ ! -DwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) \ ! -DwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) \ ! -DwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) \ ! -DwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \ *************** *** 173,183 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WXSTEDIT_DIR)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ --- 166,181 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) \ ! -DwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) \ ! -DwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) \ ! -DwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) \ ! -DwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) \ ! -DwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) \ ! -DwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) \ ! -DwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) \ ! -DwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) \ ! -DwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) \ ! -DwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) \ ! -DwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) -I$(WXSTEDIT_DIR)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ *************** *** 189,200 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o \ --- 187,203 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) \ ! -DwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) \ ! -DwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) \ ! -DwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) \ ! -DwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) \ ! -DwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) \ ! -DwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) \ ! -DwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) \ ! -DwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) \ ! -DwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) \ ! -DwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) \ ! -DwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) -I..\..\..\modules\wxbind\setup \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o \ *************** *** 208,218 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o \ --- 211,226 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DwxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) \ ! -DwxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) \ ! -DwxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) \ ! -DwxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) \ ! -DwxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) \ ! -DwxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) \ ! -DwxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) \ ! -DwxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) \ ! -DwxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) \ ! -DwxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) \ ! -DwxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) \ ! -DwxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o \ *************** *** 721,725 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --define DEF_wxLUA_USEBINDING_WXADV --define DEF_wxLUA_USEBINDING_WXAUI --define DEF_wxLUA_USEBINDING_WXBASE --define DEF_wxLUA_USEBINDING_WXCORE --define DEF_wxLUA_USEBINDING_WXGL --define DEF_wxLUA_USEBINDING_WXHTML --define DEF_wxLUA_USEBINDING_WXMEDIA --define DEF_wxLUA_USEBINDING_WXNET --define DEF_wxLUA_USEBINDING_WXRICHTEXT --define DEF_wxLUA_USEBINDING_WXSTC --define DEF_wxLUA_USEBINDING_WXXML --define DEF_wxLUA_USEBINDING_WXXRC gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp --- 729,733 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --define wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV) --define wxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI) --define wxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE) --define wxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE) --define wxLUA_USEBINDING_WXGL=$(USE_WXBINDGL) --define wxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML) --define wxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA) --define wxLUA_USEBINDING_WXNET=$(USE_WXBINDNET) --define wxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT) --define wxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC) --define wxLUA_USEBINDING_WXXML=$(USE_WXBINDXML) --define wxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp *************** *** 730,734 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-di... [truncated message content] |
Update of /cvsroot/wxlua/wxLua/apps/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10385/wxLua/apps/build/msvc6 Modified Files: apps_app_lua.dsp apps_app_luac.dsp apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp Log Message: For some reason this doesn't work <set var="DEF_wxLUA_USEBINDING_WXADV"> <if cond="USE_WXBINDADV='0'"> wxLUA_USEBINDING_WXADV=0 </if> </set> but this does. <define>wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV)</define> Change is in wxluabase.bkl. Index: apps_app_luac.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_luac.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** apps_app_luac.dsp 16 Jan 2008 19:54:18 -0000 1.4 --- apps_app_luac.dsp 17 Jan 2008 00:37:36 -0000 1.5 *************** *** 47,54 **** # PROP Intermediate_Dir "vcmswu\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 47,54 ---- # PROP Intermediate_Dir "vcmswu\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 70,77 **** # PROP Intermediate_Dir "vcmswu\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 70,77 ---- # PROP Intermediate_Dir "vcmswu\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 93,100 **** # PROP Intermediate_Dir "vcmsw\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 93,100 ---- # PROP Intermediate_Dir "vcmsw\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 116,123 **** # PROP Intermediate_Dir "vcmsw\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 116,123 ---- # PROP Intermediate_Dir "vcmsw\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 139,146 **** # PROP Intermediate_Dir "vcmswud\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 139,146 ---- # PROP Intermediate_Dir "vcmswud\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 162,169 **** # PROP Intermediate_Dir "vcmswud\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 162,169 ---- # PROP Intermediate_Dir "vcmswud\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 185,192 **** # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 185,192 ---- # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 208,215 **** # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 208,215 ---- # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo Index: apps_app_lua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_lua.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** apps_app_lua.dsp 16 Jan 2008 19:54:18 -0000 1.7 --- apps_app_lua.dsp 17 Jan 2008 00:37:36 -0000 1.8 *************** *** 55,62 **** # PROP Intermediate_Dir "vcmswu_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 55,62 ---- # PROP Intermediate_Dir "vcmswu_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 78,85 **** # PROP Intermediate_Dir "vcmswu_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 78,85 ---- # PROP Intermediate_Dir "vcmswu_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 101,108 **** # PROP Intermediate_Dir "vcmswu\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 101,108 ---- # PROP Intermediate_Dir "vcmswu\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 124,131 **** # PROP Intermediate_Dir "vcmswu\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 124,131 ---- # PROP Intermediate_Dir "vcmswu\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 147,154 **** # PROP Intermediate_Dir "vcmsw_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 147,154 ---- # PROP Intermediate_Dir "vcmsw_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 170,177 **** # PROP Intermediate_Dir "vcmsw_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 170,177 ---- # PROP Intermediate_Dir "vcmsw_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 193,200 **** # PROP Intermediate_Dir "vcmsw\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 193,200 ---- # PROP Intermediate_Dir "vcmsw\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 216,223 **** # PROP Intermediate_Dir "vcmsw\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 216,223 ---- # PROP Intermediate_Dir "vcmsw\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 239,246 **** # PROP Intermediate_Dir "vcmswud_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-17 00:38:13
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10385/wxLua/build/bakefiles Modified Files: wxluabase.bkl Log Message: For some reason this doesn't work <set var="DEF_wxLUA_USEBINDING_WXADV"> <if cond="USE_WXBINDADV='0'"> wxLUA_USEBINDING_WXADV=0 </if> </set> but this does. <define>wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV)</define> Change is in wxluabase.bkl. Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** wxluabase.bkl 16 Jan 2008 19:54:25 -0000 1.47 --- wxluabase.bkl 17 Jan 2008 00:37:37 -0000 1.48 *************** *** 100,131 **** <!-- ================================================================== --> - <!-- Variables for defining wxLUA_USEBINDING_WXXXX=0 when the --> - <!-- makefile's USE_BINDINGWXXXX=0 (must be after options.bkl) --> - <!-- ================================================================== --> - - <define-global-tag name="define-usewxbind-def"> - <set var="DEF_wxLUA_USEBINDING_WX$(value.upper())"> - <if cond="USE_WXBIND$(value.upper())=='0'"> - wxLUA_USEBINDING_WX$(value.upper())=0 - </if> - </set> - </define-global-tag> - - <define-usewxbind-def>adv</define-usewxbind-def> - <define-usewxbind-def>aui</define-usewxbind-def> - <define-usewxbind-def>base</define-usewxbind-def> - <define-usewxbind-def>core</define-usewxbind-def> - <define-usewxbind-def>gl</define-usewxbind-def> - <define-usewxbind-def>html</define-usewxbind-def> - <define-usewxbind-def>media</define-usewxbind-def> - <define-usewxbind-def>net</define-usewxbind-def> - <define-usewxbind-def>richtext</define-usewxbind-def> - <define-usewxbind-def>stc</define-usewxbind-def> - <define-usewxbind-def>xml</define-usewxbind-def> - <define-usewxbind-def>xrc</define-usewxbind-def> - - - - <!-- ================================================================== --> <!-- TEMPLATES --> <!-- ================================================================== --> --- 100,103 ---- *************** *** 283,299 **** $(WXLUA_BASEDIR)/lib/$(COMPILER)_$(_DIRNAME_SHARED_SUFFIX) </set> - - <define>DEF_wxLUA_USEBINDING_WXADV</define> - <define>DEF_wxLUA_USEBINDING_WXAUI</define> - <define>DEF_wxLUA_USEBINDING_WXBASE</define> - <define>DEF_wxLUA_USEBINDING_WXCORE</define> - <define>DEF_wxLUA_USEBINDING_WXGL</define> - <define>DEF_wxLUA_USEBINDING_WXHTML</define> - <define>DEF_wxLUA_USEBINDING_WXMEDIA</define> - <define>DEF_wxLUA_USEBINDING_WXNET</define> - <define>DEF_wxLUA_USEBINDING_WXRICHTEXT</define> - <define>DEF_wxLUA_USEBINDING_WXSTC</define> - <define>DEF_wxLUA_USEBINDING_WXXML</define> - <define>DEF_wxLUA_USEBINDING_WXXRC</define> </if> <if cond="FORMAT=='autoconf'"> --- 255,258 ---- *************** *** 312,316 **** --- 271,295 ---- </template> + <!-- a template for wxLua-based exe/dll targets --> + <template id="wxlua_with_bindings" template="wxlua"> + + <if cond="FORMAT!='autoconf'"> + + <define>wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV)</define> + <define>wxLUA_USEBINDING_WXAUI=$(USE_WXBINDAUI)</define> + <define>wxLUA_USEBINDING_WXBASE=$(USE_WXBINDBASE)</define> + <define>wxLUA_USEBINDING_WXCORE=$(USE_WXBINDCORE)</define> + <define>wxLUA_USEBINDING_WXGL=$(USE_WXBINDGL)</define> + <define>wxLUA_USEBINDING_WXHTML=$(USE_WXBINDHTML)</define> + <define>wxLUA_USEBINDING_WXMEDIA=$(USE_WXBINDMEDIA)</define> + <define>wxLUA_USEBINDING_WXNET=$(USE_WXBINDNET)</define> + <define>wxLUA_USEBINDING_WXRICHTEXT=$(USE_WXBINDRICHTEXT)</define> + <define>wxLUA_USEBINDING_WXSTC=$(USE_WXBINDSTC)</define> + <define>wxLUA_USEBINDING_WXXML=$(USE_WXBINDXML)</define> + <define>wxLUA_USEBINDING_WXXRC=$(USE_WXBINDXRC)</define> + </if> + + </template> <!-- ================================================================== --> |
|
From: John L. <jr...@us...> - 2008-01-17 00:38:12
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10385/wxLua/build/autoconf Modified Files: autoconf_inc.m4 Log Message: For some reason this doesn't work <set var="DEF_wxLUA_USEBINDING_WXADV"> <if cond="USE_WXBINDADV='0'"> wxLUA_USEBINDING_WXADV=0 </if> </set> but this does. <define>wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV)</define> Change is in wxluabase.bkl. Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** autoconf_inc.m4 16 Jan 2008 19:54:22 -0000 1.30 --- autoconf_inc.m4 17 Jan 2008 00:37:37 -0000 1.31 *************** *** 351,414 **** fi AC_SUBST(COND_USE_SYSTEM_LUA_0) - dnl ### begin block 20_COND_USE_WXBINDADV_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### - COND_USE_WXBINDADV_0="#" - if test "x$USE_WXBINDADV" = "x0" ; then - COND_USE_WXBINDADV_0="" - fi - AC_SUBST(COND_USE_WXBINDADV_0) - dnl ### begin block 20_COND_USE_WXBINDAUI_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### - COND_USE_WXBINDAUI_0="#" - if test "x$USE_WXBINDAUI" = "x0" ; then - COND_USE_WXBINDAUI_0="" - fi - AC_SUBST(COND_USE_WXBINDAUI_0) - dnl ### begin block 20_COND_USE_WXBINDBASE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### - COND_USE_WXBINDBASE_0="#" - if test "x$USE_WXBINDBASE" = "x0" ; then - COND_USE_WXBINDBASE_0="" - fi - AC_SUBST(COND_USE_WXBINDBASE_0) - dnl ### begin block 20_COND_USE_WXBINDCORE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### - COND_USE_WXBINDCORE_0="#" - if test "x$USE_WXBINDCORE" = "x0" ; then - COND_USE_WXBINDCORE_0="" - fi - AC_SUBST(COND_USE_WXBINDCORE_0) - dnl ### begin block 20_COND_USE_WXBINDGL_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### - COND_USE_WXBINDGL_0="#" - if test "x$USE_WXBINDGL" = "x0" ; then - COND_USE_WXBINDGL_0="" - fi - AC_SUBST(COND_USE_WXBINDGL_0) - dnl ### begin block 20_COND_USE_WXBINDHTML_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### - COND_USE_WXBINDHTML_0="#" - if test "x$USE_WXBINDHTML" = "x0" ; then - COND_USE_WXBINDHTML_0="" - fi - AC_SUBST(COND_USE_WXBINDHTML_0) - dnl ### begin block 20_COND_USE_WXBINDMEDIA_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### - COND_USE_WXBINDMEDIA_0="#" - if test "x$USE_WXBINDMEDIA" = "x0" ; then - COND_USE_WXBINDMEDIA_0="" - fi - AC_SUBST(COND_USE_WXBINDMEDIA_0) - dnl ### begin block 20_COND_USE_WXBINDNET_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### - COND_USE_WXBINDNET_0="#" - if test "x$USE_WXBINDNET" = "x0" ; then - COND_USE_WXBINDNET_0="" - fi - AC_SUBST(COND_USE_WXBINDNET_0) - dnl ### begin block 20_COND_USE_WXBINDRICHTEXT_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### - COND_USE_WXBINDRICHTEXT_0="#" - if test "x$USE_WXBINDRICHTEXT" = "x0" ; then - COND_USE_WXBINDRICHTEXT_0="" - fi - AC_SUBST(COND_USE_WXBINDRICHTEXT_0) - dnl ### begin block 20_COND_USE_WXBINDSTC_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### - COND_USE_WXBINDSTC_0="#" - if test "x$USE_WXBINDSTC" = "x0" ; then - COND_USE_WXBINDSTC_0="" - fi - AC_SUBST(COND_USE_WXBINDSTC_0) dnl ### begin block 20_COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1[../../apps/build/bakefiles/apps.bkl] ### COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1="#" --- 351,354 ---- *************** *** 423,438 **** fi AC_SUBST(COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1) - dnl ### begin block 20_COND_USE_WXBINDXML_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### - COND_USE_WXBINDXML_0="#" - if test "x$USE_WXBINDXML" = "x0" ; then - COND_USE_WXBINDXML_0="" - fi - AC_SUBST(COND_USE_WXBINDXML_0) - dnl ### begin block 20_COND_USE_WXBINDXRC_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### - COND_USE_WXBINDXRC_0="#" - if test "x$USE_WXBINDXRC" = "x0" ; then - COND_USE_WXBINDXRC_0="" - fi - AC_SUBST(COND_USE_WXBINDXRC_0) dnl ### begin block 20_COND_USE_WXLUACANAPP_1[../../apps/build/bakefiles/apps.bkl] ### COND_USE_WXLUACANAPP_1="#" --- 363,366 ---- |
Update of /cvsroot/wxlua/wxLua/apps/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10385/wxLua/apps/build/msvc8 Modified Files: apps_app_lua.vcproj apps_app_luac.vcproj apps_app_wxlua.vcproj apps_app_wxluacan.vcproj apps_app_wxluaedit.vcproj apps_app_wxluafreeze.vcproj Log Message: For some reason this doesn't work <set var="DEF_wxLUA_USEBINDING_WXADV"> <if cond="USE_WXBINDADV='0'"> wxLUA_USEBINDING_WXADV=0 </if> </set> but this does. <define>wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV)</define> Change is in wxluabase.bkl. Index: apps_app_luac.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_luac.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** apps_app_luac.vcproj 16 Jan 2008 19:54:20 -0000 1.4 --- apps_app_luac.vcproj 17 Jan 2008 00:37:36 -0000 1.5 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 73,77 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" /> <Tool --- 73,77 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" /> <Tool *************** *** 148,152 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 148,152 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" /> <Tool *************** *** 240,244 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 240,244 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 258,262 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" /> <Tool --- 258,262 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;_CONSOLE" /> <Tool *************** *** 332,336 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 332,336 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 350,354 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" /> <Tool --- 350,354 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;_CONSOLE" /> <Tool *************** *** 425,429 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 425,429 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 443,447 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" /> <Tool --- 443,447 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" /> <Tool *************** *** 519,523 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 519,523 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 537,541 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" /> <Tool --- 537,541 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" /> <Tool *************** *** 612,616 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 612,616 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 630,634 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" /> <Tool --- 630,634 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" /> <Tool *************** *** 705,709 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 705,709 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 723,727 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" /> <Tool --- 723,727 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" /> <Tool Index: apps_app_wxluacan.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxluacan.vcproj,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** apps_app_wxluacan.vcproj 16 Jan 2008 19:54:20 -0000 1.11 --- apps_app_wxluacan.vcproj 17 Jan 2008 00:37:36 -0000 1.12 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 73,77 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool --- 73,77 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" /> <Tool *************** *** 148,152 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 148,152 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" /> <Tool *************** *** 241,245 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 241,245 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 259,263 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool --- 259,263 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" /> <Tool *************** *** 334,338 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 334,338 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 352,356 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool --- 352,356 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" /> <Tool *************** *** 426,430 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 426,430 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 444,448 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool --- 444,448 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" /> <Tool *************** *** 518,522 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 518,522 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 536,540 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool --- 536,540 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" /> <Tool *************** *** 610,614 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 610,614 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 628,632 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool --- 628,632 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" /> <Tool *************** *** 702,706 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 702,706 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 720,724 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool --- 720,724 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" /> <Tool *************** *** 795,799 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 795,799 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 813,817 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool --- 813,817 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" /> <Tool *************** *** 889,893 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 889,893 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 907,911 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool --- 907,911 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" /> <Tool *************** *** 983,987 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 983,987 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1001,1005 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool --- 1001,1005 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" /> <Tool *************** *** 1077,1081 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1077,1081 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1095,1099 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool --- 1095,1099 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" /> <Tool *************** *** 1170,1174 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1170,1174 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1188,1192 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool --- 1188,1192 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" /> <Tool *************** *** 1263,1267 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1263,1267 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1281,1285 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool --- 1281,1285 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" /> <Tool *************** *** 1356,1360 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1356,1360 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1374,1378 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool --- 1374,1378 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" /> <Tool *************** *** 1449,1453 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1449,1453 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1467,1471 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool --- 1467,1471 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS;_DEBUG" /> <Tool Index: apps_app_wxlua.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxlua.vcproj,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** apps_app_wxlua.vcproj 16 Jan 2008 19:54:20 -0000 1.11 --- apps_app_wxlua.vcproj 17 Jan 2008 00:37:36 -0000 1.12 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 73,77 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool --- 73,77 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" /> <Tool *************** *** 148,152 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 148,152 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" /> <Tool *************** *** 241,245 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 241,245 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 259,263 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool --- 259,263 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" /> <Tool *************** *** 334,338 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 334,338 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 352,356 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool --- 352,356 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;wxLUA_USEBINDING_WXADV=1;wxLUA_USEBINDING_WXAUI=1;wxLUA_USEBINDING_WXBASE=1;wxLUA_USEBINDING_WXCORE=1;wxLUA_USEBINDING_WXGL=1;wxLUA_USEBINDING_WXHTML=1;wxLUA_USEBINDING_WXMEDIA=1;wxLUA_USEBINDING_WXNET=1;wxLUA_USEBINDING_WXRICHTEXT=1;wxLUA_USEBINDING_WXSTC=1;wxLUA_USEBINDING_WXXML=1;wxLUA_USEBINDING_WXXRC=1;_WINDOWS" /> <Tool *************** *** 426,430 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-17 00:38:09
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10385/wxLua/apps/build/bakefiles Modified Files: apps.bkl Log Message: For some reason this doesn't work <set var="DEF_wxLUA_USEBINDING_WXADV"> <if cond="USE_WXBINDADV='0'"> wxLUA_USEBINDING_WXADV=0 </if> </set> but this does. <define>wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV)</define> Change is in wxluabase.bkl. Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** apps.bkl 16 Jan 2008 19:54:17 -0000 1.61 --- apps.bkl 17 Jan 2008 00:37:35 -0000 1.62 *************** *** 50,54 **** <!-- a small template which avoid repeating the same tags for all wxLua apps --> ! <template id="wxluaapp" template="wxlua"> <app-type>gui</app-type> <install-to>$(BINDIR)</install-to> --- 50,54 ---- <!-- a small template which avoid repeating the same tags for all wxLua apps --> ! <template id="wxluaapp" template="wxlua_with_bindings"> <app-type>gui</app-type> <install-to>$(BINDIR)</install-to> |
|
From: John L. <jr...@us...> - 2008-01-17 00:37:46
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10385/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: For some reason this doesn't work <set var="DEF_wxLUA_USEBINDING_WXADV"> <if cond="USE_WXBINDADV='0'"> wxLUA_USEBINDING_WXADV=0 </if> </set> but this does. <define>wxLUA_USEBINDING_WXADV=$(USE_WXBINDADV)</define> Change is in wxluabase.bkl. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** makefile.vc 16 Jan 2008 19:54:31 -0000 1.79 --- makefile.vc 17 Jan 2008 00:37:39 -0000 1.80 *************** *** 82,91 **** USE_WXBINDAUI = 1 - # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] - USE_WXBINDBASE = 1 - - # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] - USE_WXBINDCORE = 1 - # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] USE_WXBINDGL = 1 --- 82,85 ---- *************** *** 218,227 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXLUA /GR /EHsc /Yu"wx/wxprec.h" \ /Fp"vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_dll.pch" \ --- 212,215 ---- *************** *** 256,265 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDADV /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 244,247 ---- *************** *** 292,301 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDAUI /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 274,277 ---- *************** *** 331,340 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDBASE /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 307,310 ---- *************** *** 387,396 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDCORE /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 357,360 ---- *************** *** 439,448 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDGL /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 403,406 ---- *************** *** 475,484 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDHTML /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 433,436 ---- *************** *** 511,520 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDMEDIA /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 463,466 ---- *************** *** 546,555 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDNET /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 492,495 ---- *************** *** 581,590 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindrichtext.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDRICHTEXT /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 521,524 ---- *************** *** 616,625 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDSTC /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 550,553 ---- *************** *** 651,660 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDXML /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 579,582 ---- *************** *** 686,695 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDXRC /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 608,611 ---- *************** *** 721,730 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXLUADEBUG /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 637,640 ---- *************** *** 759,768 **** /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXLUASOCKET /GR /EHsc \ /Yu"wx/wxprec.h" \ --- 669,672 ---- *************** *** 781,790 **** $(VAR_196) $(VAR_198) /Fd..\..\..\lib\vc_$(VAR_202)\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ - /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ - /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ - /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ - /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ - /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ - /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /DWXMAKINGDLL_LUAMODULE /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ --- 685,688 ---- Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** makefile.bcc 16 Jan 2008 19:54:29 -0000 1.80 --- makefile.bcc 17 Jan 2008 00:37:38 -0000 1.81 *************** *** 125,138 **** !endif - # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] - !ifndef USE_WXBINDBASE - USE_WXBINDBASE = 1 - !endif - - # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] - !ifndef USE_WXBINDCORE - USE_WXBINDCORE = 1 - !endif - # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] !ifndef USE_WXBINDGL --- 125,128 ---- *************** *** 281,292 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 271,275 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 316,327 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDADV \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindadv_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 299,303 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDADV \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindadv_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 348,359 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDAUI \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindaui_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 324,328 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDAUI \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindaui_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 383,394 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDBASE \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindbase_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 352,356 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDBASE \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindbase_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 435,446 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDCORE \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindcore_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 397,401 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDCORE \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindcore_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 483,494 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDGL \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindgl_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 438,442 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDGL \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindgl_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 515,526 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDHTML \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindhtml_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 463,467 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDHTML \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindhtml_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 547,558 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDMEDIA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindmedia_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 488,492 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDMEDIA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindmedia_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 578,589 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDNET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindnet_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 512,516 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDNET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindnet_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 609,619 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ -DWXMAKINGDLL_WXBINDRICHTEXT \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindrichtext_dll.csm \ --- 536,540 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include \ -DWXMAKINGDLL_WXBINDRICHTEXT \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindrichtext_dll.csm \ *************** *** 640,651 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDSTC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindstc_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 561,565 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindstc_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 671,682 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDXML \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindxml_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 585,589 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDXML \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindxml_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 702,713 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDXRC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindxrc_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 609,613 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDXRC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindxrc_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 733,744 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUADEBUG \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluadebug_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 633,637 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluadebug_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 767,778 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUASOCKET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluasocket_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 660,664 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluasocket_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 788,799 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) \ ! $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_luamodule.obj --- 674,678 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_luamodule.obj Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** makefile.wat 16 Jan 2008 19:54:32 -0000 1.79 --- makefile.wat 17 Jan 2008 00:37:41 -0000 1.80 *************** *** 82,91 **** USE_WXBINDAUI = 1 - # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] - USE_WXBINDBASE = 1 - - # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] - USE_WXBINDCORE = 1 - # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] USE_WXBINDGL = 1 --- 82,85 ---- *************** *** 864,874 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUA /fh $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & --- 858,862 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUA /fh $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & *************** *** 894,904 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDADV /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDADV_DLL_OBJECTS = & --- 882,886 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDADV /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDADV_DLL_OBJECTS = & *************** *** 921,931 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDAUI /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDAUI_DLL_OBJECTS = & --- 903,907 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDAUI /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDAUI_DLL_OBJECTS = & *************** *** 951,961 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDBASE /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDBASE_DLL_OBJECTS = & --- 927,931 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDBASE /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDBASE_DLL_OBJECTS = & *************** *** 998,1008 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDCORE /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDCORE_DLL_OBJECTS = & --- 968,972 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDCORE /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDCORE_DLL_OBJECTS = & *************** *** 1041,1051 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDGL /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDGL_DLL_OBJECTS = & --- 1005,1009 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDGL /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDGL_DLL_OBJECTS = & *************** *** 1068,1078 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDHTML /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDHTML_DLL_OBJECTS = & --- 1026,1030 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDHTML /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDHTML_DLL_OBJECTS = & *************** *** 1095,1105 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDMEDIA /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDMEDIA_DLL_OBJECTS = & --- 1047,1051 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDMEDIA /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDMEDIA_DLL_OBJECTS = & *************** *** 1121,1131 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDNET /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDNET_DLL_OBJECTS = & --- 1067,1071 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDNET /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDNET_DLL_OBJECTS = & *************** *** 1147,1157 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDRICHTEXT /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDRICHTEXT_DLL_OBJECTS = & --- 1087,1091 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDRICHTEXT /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDRICHTEXT_DLL_OBJECTS = & *************** *** 1173,1183 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDSTC /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = & --- 1107,1111 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDSTC /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = & *************** *** 1199,1209 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDXML /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDXML_DLL_OBJECTS = & --- 1127,1131 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDXML /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDXML_DLL_OBJECTS = & *************** *** 1225,1235 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDXRC /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDXRC_DLL_OBJECTS = & --- 1147,1151 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDXRC /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDXRC_DLL_OBJECTS = & *************** *** 1251,1261 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUADEBUG /fh $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = & --- 1167,1171 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUADEBUG /fh $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = & *************** *** 1280,1290 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUASOCKET /fh $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = & --- 1190,1194 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUASOCKET /fh $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = & *************** *** 1299,1309 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -dWXMAKINGDLL_LUAMODULE $(CPPFLAGS) & $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = & --- 1203,1207 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dWXMAKINGDLL_LUAMODULE $(CPPFLAGS) & $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** makefile.gcc 16 Jan 2008 19:54:31 -0000 1.79 --- makefile.gcc 17 Jan 2008 00:37:39 -0000 1.80 *************** *** 76,85 **** USE_WXBINDAUI := 1 - # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] - USE_WXBINDBASE := 1 - - # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] - USE_WXBINDCORE := 1 - # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] USE_WXBINDGL := 1 --- 76,79 ---- *************** *** 202,213 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.o \ --- 196,201 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.o \ *************** *** 231,242 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDADV $(CPPFLAGS) $(CXXFLAGS) WXBINDADV_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindadv_dll_wxadv_adv.o \ --- 219,224 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDADV \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDADV_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindadv_dll_wxadv_adv.o \ *************** *** 257,268 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDAUI $(CPPFLAGS) $(CXXFLAGS) WXBINDAUI_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_wxaui_aui.o \ --- 239,244 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDAUI \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDAUI_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_wxaui_aui.o \ *************** *** 286,297 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDBASE $(CPPFLAGS) $(CXXFLAGS) WXBINDBASE_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindbase_dll_wxbase_base.o \ --- 262,267 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDBASE \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDBASE_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindbase_dll_wxbase_base.o \ *************** *** 332,343 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDCORE $(CPPFLAGS) $(CXXFLAGS) WXBINDCORE_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_appframe.o \ --- 302,307 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDCORE \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCORE_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_appframe.o \ *************** *** 374,385 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDGL $(CPPFLAGS) $(CXXFLAGS) WXBINDGL_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindgl_dll_wxgl_bind.o \ --- 338,343 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDGL \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDGL_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindgl_dll_wxgl_bind.o \ *************** *** 400,411 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDHTML $(CPPFLAGS) $(CXXFLAGS) WXBINDHTML_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.o \ --- 358,363 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDHTML \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDHTML_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.o \ *************** *** 426,437 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDMEDIA $(CPPFLAGS) $(CXXFLAGS) WXBINDMEDIA_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindmedia_dll_wxmedia_bind.o \ --- 378,383 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDMEDIA \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDMEDIA_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindmedia_dll_wxmedia_bind.o \ *************** *** 451,462 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDNET $(CPPFLAGS) $(CXXFLAGS) WXBINDNET_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindnet_dll_wxnet_bind.o \ --- 397,402 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDNET \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDNET_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindnet_dll_wxnet_bind.o \ *************** *** 476,486 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ -DWXMAKINGDLL_WXBINDRICHTEXT $(CPPFLAGS) $(CXXFLAGS) WXBINDRICHTEXT_DLL_OBJECTS = \ --- 416,420 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include \ -DWXMAKINGDLL_WXBINDRICHTEXT $(CPPFLAGS) $(CXXFLAGS) WXBINDRICHTEXT_DLL_OBJECTS = \ *************** *** 501,512 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDSTC $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_wxstc_bind.o \ --- 435,440 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_wxstc_bind.o \ *************** *** 526,537 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138... [truncated message content] |
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/modules/build/msvc8 Modified Files: modules_mod_luamodule.vcproj modules_mod_wxbindadv.vcproj modules_mod_wxbindaui.vcproj modules_mod_wxbindbase.vcproj modules_mod_wxbindcore.vcproj modules_mod_wxbindgl.vcproj modules_mod_wxbindhtml.vcproj modules_mod_wxbindmedia.vcproj modules_mod_wxbindnet.vcproj modules_mod_wxbindrichtext.vcproj modules_mod_wxbindstc.vcproj modules_mod_wxbindxml.vcproj modules_mod_wxbindxrc.vcproj modules_mod_wxlua.vcproj modules_mod_wxluadebug.vcproj modules_mod_wxluasocket.vcproj Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: modules_mod_wxbindgl.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindgl.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules_mod_wxbindgl.vcproj 16 Jan 2008 16:46:13 -0000 1.5 --- modules_mod_wxbindgl.vcproj 16 Jan 2008 19:54:28 -0000 1.6 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 76,80 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDGL" /> <Tool --- 76,80 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" /> <Tool *************** *** 145,149 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 145,149 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDGL" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" /> <Tool *************** *** 398,402 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 398,402 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 419,423 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDGL" /> <Tool --- 419,423 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" /> <Tool *************** *** 487,491 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 487,491 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 508,512 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDGL" /> <Tool --- 508,512 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL" /> <Tool *************** *** 739,743 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 739,743 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 760,764 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool --- 760,764 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool *************** *** 830,834 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 830,834 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 851,855 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool --- 851,855 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool *************** *** 1084,1088 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1084,1088 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1105,1109 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool --- 1105,1109 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool *************** *** 1174,1178 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1174,1178 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1195,1199 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool --- 1195,1199 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDGL;_DEBUG" /> <Tool Index: modules_mod_wxbindnet.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindnet.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules_mod_wxbindnet.vcproj 16 Jan 2008 16:46:13 -0000 1.5 --- modules_mod_wxbindnet.vcproj 16 Jan 2008 19:54:29 -0000 1.6 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 76,80 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDNET" /> <Tool --- 76,80 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" /> <Tool *************** *** 145,149 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 145,149 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDNET" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" /> <Tool *************** *** 398,402 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 398,402 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 419,423 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDNET" /> <Tool --- 419,423 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" /> <Tool *************** *** 487,491 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 487,491 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 508,512 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDNET" /> <Tool --- 508,512 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET" /> <Tool *************** *** 739,743 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 739,743 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 760,764 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool --- 760,764 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool *************** *** 830,834 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 830,834 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 851,855 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool --- 851,855 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool *************** *** 1084,1088 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1084,1088 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1105,1109 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool --- 1105,1109 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool *************** *** 1174,1178 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1174,1178 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1195,1199 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool --- 1195,1199 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDNET;_DEBUG" /> <Tool Index: modules_mod_wxluadebug.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxluadebug.vcproj,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** modules_mod_wxluadebug.vcproj 16 Jan 2008 16:46:14 -0000 1.8 --- modules_mod_wxluadebug.vcproj 16 Jan 2008 19:54:29 -0000 1.9 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 76,80 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" /> <Tool --- 76,80 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" /> <Tool *************** *** 145,149 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 145,149 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" /> <Tool *************** *** 398,402 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 398,402 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 419,423 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" /> <Tool --- 419,423 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" /> <Tool *************** *** 487,491 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 487,491 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 508,512 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXLUADEBUG" /> <Tool --- 508,512 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG" /> <Tool *************** *** 739,743 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 739,743 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 760,764 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool --- 760,764 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool *************** *** 830,834 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 830,834 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 851,855 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool --- 851,855 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool *************** *** 1084,1088 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1084,1088 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1105,1109 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool --- 1105,1109 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool *************** *** 1174,1178 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1174,1178 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1195,1199 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool --- 1195,1199 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXLUADEBUG;_DEBUG" /> <Tool Index: modules_mod_wxbindrichtext.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindrichtext.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules_mod_wxbindrichtext.vcproj 16 Jan 2008 16:46:13 -0000 1.5 --- modules_mod_wxbindrichtext.vcproj 16 Jan 2008 19:54:29 -0000 1.6 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 76,80 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool --- 76,80 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool *************** *** 145,149 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 145,149 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool *************** *** 398,402 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 398,402 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 419,423 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool --- 419,423 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool *************** *** 487,491 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 487,491 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 508,512 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool --- 508,512 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT" /> <Tool *************** *** 739,743 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 739,743 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 760,764 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" /> <Tool --- 760,764 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" /> <Tool *************** *** 830,834 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 830,834 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 851,855 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" /> <Tool --- 851,855 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" /> <Tool *************** *** 1084,1088 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1084,1088 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1105,1109 **** Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" /> <Tool --- 1105,1109 ---- Culture="1033" AdditionalIncludeDirectories="..\..\..\modules\wxbind\setup;$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;$(WXWIN)\contrib\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" /> <Tool *************** *** 1174,1178 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;WXMAKINGDLL_WXBINDRICHTEXT;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1174,1178 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-16 19:54:59
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/modules Modified Files: Makefile.in Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** Makefile.in 15 Jan 2008 18:37:27 -0000 1.67 --- Makefile.in 16 Jan 2008 19:54:25 -0000 1.68 *************** *** 53,59 **** LUA_INCLUDE_DIR = @LUA_INCLUDE_DIR@ LUA_LIB_DIR = @LUA_LIB_DIR@ - WXLUA_LIBS = @WXLUA_LIBS@ LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ ### Variables: ### --- 53,59 ---- LUA_INCLUDE_DIR = @LUA_INCLUDE_DIR@ LUA_LIB_DIR = @LUA_LIB_DIR@ LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ + WXLUA_LIBS = @WXLUA_LIBS@ ### Variables: ### |
|
From: John L. <jr...@us...> - 2008-01-16 19:54:58
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/build/bakefiles Modified Files: wxlua.bkl wxluabase.bkl Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** wxluabase.bkl 15 Jan 2008 18:37:27 -0000 1.46 --- wxluabase.bkl 16 Jan 2008 19:54:25 -0000 1.47 *************** *** 54,58 **** - <!-- ================================================================== --> <!-- VARIABLES --> --- 54,57 ---- *************** *** 86,91 **** </if> - - <!-- ================================================================== --> <!-- OPTIONS --> --- 85,88 ---- *************** *** 95,98 **** --- 92,127 ---- <include file="options.bkl" once="1"/> + <!-- This file contains the list of MODULES options --> + <include file="../../modules/build/bakefiles/options.bkl" once="1"/> + + <!-- This file contains the list of APPS options --> + <include file="../../apps/build/bakefiles/options.bkl" once="1"/> + + + <!-- ================================================================== --> + <!-- Variables for defining wxLUA_USEBINDING_WXXXX=0 when the --> + <!-- makefile's USE_BINDINGWXXXX=0 (must be after options.bkl) --> + <!-- ================================================================== --> + + <define-global-tag name="define-usewxbind-def"> + <set var="DEF_wxLUA_USEBINDING_WX$(value.upper())"> + <if cond="USE_WXBIND$(value.upper())=='0'"> + wxLUA_USEBINDING_WX$(value.upper())=0 + </if> + </set> + </define-global-tag> + + <define-usewxbind-def>adv</define-usewxbind-def> + <define-usewxbind-def>aui</define-usewxbind-def> + <define-usewxbind-def>base</define-usewxbind-def> + <define-usewxbind-def>core</define-usewxbind-def> + <define-usewxbind-def>gl</define-usewxbind-def> + <define-usewxbind-def>html</define-usewxbind-def> + <define-usewxbind-def>media</define-usewxbind-def> + <define-usewxbind-def>net</define-usewxbind-def> + <define-usewxbind-def>richtext</define-usewxbind-def> + <define-usewxbind-def>stc</define-usewxbind-def> + <define-usewxbind-def>xml</define-usewxbind-def> + <define-usewxbind-def>xrc</define-usewxbind-def> *************** *** 254,257 **** --- 283,299 ---- $(WXLUA_BASEDIR)/lib/$(COMPILER)_$(_DIRNAME_SHARED_SUFFIX) </set> + + <define>DEF_wxLUA_USEBINDING_WXADV</define> + <define>DEF_wxLUA_USEBINDING_WXAUI</define> + <define>DEF_wxLUA_USEBINDING_WXBASE</define> + <define>DEF_wxLUA_USEBINDING_WXCORE</define> + <define>DEF_wxLUA_USEBINDING_WXGL</define> + <define>DEF_wxLUA_USEBINDING_WXHTML</define> + <define>DEF_wxLUA_USEBINDING_WXMEDIA</define> + <define>DEF_wxLUA_USEBINDING_WXNET</define> + <define>DEF_wxLUA_USEBINDING_WXRICHTEXT</define> + <define>DEF_wxLUA_USEBINDING_WXSTC</define> + <define>DEF_wxLUA_USEBINDING_WXXML</define> + <define>DEF_wxLUA_USEBINDING_WXXRC</define> </if> <if cond="FORMAT=='autoconf'"> Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wxlua.bkl 15 Jan 2008 18:37:27 -0000 1.40 --- wxlua.bkl 16 Jan 2008 19:54:25 -0000 1.41 *************** *** 17,26 **** <include file="wxluabase.bkl"/> - <!-- This file contains the list of MODULES options --> - <include file="../../modules/build/bakefiles/options.bkl"/> - - <!-- This file contains the list of APPS options --> - <include file="../../apps/build/bakefiles/options.bkl"/> - <if cond="TARGETING_WIN32=='1'"> --- 17,20 ---- |
|
From: John L. <jr...@us...> - 2008-01-16 19:54:58
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/build/autoconf Modified Files: autoconf_inc.m4 Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** autoconf_inc.m4 15 Jan 2008 20:19:55 -0000 1.29 --- autoconf_inc.m4 16 Jan 2008 19:54:22 -0000 1.30 *************** *** 351,354 **** --- 351,414 ---- fi AC_SUBST(COND_USE_SYSTEM_LUA_0) + dnl ### begin block 20_COND_USE_WXBINDADV_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDADV_0="#" + if test "x$USE_WXBINDADV" = "x0" ; then + COND_USE_WXBINDADV_0="" + fi + AC_SUBST(COND_USE_WXBINDADV_0) + dnl ### begin block 20_COND_USE_WXBINDAUI_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDAUI_0="#" + if test "x$USE_WXBINDAUI" = "x0" ; then + COND_USE_WXBINDAUI_0="" + fi + AC_SUBST(COND_USE_WXBINDAUI_0) + dnl ### begin block 20_COND_USE_WXBINDBASE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDBASE_0="#" + if test "x$USE_WXBINDBASE" = "x0" ; then + COND_USE_WXBINDBASE_0="" + fi + AC_SUBST(COND_USE_WXBINDBASE_0) + dnl ### begin block 20_COND_USE_WXBINDCORE_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDCORE_0="#" + if test "x$USE_WXBINDCORE" = "x0" ; then + COND_USE_WXBINDCORE_0="" + fi + AC_SUBST(COND_USE_WXBINDCORE_0) + dnl ### begin block 20_COND_USE_WXBINDGL_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDGL_0="#" + if test "x$USE_WXBINDGL" = "x0" ; then + COND_USE_WXBINDGL_0="" + fi + AC_SUBST(COND_USE_WXBINDGL_0) + dnl ### begin block 20_COND_USE_WXBINDHTML_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDHTML_0="#" + if test "x$USE_WXBINDHTML" = "x0" ; then + COND_USE_WXBINDHTML_0="" + fi + AC_SUBST(COND_USE_WXBINDHTML_0) + dnl ### begin block 20_COND_USE_WXBINDMEDIA_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDMEDIA_0="#" + if test "x$USE_WXBINDMEDIA" = "x0" ; then + COND_USE_WXBINDMEDIA_0="" + fi + AC_SUBST(COND_USE_WXBINDMEDIA_0) + dnl ### begin block 20_COND_USE_WXBINDNET_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDNET_0="#" + if test "x$USE_WXBINDNET" = "x0" ; then + COND_USE_WXBINDNET_0="" + fi + AC_SUBST(COND_USE_WXBINDNET_0) + dnl ### begin block 20_COND_USE_WXBINDRICHTEXT_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDRICHTEXT_0="#" + if test "x$USE_WXBINDRICHTEXT" = "x0" ; then + COND_USE_WXBINDRICHTEXT_0="" + fi + AC_SUBST(COND_USE_WXBINDRICHTEXT_0) + dnl ### begin block 20_COND_USE_WXBINDSTC_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDSTC_0="#" + if test "x$USE_WXBINDSTC" = "x0" ; then + COND_USE_WXBINDSTC_0="" + fi + AC_SUBST(COND_USE_WXBINDSTC_0) dnl ### begin block 20_COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1[../../apps/build/bakefiles/apps.bkl] ### COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1="#" *************** *** 363,366 **** --- 423,438 ---- fi AC_SUBST(COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1) + dnl ### begin block 20_COND_USE_WXBINDXML_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDXML_0="#" + if test "x$USE_WXBINDXML" = "x0" ; then + COND_USE_WXBINDXML_0="" + fi + AC_SUBST(COND_USE_WXBINDXML_0) + dnl ### begin block 20_COND_USE_WXBINDXRC_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,./wxlua.bkl] ### + COND_USE_WXBINDXRC_0="#" + if test "x$USE_WXBINDXRC" = "x0" ; then + COND_USE_WXBINDXRC_0="" + fi + AC_SUBST(COND_USE_WXBINDXRC_0) dnl ### begin block 20_COND_USE_WXLUACANAPP_1[../../apps/build/bakefiles/apps.bkl] ### COND_USE_WXLUACANAPP_1="#" |
