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: Francesco M. <fr...@us...> - 2006-05-20 14:17:49
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32690/modules Modified Files: Makefile.in Log Message: added STC to wxBindSTC dll linkstage Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** Makefile.in 20 May 2006 13:12:34 -0000 1.37 --- Makefile.in 20 May 2006 14:17:43 -0000 1.38 *************** *** 209,213 **** wxbind_lib_geometry.o \ wxbind_lib_data.o \ - wxbind_lib_html.o \ wxbind_lib_grid.o \ wxbind_lib_mdi.o \ --- 209,212 ---- *************** *** 243,247 **** wxbind_dll_geometry.o \ wxbind_dll_data.o \ - wxbind_dll_html.o \ wxbind_dll_grid.o \ wxbind_dll_mdi.o \ --- 242,245 ---- *************** *** 1195,1199 **** @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: @COND_INSTALL_CUSTOM_WXBIND_1@ @mkdir -p $(DESTDIR)$(prefix)/src/wxbind ! @COND_INSTALL_CUSTOM_WXBIND_1@ @for f in wxbind/src/wxlua.cpp wxbind/src/xml.cpp wxbind/src/geometry.cpp wxbind/src/data.cpp wxbind/src/html.cpp wxbind/src/grid.cpp wxbind/src/mdi.cpp wxbind/src/file.cpp wxbind/src/config.cpp wxbind/src/menutool.cpp wxbind/src/event.cpp wxbind/src/gdi.cpp wxbind/src/wxlprint.cpp wxbind/src/defsutil.cpp wxbind/src/image.cpp wxbind/src/sizer.cpp wxbind/src/wave.cpp wxbind/src/socket.cpp wxbind/src/wx_bind.cpp wxbind/src/windows.cpp wxbind/src/wxlhtmlwin.cpp wxbind/src/appframe.cpp wxbind/src/regex.cpp wxbind/src/controls.cpp wxbind/src/datetime.cpp wxbind/src/dialogs.cpp wxbind/src/clipdrag.cpp wxbind/src/print.cpp wxbind/src/thread.cpp wxbind/src/help.cpp; do \ @COND_INSTALL_CUSTOM_WXBIND_1@ if test ! -f $(DESTDIR)$(prefix)/src/wxbind/$$f -a ! -d $(DESTDIR)$(prefix)/src/wxbind/$$f ; \ @COND_INSTALL_CUSTOM_WXBIND_1@ then x=yep ; \ --- 1193,1197 ---- @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: @COND_INSTALL_CUSTOM_WXBIND_1@ @mkdir -p $(DESTDIR)$(prefix)/src/wxbind ! @COND_INSTALL_CUSTOM_WXBIND_1@ @for f in wxbind/src/wxlua.cpp wxbind/src/xml.cpp wxbind/src/geometry.cpp wxbind/src/data.cpp wxbind/src/grid.cpp wxbind/src/mdi.cpp wxbind/src/file.cpp wxbind/src/config.cpp wxbind/src/menutool.cpp wxbind/src/event.cpp wxbind/src/gdi.cpp wxbind/src/wxlprint.cpp wxbind/src/defsutil.cpp wxbind/src/image.cpp wxbind/src/sizer.cpp wxbind/src/wave.cpp wxbind/src/socket.cpp wxbind/src/wx_bind.cpp wxbind/src/windows.cpp wxbind/src/wxlhtmlwin.cpp wxbind/src/appframe.cpp wxbind/src/regex.cpp wxbind/src/controls.cpp wxbind/src/datetime.cpp wxbind/src/dialogs.cpp wxbind/src/clipdrag.cpp wxbind/src/print.cpp wxbind/src/thread.cpp wxbind/src/help.cpp; do \ @COND_INSTALL_CUSTOM_WXBIND_1@ if test ! -f $(DESTDIR)$(prefix)/src/wxbind/$$f -a ! -d $(DESTDIR)$(prefix)/src/wxbind/$$f ; \ @COND_INSTALL_CUSTOM_WXBIND_1@ then x=yep ; \ *************** *** 1613,1619 **** $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/data.cpp - wxbind_lib_html.o: $(top_srcdir)/modules/wxbind/src/html.cpp - $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/html.cpp - wxbind_lib_grid.o: $(top_srcdir)/modules/wxbind/src/grid.cpp $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/grid.cpp --- 1611,1614 ---- *************** *** 1703,1709 **** $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/data.cpp - wxbind_dll_html.o: $(top_srcdir)/modules/wxbind/src/html.cpp - $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/html.cpp - wxbind_dll_grid.o: $(top_srcdir)/modules/wxbind/src/grid.cpp $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/grid.cpp --- 1698,1701 ---- |
|
From: Francesco M. <fr...@us...> - 2006-05-20 14:01:14
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26791/modules/wxbind/include Added Files: wxbinddefs.h Log Message: fixing WXDLLIMPEXP symbols --- NEW FILE: wxbinddefs.h --- /////////////////////////////////////////////////////////////////////////////// // Name: wxbinddefs.h // Purpose: definitions for wxBind module // Author: Francesco Montorsi // Modified by: // Created: 20/5/2006 // RCS-ID: $Id: wxbinddefs.h,v 1.1 2006/05/20 14:01:07 frm Exp $ // Copyright: (c) Francesco Montorsi // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// #ifndef __WX_WXBINDDEFS_H__ #define __WX_WXBINDDEFS_H__ #include "wx/defs.h" // ---------------------------------------------------------------------------- // WXDLLIMPEXP macros // ---------------------------------------------------------------------------- #ifdef WXMAKINGDLL_WXBIND #define WXDLLIMPEXP_WXBIND WXEXPORT #define WXDLLIMPEXP_DATA_WXBIND(type) WXEXPORT type #elif defined(WXUSINGDLL) #define WXDLLIMPEXP_WXBIND WXIMPORT #define WXDLLIMPEXP_DATA_WXBIND(type) WXIMPORT type #else // not making nor using DLL #define WXDLLIMPEXP_WXBIND #define WXDLLIMPEXP_DATA_WXBIND(type) type #endif #endif // __WX_WXBINDDEFS_H__ |
|
From: Francesco M. <fr...@us...> - 2006-05-20 14:00:56
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26442/modules/wxbind/include Modified Files: wxlhtmlwin.h wxlprint.h Log Message: fixing WXDLLIMPEXP symbols Index: wxlhtmlwin.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxlhtmlwin.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxlhtmlwin.h 17 Apr 2006 13:58:54 -0000 1.4 --- wxlhtmlwin.h 20 May 2006 14:00:47 -0000 1.5 *************** *** 16,19 **** --- 16,20 ---- #include "wxlua/include/wxldefs.h" #include "wxlua/include/wxlstate.h" + #include "wxbind/include/wxbinddefs.h" #include "wx/print.h" #include "wx/html/htmlwin.h" *************** *** 27,31 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaHtmlWindow : public wxHtmlWindow { public: --- 28,32 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXBIND wxLuaHtmlWindow : public wxHtmlWindow { public: *************** *** 63,67 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaHtmlWinTagEvent : public wxEvent { public: --- 64,68 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXBIND wxLuaHtmlWinTagEvent : public wxEvent { public: *************** *** 90,94 **** BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUA, wxEVT_HTML_TAG_HANDLER, 0) END_DECLARE_EVENT_TYPES() --- 91,95 ---- BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXBIND, wxEVT_HTML_TAG_HANDLER, 0) END_DECLARE_EVENT_TYPES() Index: wxlprint.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxlprint.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxlprint.h 7 Mar 2006 19:23:33 -0000 1.5 --- wxlprint.h 20 May 2006 14:00:47 -0000 1.6 *************** *** 16,19 **** --- 16,20 ---- #include "wxlua/include/wxldefs.h" #include "wxlua/include/wxlstate.h" + #include "wxbind/include/wxbinddefs.h" #include "wx/print.h" #include "wxluasetup.h" *************** *** 27,31 **** // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaPrintout : public wxPrintout { public: --- 28,32 ---- // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXBIND wxLuaPrintout : public wxPrintout { public: |
|
From: Francesco M. <fr...@us...> - 2006-05-20 14:00:56
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26442/modules/wxlua/include Modified Files: internal.h wxlbind.h Log Message: fixing WXDLLIMPEXP symbols Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxlbind.h 18 May 2006 05:47:40 -0000 1.18 --- wxlbind.h 20 May 2006 14:00:48 -0000 1.19 *************** *** 15,18 **** --- 15,19 ---- #include "wxlua/include/wxldefs.h" + #include "wxbind/include/wxbinddefs.h" extern "C" *************** *** 63,74 **** // wxlua arg tags for common lua types ! extern int s_wxluaarg_String; ! extern int s_wxluaarg_Boolean; ! extern int s_wxluaarg_Enumeration; ! extern int s_wxluaarg_Number; ! extern int s_wxluaarg_LightUserData; ! extern int s_wxluaarg_UserData; ! extern int s_wxluaarg_LuaTable; ! extern int s_wxluaarg_LuaFunction; struct WXLUACLASS // defines a LUA class interface --- 64,75 ---- // wxlua arg tags for common lua types ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_String; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Boolean; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Enumeration; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Number; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LightUserData; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_UserData; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaTable; ! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaFunction; struct WXLUACLASS // defines a LUA class interface *************** *** 156,160 **** #define wxLUA_DECLARE_ENCAPSULATION(theObject) \ class theObject; \ ! void LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, theObject *); \ class wxObject_##theObject : public wxObject \ { \ --- 157,161 ---- #define wxLUA_DECLARE_ENCAPSULATION(theObject) \ class theObject; \ ! void WXDLLIMPEXP_WXLUA LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, theObject *); \ class wxObject_##theObject : public wxObject \ { \ *************** *** 186,190 **** // garbage collection purposes. This is a C function for symmetry with // the functions defined using wxLUA_DECLARE_ENCAPSULATION. ! void LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, wxObject *); // ---------------------------------------------------------------------------- --- 187,191 ---- // garbage collection purposes. This is a C function for symmetry with // the functions defined using wxLUA_DECLARE_ENCAPSULATION. ! void WXDLLIMPEXP_WXLUA LUACALL wxLua_AddToTrackedMemoryList(wxLuaState& wxlState, wxObject *); // ---------------------------------------------------------------------------- Index: internal.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** internal.h 4 May 2006 02:47:34 -0000 1.28 --- internal.h 20 May 2006 14:00:48 -0000 1.29 *************** *** 123,178 **** // helper functions to get numbers, booleans and strings safer ! const char* LUACALL wxLua_lua_getstringtype(lua_State* L, int iParam); ! bool LUACALL wxLua_lua_getbooleantype(lua_State* L, int iParam); ! long LUACALL wxLua_lua_getenumerationtype(lua_State* L, int iParam); ! double LUACALL wxLua_lua_getnumbertype(lua_State* L, int iParam); // convert a parameter which is presumably a table into a string array. // returns the number of strings in the array in count. // the return value may need to be deleted. ! wxString* LUACALL wxLua_lua_getwxstringarray(lua_State* L, int iParam, int& count); // convert a parameter which is presumably a table into a character pointer array. // returns the number of character strings in the array in count. // the return value may need to be deleted. ! const char** LUACALL wxLua_lua_getchararray(lua_State* L, int iParam, int& count); // convert a parameter which is presumably a wxArrayString reference a string array. // returns the table containing the strings on the Lua stack. // returns the number of items in the table ! int LUACALL wxLua_lua_pushwxarraystringtable(lua_State* L, wxArrayString& files); ! int LUACALL wxLua_lua_pushwxarrayinttable(lua_State* L, const wxArrayInt& table); // convert a parameter which is presumably a table into a integer array. // returns the number of ints in the array in count. // the return value may need to be deleted. ! int* LUACALL wxLua_lua_getintarray(lua_State* L, int iParam, int& count); ! int LUACALL wxLua_lua_getwxarrayint(lua_State* L, int iParam, wxArrayInt& intArray); // create a reference to the object at index iParam in the Lua index ! wxDEPRECATED( int LUACALL wxLua_lua_tinsert(lua_State* L, int iParam) ); // push onto the top of the stack the object referenced by iReference ! bool LUACALL wxLua_lua_tget(lua_State* L, int iReference); // remove a Lua reference ! wxDEPRECATED( bool LUACALL wxLua_lua_tremove(lua_State* L, int iReference) ); // Get the number of items in the reference table ! int LUACALL wxLua_lua_tgetn(lua_State* L); // Display an error message ! void LUACALL wxLua_lua_terror(lua_State* L, const char* errorMsg); // push onto the top of the stack an userdata object containing u using tag to set the metatable ! void LUACALL wxLua_lua_tpushusertag(lua_State* L, const void* u, int tag); // get the tag of the object at index ! int LUACALL wxLua_lua_ttag(lua_State* L, int index); // return the user data in the userdata object at index, if reset is true clear the user data ! void* LUACALL wxLua_lua_ttouserdata(lua_State* L, int index, bool reset = false); // allocate a new metatable return its reference ! wxDEPRECATED( int LUACALL wxLua_lua_tnewtag(lua_State* L) ); ! int LUACALL wxLua_lua_tnewweaktag(lua_State* L, bool fWeakKey, bool fWeakData); // set the metatable of the object at top of stack from the reference tag ! void LUACALL wxLua_lua_tsettag(lua_State* L, int tag); // set a metamethod for the metatable referenced by tag with the supplied name and function. // if pClass is non-null set the upvalue of the function to the supplied class ! bool LUACALL wxLua_lua_tsettagmethod(lua_State* L, int tag, const char* method, lua_CFunction func, void* pClass = NULL); // push the wxLuaReferences string onto the stack ! void LUACALL wxLua_lua_tpushwxLuaReferences(lua_State* L); // push the wxLuaNull string onto the stack ! void LUACALL wxLua_lua_tpushwxLuaNull(lua_State* L); // ---------------------------------------------------------------------------- --- 123,178 ---- // helper functions to get numbers, booleans and strings safer ! WXDLLIMPEXP_WXLUA const char* LUACALL wxLua_lua_getstringtype(lua_State* L, int iParam); ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_getbooleantype(lua_State* L, int iParam); ! WXDLLIMPEXP_WXLUA long LUACALL wxLua_lua_getenumerationtype(lua_State* L, int iParam); ! WXDLLIMPEXP_WXLUA double LUACALL wxLua_lua_getnumbertype(lua_State* L, int iParam); // convert a parameter which is presumably a table into a string array. // returns the number of strings in the array in count. // the return value may need to be deleted. ! WXDLLIMPEXP_WXLUA wxString* LUACALL wxLua_lua_getwxstringarray(lua_State* L, int iParam, int& count); // convert a parameter which is presumably a table into a character pointer array. // returns the number of character strings in the array in count. // the return value may need to be deleted. ! WXDLLIMPEXP_WXLUA const char** LUACALL wxLua_lua_getchararray(lua_State* L, int iParam, int& count); // convert a parameter which is presumably a wxArrayString reference a string array. // returns the table containing the strings on the Lua stack. // returns the number of items in the table ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_pushwxarraystringtable(lua_State* L, wxArrayString& files); ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_pushwxarrayinttable(lua_State* L, const wxArrayInt& table); // convert a parameter which is presumably a table into a integer array. // returns the number of ints in the array in count. // the return value may need to be deleted. ! WXDLLIMPEXP_WXLUA int* LUACALL wxLua_lua_getintarray(lua_State* L, int iParam, int& count); ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_getwxarrayint(lua_State* L, int iParam, wxArrayInt& intArray); // create a reference to the object at index iParam in the Lua index ! WXDLLIMPEXP_WXLUA wxDEPRECATED( int LUACALL wxLua_lua_tinsert(lua_State* L, int iParam) ); // push onto the top of the stack the object referenced by iReference ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tget(lua_State* L, int iReference); // remove a Lua reference ! WXDLLIMPEXP_WXLUA wxDEPRECATED( bool LUACALL wxLua_lua_tremove(lua_State* L, int iReference) ); // Get the number of items in the reference table ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tgetn(lua_State* L); // Display an error message ! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_terror(lua_State* L, const char* errorMsg); // push onto the top of the stack an userdata object containing u using tag to set the metatable ! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tpushusertag(lua_State* L, const void* u, int tag); // get the tag of the object at index ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_ttag(lua_State* L, int index); // return the user data in the userdata object at index, if reset is true clear the user data ! WXDLLIMPEXP_WXLUA void* LUACALL wxLua_lua_ttouserdata(lua_State* L, int index, bool reset = false); // allocate a new metatable return its reference ! WXDLLIMPEXP_WXLUA wxDEPRECATED( int LUACALL wxLua_lua_tnewtag(lua_State* L) ); ! WXDLLIMPEXP_WXLUA int LUACALL wxLua_lua_tnewweaktag(lua_State* L, bool fWeakKey, bool fWeakData); // set the metatable of the object at top of stack from the reference tag ! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tsettag(lua_State* L, int tag); // set a metamethod for the metatable referenced by tag with the supplied name and function. // if pClass is non-null set the upvalue of the function to the supplied class ! WXDLLIMPEXP_WXLUA bool LUACALL wxLua_lua_tsettagmethod(lua_State* L, int tag, const char* method, lua_CFunction func, void* pClass = NULL); // push the wxLuaReferences string onto the stack ! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tpushwxLuaReferences(lua_State* L); // push the wxLuaNull string onto the stack ! WXDLLIMPEXP_WXLUA void LUACALL wxLua_lua_tpushwxLuaNull(lua_State* L); // ---------------------------------------------------------------------------- |
|
From: Francesco M. <fr...@us...> - 2006-05-20 14:00:54
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26442/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: fixing WXDLLIMPEXP symbols Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxluasetup.h 20 May 2006 13:28:52 -0000 1.5 --- wxluasetup.h 20 May 2006 14:00:48 -0000 1.6 *************** *** 66,70 **** #define wxLUA_USE_wxListBox 1 #define wxLUA_USE_wxListCtrl 1 ! #define wxLUA_USE_wxLuaDebugServer 1 #define wxLUA_USE_wxLuaHtmlWindow 1 #define wxLUA_USE_wxLuaPrintout 1 --- 66,70 ---- #define wxLUA_USE_wxListBox 1 #define wxLUA_USE_wxListCtrl 1 ! #define wxLUA_USE_wxLuaDebugServer 0 #define wxLUA_USE_wxLuaHtmlWindow 1 #define wxLUA_USE_wxLuaPrintout 1 |
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:29:03
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14897/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: wxTabCtrl defaults to zero in wx27 Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxluasetup.h 16 May 2006 22:47:09 -0000 1.4 --- wxluasetup.h 20 May 2006 13:28:52 -0000 1.5 *************** *** 104,108 **** #define wxLUA_USE_wxStyledTextCtrl 1 #define wxLUA_USE_wxSystemSettings 1 ! #define wxLUA_USE_wxTabCtrl 1 #define wxLUA_USE_wxTaskBarIcon 1 #define wxLUA_USE_wxTextCtrl 1 --- 104,108 ---- #define wxLUA_USE_wxStyledTextCtrl 1 #define wxLUA_USE_wxSystemSettings 1 ! #define wxLUA_USE_wxTabCtrl 0 #define wxLUA_USE_wxTaskBarIcon 1 #define wxLUA_USE_wxTextCtrl 1 |
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:14:28
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/modules/build/bakefiles Modified Files: common.bkl modules.bkl Log Message: updated all build system trying to fix SHARED builds Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** common.bkl 20 May 2006 12:01:26 -0000 1.4 --- common.bkl 20 May 2006 13:12:34 -0000 1.5 *************** *** 49,59 **** </if> ! <set var="LUALIB_SRC"> $(addPrefixToList('lua/src/', 'lapi.c lcode.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltm.c lundump.c lvm.c lzio.c lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c loslib.c ltablib.c lstrlib.c loadlib.c linit.c')) </set> ! <set var="LUALIB_HDR">$(fileList('lua/include/*.h'))</set> ! ! <set var="LUA_SRC">lua/src/lua.c</set> ! <set var="LUA_HDR"></set> <set var="WXBIND_SRC">$(fileList('wxbind/src/*.cpp'))</set> --- 49,56 ---- </if> ! <set var="LUA_SRC"> $(addPrefixToList('lua/src/', 'lapi.c lcode.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltm.c lundump.c lvm.c lzio.c lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c loslib.c ltablib.c lstrlib.c loadlib.c linit.c')) </set> ! <set var="LUA_HDR">$(fileList('lua/include/*.h'))</set> <set var="WXBIND_SRC">$(fileList('wxbind/src/*.cpp'))</set> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** modules.bkl 20 May 2006 12:01:26 -0000 1.31 --- modules.bkl 20 May 2006 13:12:34 -0000 1.32 *************** *** 36,40 **** <!-- ================================================================== --> ! <!-- The list of wxLua MODULES --> <!-- --> <!-- NOTE: the 'mod_' prefix in the ID is mainly because in this way the --> --- 36,40 ---- <!-- ================================================================== --> ! <!-- The list of wxLua MODULES --> <!-- --> <!-- NOTE: the 'mod_' prefix in the ID is mainly because in this way the --> *************** *** 44,70 **** <!-- ================================================================== --> ! <!-- lua must always be built inconditionally in static mode ! NOTE: we won't use the lua_lib rule since the LUA module does not follow ! the same conventions followed by other modules... --> ! <lib id="mod_lua_lib" template="wxbase" cond="SHARED=='0'"> ! <srcdir>$(WXLUA_SOURCEDIR)</srcdir> ! <define>WXLUA_LUA_NEWTHREAD</define> <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! ! <sources>$(LUALIB_SRC)</sources> ! <headers>$(LUALIB_HDR)</headers> ! <include>$(WXLUA_SOURCEDIR)/lua/include</include> ! <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> ! <wxlike-libname prefix='lua'>lua</wxlike-libname> ! ! <install-to>$(LIBDIR)</install-to> ! <headers-install-to>$(INCLUDEDIR)</headers-install-to> ! </lib> ! <dll id="mod_lua_dll" template="wxbase" cond="SHARED=='1'"> ! <srcdir>$(WXLUA_SOURCEDIR)</srcdir> ! <define>WXLUA_LUA_NEWTHREAD</define> <if cond="TARGETING_WIN32=='1'"> --- 44,62 ---- <!-- ================================================================== --> ! <!-- the VERBATIM lua lib & dll --> ! <wxlua_stdlib id="verbatimlua_lib" cond="SHARED=='0'"> ! <module-name>LUA</module-name> ! <!-- WE WANT THE VERBATIM VERSION: <define>WXLUA_LUA_NEWTHREAD</define> --> ! <libname>lua5.1</libname> <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! </wxlua_stdlib> ! <wxlua_stddll id="verbatimlua_dll" cond="SHARED=='1'"> ! <module-name>LUA</module-name> ! <!-- WE WANT THE VERBATIM VERSION: <define>WXLUA_LUA_NEWTHREAD</define> --> ! <libname>lua5.1</libname> ! <dllname>lua5.1</dllname> <if cond="TARGETING_WIN32=='1'"> *************** *** 72,129 **** </if> - <!-- The DLL version --> - <version>$(WXLUA_VERSION)</version> - <so_version>$(WXLUA_SOVERSION)</so_version> - <mac_version>$(WXLUA_MACVERSION)</mac_version> - <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> - <sources>$(LUALIB_SRC)</sources> - <headers>$(LUALIB_HDR)</headers> - <include>$(WXLUA_SOURCEDIR)/lua/include</include> - <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname> - <wxlike-libname prefix='lua'>lua</wxlike-libname> - <wxlike-dllname prefix='lua'>lua</wxlike-dllname> - - <install-to>$(LIBDIR)</install-to> - <headers-install-to>$(INCLUDEDIR)</headers-install-to> - </dll> - - - <!-- this is the lua app - NOTE: like for lua_lib we don't use any wxLua-project-specific rule here --> - <exe id="mod_lua" template="wxbase"> - <srcdir>$(WXLUA_SOURCEDIR)</srcdir> - <wxlua-lib>lua</wxlua-lib> - <sources>$(LUA_SRC)</sources> - <if cond="TARGETING_WIN32=='1' or FORMAT=='gnu'"> - <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path> - </if> - <if cond="TARGETING_WIN32=='0' and FORMAT!='gnu'"> - <lib-path>$(top_builddir)$(WXLUA_OUTPUT_FOLDER)</lib-path> - </if> <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! <include>$(WXLUA_SOURCEDIR)/lua/include</include> ! <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> ! ! <!-- avoid overwriting user's lua --> ! <exename>wxlua-lua</exename> ! ! <if cond="TARGETING_WIN32=='0'"> ! <!-- we require the standard MATH library to build the lua sources --> ! <sys-lib>m</sys-lib> </if> ! <install-to>$(BINDIR)</install-to> ! </exe> ! <!-- the wxLua lib & dll --> --- 64,95 ---- </if> <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + </wxlua_stddll> + <!-- the lua lib & dll --> + <wxlua_stdlib id="lua_lib" cond="SHARED=='0'"> + <module-name>LUA</module-name> + <define>WXLUA_LUA_NEWTHREAD</define> <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + </wxlua_stdlib> + <wxlua_stddll id="lua_dll" cond="SHARED=='1'"> + <module-name>LUA</module-name> + <define>WXLUA_LUA_NEWTHREAD</define> ! <if cond="TARGETING_WIN32=='1'"> ! <define>LUA_BUILD_AS_DLL</define> </if> ! <!-- see options.bkl for these --> ! <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> ! <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> ! </wxlua_stddll> <!-- the wxLua lib & dll --> *************** *** 142,145 **** --- 108,112 ---- <wxlua_stddll id="wxbind_dll" cond="SHARED=='1'"> <module-name>WXBIND</module-name> + <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 151,154 **** --- 118,122 ---- <wxlua_stddll id="wxbindstc_dll" cond="SHARED=='1' and USE_WXBINDSTC=='1'"> <module-name>WXBINDSTC</module-name> + <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 160,163 **** --- 128,132 ---- <wxlua_stddll id="wxluadebug_dll" cond="SHARED=='1' and USE_WXLUADEBUG=='1'"> <module-name>WXLUADEBUG</module-name> + <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 169,177 **** <wxlua_stddll id="wxluasocket_dll" cond="SHARED=='1' and USE_WXLUASOCKET=='1'"> <module-name>WXLUASOCKET</module-name> <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> ! <!-- the luamodule --> ! <module id="mod_luamodule" template="wxlua" cond="USE_LUAMODULE=='1'"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> --- 138,148 ---- <wxlua_stddll id="wxluasocket_dll" cond="SHARED=='1' and USE_WXLUASOCKET=='1'"> <module-name>WXLUASOCKET</module-name> + <wxlua-lib>wxluadebug</wxlua-lib> + <wxlua-lib>wxlua</wxlua-lib> <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> ! <!-- the luamodule: for lots of reasons it can be built only when SHARED==1 --> ! <module id="mod_luamodule" template="wxlua" cond="SHARED=='1' and USE_LUAMODULE=='1'"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> |
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:12:50
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798 Modified Files: Makefile.in configure Log Message: updated all build system trying to fix SHARED builds Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 8 May 2006 15:50:47 -0000 1.16 --- Makefile.in 20 May 2006 13:12:33 -0000 1.17 *************** *** 86,90 **** samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/grid.wx.lua samples/fldemo.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/calculator.wx.lua samples/debugtest.wx.lua samples/debug.wx.lua samples/choices.wx.lua samples/editor.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ --- 86,90 ---- samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/grid.wx.lua samples/fldemo.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/luamodule.wx.lua samples/calculator.wx.lua samples/debugtest.wx.lua samples/debug.wx.lua samples/choices.wx.lua samples/editor.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** configure 14 May 2006 12:55:55 -0000 1.35 --- configure 20 May 2006 13:12:33 -0000 1.36 *************** *** 311,315 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP EGREP LUA_PLATFORM_SPECIFIC_CFLAGS LUA_PLATFORM_SPECIFIC_LDFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS ac_ct_CC WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_RESCOMP WX_VERSION_FULL WX_VERSION_MAJOR WX_VERSION_MINOR WX_PORT WX_GTKPORT_VERSION WXLIBS_REQUIRED WXLUA_MODNAMES WXLUA_LIBNAMES WXLUA_LDFLAGS SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING WINDRES ac_ct_WINDRES REZ SETFILE COND_BUILD_DEBUG COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_UNICODE_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_INSTALL_CUSTOM_WXBIND_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_WXBINDSTC_1 COND_SHARED_0_USE_WXLUADEBUG_1 COND_SHARED_0_USE_WXLUASOCKET_1 COND_SHARED_1 COND_SHARED_1_USE_WXBINDSTC_1 COND_SHARED_1_USE_WXLUADEBUG_1 COND_SHARED_1_USE_WXLUASOCKET_1 COND_UNICODE_0 COND_UNICODE_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1 COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1 COND_USE_WXLUACANAPP_1 COND_USE_WXLUAFREEZEAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_PORT_GTK COND_WX_PORT_MAC COND_WX_PORT_MGL COND_WX_PORT_MOTIF COND_WX_PORT_MSW COND_WX_PORT_X11 LIBOBJS LTLIBOBJS' ac_subst_files='' --- 311,315 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CXXCPP EGREP LUA_PLATFORM_SPECIFIC_CFLAGS LUA_PLATFORM_SPECIFIC_LDFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS ac_ct_CC WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_RESCOMP WX_VERSION_FULL WX_VERSION_MAJOR WX_VERSION_MINOR WX_PORT WX_GTKPORT_VERSION WXLIBS_REQUIRED WXLUA_MODNAMES WXLUA_LIBNAMES WXLUA_LDFLAGS SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING WINDRES ac_ct_WINDRES REZ SETFILE COND_BUILD_DEBUG COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_UNICODE_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_INSTALL_CUSTOM_WXBIND_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_WXBINDSTC_1 COND_SHARED_0_USE_WXLUADEBUG_1 COND_SHARED_0_USE_WXLUASOCKET_1 COND_SHARED_1 COND_SHARED_1_USE_WXBINDSTC_1 COND_SHARED_1_USE_WXLUADEBUG_1 COND_SHARED_1_USE_WXLUASOCKET_1 COND_UNICODE_0 COND_UNICODE_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_LUAMODULE_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1 COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1 COND_USE_WXLUACANAPP_1 COND_USE_WXLUAFREEZEAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_PORT_GTK COND_WX_PORT_MAC COND_WX_PORT_MGL COND_WX_PORT_MOTIF COND_WX_PORT_MSW COND_WX_PORT_X11 LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 862,865 **** --- 862,866 ---- --enable-wxluafreeze-app Compiles the wxLuaFreeze app (default is yes) + --enable-luamodule Compiles the lua module (default is yes) --enable-wxbindstc Compiles the wxLua bindings for STC (default is yes) --enable-wxluadebug Compiles the wxLua debug support (default is yes) *************** *** 1519,1522 **** --- 1520,1530 ---- enable_wxluafreeze_app=yes fi; + # Check whether --enable-luamodule or --disable-luamodule was given. + if test "${enable_luamodule+set}" = set; then + enableval="$enable_luamodule" + + else + enable_luamodule_app=yes + fi; *************** *** 1612,1615 **** --- 1620,1636 ---- + echo "$as_me:$LINENO: checking for --enable-luamodule option" >&5 + echo $ECHO_N "checking for --enable-luamodule option... $ECHO_C" >&6 + if [ "x$enable_luamodule_app" = "xyes" ]; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + USE_LUAMODULE=1 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + USE_LUAMODULE=0 + fi + + echo "$as_me:$LINENO: checking for --enable-wxbindstc option" >&5 *************** *** 8817,8820 **** --- 8838,8846 ---- fi + COND_USE_LUAMODULE_1="#" + if test "x$USE_LUAMODULE" = "x1" ; then + COND_USE_LUAMODULE_1="" + fi + COND_USE_SOSYMLINKS_1="#" if test "x$USE_SOSYMLINKS" = "x1" ; then *************** *** 8913,8916 **** --- 8939,8957 ---- ac_config_files="$ac_config_files Makefile modules/Makefile apps/Makefile build/autoconf/wxlua.pc" + + # since at least the "luamodule.wx.lua" sample require to be able to find + # the wx.so library in ../lib; thus we need to copy the sample(s) to the + # build directory to preserve the relative path correctness + if [ ! -z "$srcdir" ]; then + + { echo "$as_me:$LINENO: configure: copying $srcdir/samples to ./samples" >&5 + echo "$as_me: configure: copying $srcdir/samples to ./samples" >&6;} + cp -r "$srcdir/samples" samples + + # NB: we don't use AC_CONFIG_LINKS([samples:samples], [cp]) because making + # a symbolic link from $srcdir/samples to samples would not work for + # luamodule.wx.lua (because require("wx") uses the effective path). + fi + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure *************** *** 9676,9679 **** --- 9717,9721 ---- s,@COND_USE_APPS_1@,$COND_USE_APPS_1,;t t s,@COND_USE_BIN2C_1@,$COND_USE_BIN2C_1,;t t + s,@COND_USE_LUAMODULE_1@,$COND_USE_LUAMODULE_1,;t t s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t s,@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@,$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1,;t t *************** *** 9965,9968 **** --- 10007,10012 ---- + + # output a nice summary of detected options # NOTE: keep build conditions in synch with bakefiles; e.g. app_wxlua is *************** *** 10006,10009 **** --- 10050,10054 ---- # applications + echo if [ "x$USE_WXLUAAPP" = "x1" -a "x$USE_WXBINDSTC" = "x1" -a "x$USE_WXLUADEBUG" = "x1" ]; then *************** *** 10044,10047 **** --- 10089,10093 ---- # modules + echo if [ "x$USE_WXBINDSTC" = "x1" ]; then *************** *** 10072,10075 **** --- 10118,10132 ---- + if [ "x$USE_LUAMODULE" = "x1" ]; then + echo " - Lua module: yes" + elif [ "x$USE_LUAMODULE" = "x0" ]; then + echo " - Lua module: no" + else + echo "USE_LUAMODULE is $USE_LUAMODULE" + fi + + + # miscellaneous + echo if [ "x$INSTALL_CUSTOM_WXBIND" = "x1" ]; then |
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:12:50
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/build/autoconf Modified Files: aclocal.m4 autoconf_inc.m4 Log Message: updated all build system trying to fix SHARED builds Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** autoconf_inc.m4 20 May 2006 12:16:53 -0000 1.17 --- autoconf_inc.m4 20 May 2006 13:12:34 -0000 1.18 *************** *** 79,83 **** fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MAC_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl] ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then --- 79,83 ---- fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MAC_1[../../apps/build/bakefiles/apps.bkl,../../util/build/bakefiles/util.bkl] ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then *************** *** 127,130 **** --- 127,136 ---- fi AC_SUBST(COND_SHARED_1) + dnl ### begin block 20_COND_SHARED_1_USE_LUAMODULE_1[../../modules/build/bakefiles/modules.bkl] ### + COND_SHARED_1_USE_LUAMODULE_1="#" + if test "x$SHARED" = "x1" -a "x$USE_LUAMODULE" = "x1" ; then + COND_SHARED_1_USE_LUAMODULE_1="" + fi + AC_SUBST(COND_SHARED_1_USE_LUAMODULE_1) dnl ### begin block 20_COND_SHARED_1_USE_WXBINDSTC_1[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_1_USE_WXBINDSTC_1="#" *************** *** 169,178 **** fi AC_SUBST(COND_USE_BIN2C_1) - dnl ### begin block 20_COND_USE_LUAMODULE_1[../../modules/build/bakefiles/modules.bkl] ### - COND_USE_LUAMODULE_1="#" - if test "x$USE_LUAMODULE" = "x1" ; then - COND_USE_LUAMODULE_1="" - fi - AC_SUBST(COND_USE_LUAMODULE_1) dnl ### begin block 20_COND_USE_SOSYMLINKS_1[../../modules/build/bakefiles/modules.bkl] ### COND_USE_SOSYMLINKS_1="#" --- 175,178 ---- |
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:12:49
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules.dsw modules_mod_lua.dsp modules_mod_lua_lib.dsp modules_mod_wxbind.dsp modules_mod_wxbindstc.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: updated all build system trying to fix SHARED builds Index: modules_mod_lua_lib.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_lua_lib.dsp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** modules_mod_lua_lib.dsp 14 May 2006 12:55:56 -0000 1.19 --- modules_mod_lua_lib.dsp 20 May 2006 13:12:35 -0000 1.20 *************** *** 18,29 **** !MESSAGE Possible choices for configuration are: !MESSAGE - !MESSAGE "mod_lua_lib - Win32 DLL Unicode Debug Monolithic" (based on "Win32 (x86) Static Library") - !MESSAGE "mod_lua_lib - Win32 DLL Unicode Debug Multilib" (based on "Win32 (x86) Static Library") - !MESSAGE "mod_lua_lib - Win32 DLL Unicode Release Monolithic" (based on "Win32 (x86) Static Library") - !MESSAGE "mod_lua_lib - Win32 DLL Unicode Release Multilib" (based on "Win32 (x86) Static Library") - !MESSAGE "mod_lua_lib - Win32 DLL Debug Monolithic" (based on "Win32 (x86) Static Library") - !MESSAGE "mod_lua_lib - Win32 DLL Debug Multilib" (based on "Win32 (x86) Static Library") - !MESSAGE "mod_lua_lib - Win32 DLL Release Monolithic" (based on "Win32 (x86) Static Library") - !MESSAGE "mod_lua_lib - Win32 DLL Release Multilib" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 Unicode Debug Monolithic" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 Unicode Debug Multilib" (based on "Win32 (x86) Static Library") --- 18,21 ---- *************** *** 43,231 **** RSC=rc.exe ! !IF "$(CFG)" == "mod_lua_lib - Win32 DLL Unicode Debug Monolithic" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjud\mod_lua_lib" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 ! # ADD RSC /l 0x409 ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26ud_lua.lib" ! ! !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Unicode Debug Multilib" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjud\mod_lua_lib" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 ! # ADD RSC /l 0x409 ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26ud_lua.lib" ! ! !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Unicode Release Monolithic" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prju\mod_lua_lib" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE RSC /l 0x409 ! # ADD RSC /l 0x409 ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26u_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26u_lua.lib" ! ! !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Unicode Release Multilib" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prju\mod_lua_lib" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE RSC /l 0x409 ! # ADD RSC /l 0x409 ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26u_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26u_lua.lib" ! ! !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Debug Monolithic" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjd\mod_lua_lib" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 ! # ADD RSC /l 0x409 ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26d_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26d_lua.lib" ! ! !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Debug Multilib" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prjd\mod_lua_lib" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 ! # ADD RSC /l 0x409 ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26d_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26d_lua.lib" ! ! !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Release Monolithic" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prj\mod_lua_lib" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE RSC /l 0x409 ! # ADD RSC /l 0x409 ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26_lua.lib" ! ! !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Release Multilib" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\lib\vc_lib" ! # PROP BASE Intermediate_Dir "msvc6prj\mod_lua_lib" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\lib\vc_lib" ! # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE RSC /l 0x409 ! # ADD RSC /l 0x409 ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26_lua.lib" ! ! !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode Debug Monolithic" # PROP BASE Use_MFC 0 --- 35,39 ---- RSC=rc.exe ! !IF "$(CFG)" == "mod_lua_lib - Win32 Unicode Debug Monolithic" # PROP BASE Use_MFC 0 *************** *** 415,426 **** # Begin Target - # Name "mod_lua_lib - Win32 DLL Unicode Debug Monolithic" - # Name "mod_lua_lib - Win32 DLL Unicode Debug Multilib" - # Name "mod_lua_lib - Win32 DLL Unicode Release Monolithic" - # Name "mod_lua_lib - Win32 DLL Unicode Release Multilib" - # Name "mod_lua_lib - Win32 DLL Debug Monolithic" - # Name "mod_lua_lib - Win32 DLL Debug Multilib" - # Name "mod_lua_lib - Win32 DLL Release Monolithic" - # Name "mod_lua_lib - Win32 DLL Release Multilib" # Name "mod_lua_lib - Win32 Unicode Debug Monolithic" # Name "mod_lua_lib - Win32 Unicode Debug Multilib" --- 223,226 ---- Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** makefile.bcc 14 May 2006 12:55:56 -0000 1.43 --- makefile.bcc 20 May 2006 13:12:34 -0000 1.44 *************** *** 100,103 **** --- 100,108 ---- !endif + # Compile the lua module ? [0,1] + !ifndef USE_LUAMODULE + USE_LUAMODULE = 1 + !endif + [...1097 lines suppressed...] ! $(CC) -q -c -P- -o$@ $(LUA_DLL_CFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\lua_dll_lstrlib.obj: ..\..\lua\src\lstrlib.c ! $(CC) -q -c -P- -o$@ $(LUA_DLL_CFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\lua_dll_loadlib.obj: ..\..\lua\src\loadlib.c ! $(CC) -q -c -P- -o$@ $(LUA_DLL_CFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\lua_dll_linit.obj: ..\..\lua\src\linit.c ! $(CC) -q -c -P- -o$@ $(LUA_DLL_CFLAGS) $** borland$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj: ..\..\wxlua\src\wxlcallb.cpp *************** *** 1019,1020 **** --- 1457,1461 ---- $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\mod_luamodule_luamodule.obj: ..\..\luamodule\src\luamodule.cpp + $(CXX) -q -c -P -o$@ $(MOD_LUAMODULE_CXXFLAGS) $** + Index: modules_mod_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxlua.dsp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** modules_mod_wxlua.dsp 19 Feb 2006 10:42:37 -0000 1.21 --- modules_mod_wxlua.dsp 20 May 2006 13:12:35 -0000 1.22 *************** *** 56,71 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug ! # ADD LINK32 wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Debug Multilib" --- 56,71 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_lua.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug ! # ADD LINK32 wxlua_msw26ud_lua.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Debug Multilib" *************** *** 81,96 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug ! # ADD LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release Monolithic" --- 81,96 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug ! # ADD LINK32 wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release Monolithic" *************** *** 106,121 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" ! # ADD LINK32 wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release Multilib" --- 106,121 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_lua.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" ! # ADD LINK32 wxlua_msw26u_lua.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release Multilib" *************** *** 131,146 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" ! # ADD LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug Monolithic" --- 131,146 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" ! # ADD LINK32 wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug Monolithic" *************** *** 156,171 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.lib" /debug ! # ADD LINK32 wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug Multilib" --- 156,171 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_lua.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.lib" /debug ! # ADD LINK32 wxlua_msw26d_lua.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug Multilib" *************** *** 181,196 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.lib" /debug ! # ADD LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release Monolithic" --- 181,196 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.lib" /debug ! # ADD LINK32 wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release Monolithic" *************** *** 206,221 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.lib" ! # ADD LINK32 wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release Multilib" --- 206,221 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_lua.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.lib" ! # ADD LINK32 wxlua_msw26_lua.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release Multilib" *************** *** 231,246 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.lib" ! # ADD LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Debug Monolithic" --- 231,246 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_lua.lib wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.lib" ! # ADD LINK32 wxlua_msw26_lua.lib wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Debug Monolithic" Index: modules_mod_lua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_lua.dsp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** modules_mod_lua.dsp 29 Mar 2006 18:41:42 -0000 1.18 --- modules_mod_lua.dsp 20 May 2006 13:12:35 -0000 1.19 *************** *** 63,68 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 ..\..\..\lib\vc_lib\wxlua_msw26ud_lua.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua-lua.exe" /subsystem:console /debug ! # ADD LINK32 ..\..\..\lib\vc_lib\wxlua_msw26ud_lua.lib /nologo /machine:i... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:12:49
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/modules Modified Files: Makefile.in Log Message: updated all build system trying to fix SHARED builds Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Makefile.in 14 May 2006 12:55:56 -0000 1.36 --- Makefile.in 20 May 2006 13:12:34 -0000 1.37 *************** *** 11,22 **** exec_prefix = @exec_prefix@ INSTALL = @INSTALL@ SHARED_LD_CXX = @SHARED_LD_CXX@ LIBEXT = @LIBEXT@ LIBPREFIX = @LIBPREFIX@ SO_SUFFIX = @SO_SUFFIX@ DLLIMP_SUFFIX = @DLLIMP_SUFFIX@ - EXEEXT = @EXEEXT@ LN_S = @LN_S@ - SETFILE = @SETFILE@ [...1751 lines suppressed...] *************** *** 1288,1294 **** $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/dservice.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_mod_lua_lib uninstall_mod_lua_lib install_mod_lua_lib_headers uninstall_mod_lua_lib_headers install_mod_lua uninstall_mod_lua install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers wxbindsrc wxbindmake wxbindsetup --- 1847,1856 ---- $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/dservice.cpp + mod_luamodule_luamodule.o: $(top_srcdir)/modules/luamodule/src/luamodule.cpp + $(CXXC) -c -o $@ $(MOD_LUAMODULE_CXXFLAGS) $(top_srcdir)/modules/luamodule/src/luamodule.cpp + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_verbatimlua_lib uninstall_verbatimlua_lib install_verbatimlua_lib_headers uninstall_verbatimlua_lib_headers install_verbatimlua_dll uninstall_verbatimlua_dll install_verbatimlua_dll_headers uninstall_verbatimlua_dll_headers install_lua_lib uninstall_lua_lib install_lua_lib_headers uninstall_lua_lib_headers install_lua_dll uninstall_lua_dll install_lua_dll_headers uninstall_lua_dll_headers install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers install_mod_luamodule uninstall_mod_luamodule wxbindsrc wxbindmake wxbindsetup |
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:12:49
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/apps/build/msw Modified Files: apps.dsw makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated all build system trying to fix SHARED builds Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** makefile.vc 8 May 2006 15:50:47 -0000 1.49 --- makefile.vc 20 May 2006 13:12:34 -0000 1.50 *************** *** 11,17 **** --- 11,23 ---- # ------------------------------------------------------------------------- + # C compiler + CC = cl + # C++ compiler CXX = cl + # Standard flags for CC + CFLAGS = + # Standard flags for C++ CXXFLAGS = *************** *** 80,99 **** ### Variables: ### ! APP_WXLUA_CXXFLAGS = /MD$(____BUILD_9) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) $(____BUILD_7) \ ! $(______BUILD) /Fd..\..\..\bin\wxlua.pdb /I..\..\..\modules /I.\..\..\.. \ ! /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ msvc$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /MD$(____BUILD_9) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) $(____BUILD_7) \ ! $(______BUILD) /Fd..\..\..\bin\wxluaedit.pdb /I..\..\..\modules \ ! /I.\..\..\.. /D_WINDOWS /I$(WXSTEDIT_DIR)\include \ /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ --- 86,123 ---- ### Variables: ### ! APP_LUA_CFLAGS = /MD$(____BUILD_17) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_14) \ ! $(____BUILD_15) $(______BUILD) /Fd..\..\..\bin\wxlua-lua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_CONSOLE /I..\..\..\modules\lua\include \ ! $(CPPFLAGS) $(CFLAGS) ! APP_LUA_OBJECTS = \ ! msvc$(WXLIBPOSTFIX)\app_lua_lua.obj ! APP_LUAVERBATIM_CFLAGS = /MD$(____BUILD_17) /DWIN32 $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ ! /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_14) \ ! $(____BUILD_15) $(______BUILD) /Fd..\..\..\bin\lua5.1.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_CONSOLE /I..\..\..\modules\lua\include \ ! $(CPPFLAGS) $(CFLAGS) ! APP_LUAVERBATIM_OBJECTS = \ ! msvc$(WXLIBPOSTFIX)\app_luaverbatim_lua.obj ! APP_WXLUA_CXXFLAGS = /MD$(____BUILD_17) /DWIN32 $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ ! /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_14) \ ! $(____BUILD_15) $(______BUILD) /Fd..\..\..\bin\wxlua.pdb /I..\..\..\modules \ ! /I.\..\..\.. /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ msvc$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /MD$(____BUILD_17) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_14) \ ! $(____BUILD_15) $(______BUILD) /Fd..\..\..\bin\wxluaedit.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I$(WXSTEDIT_DIR)\include \ /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ *************** *** 101,110 **** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj \ msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /MD$(____BUILD_9) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) $(____BUILD_7) \ ! $(______BUILD) /Fd..\..\..\bin\wxluacan.pdb /I..\..\..\modules /I.\..\..\.. \ ! /D_WINDOWS /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj \ --- 125,135 ---- msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj \ msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /MD$(____BUILD_17) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_14) \ ! $(____BUILD_15) $(______BUILD) /Fd..\..\..\bin\wxluacan.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I..\..\..\modules\wxbind\setup \ ! /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj \ *************** *** 114,123 **** msvc$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj \ msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /MD$(____BUILD_9) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_4) $(____BUILD_7) \ ! $(______BUILD) /Fd..\..\..\bin\wxluafreeze.pdb /I..\..\..\modules \ ! /I.\..\..\.. /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj \ --- 139,148 ---- msvc$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj \ msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /MD$(____BUILD_17) /DWIN32 $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_14) \ ! $(____BUILD_15) $(______BUILD) /Fd..\..\..\bin\wxluafreeze.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj \ *************** *** 145,149 **** !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_9 = /d _UNICODE !endif !if "$(BUILD)" == "debug" --- 170,174 ---- !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_1 = /d _UNICODE !endif !if "$(BUILD)" == "debug" *************** *** 151,155 **** !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_9 = /d __WXDEBUG__ !endif !if "$(SHARED)" == "0" --- 176,180 ---- !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_1 = /d __WXDEBUG__ !endif !if "$(SHARED)" == "0" *************** *** 172,191 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_4 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_4 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_7 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_7 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_8 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_8 = !endif !if "$(BUILD)" == "debug" --- 197,216 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_14 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_14 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_15 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_15 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_16 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_16 = !endif !if "$(BUILD)" == "debug" *************** *** 202,209 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_9 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_9 = !endif !if "$(SHARED)" == "0" --- 227,234 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_17 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_17 = !endif !if "$(SHARED)" == "0" *************** *** 332,336 **** ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 357,361 ---- ### Targets: ### ! all: ..\..\..\bin\wxlua-lua.exe ..\..\..\bin\lua5.1.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 338,341 **** --- 363,372 ---- -if exist msvc$(WXLIBPOSTFIX)\*.res del msvc$(WXLIBPOSTFIX)\*.res -if exist msvc$(WXLIBPOSTFIX)\*.pch del msvc$(WXLIBPOSTFIX)\*.pch + -if exist ..\..\..\bin\wxlua-lua.exe del ..\..\..\bin\wxlua-lua.exe + -if exist ..\..\..\bin\wxlua-lua.ilk del ..\..\..\bin\wxlua-lua.ilk + -if exist ..\..\..\bin\wxlua-lua.pdb del ..\..\..\bin\wxlua-lua.pdb + -if exist ..\..\..\bin\lua5.1.exe del ..\..\..\bin\lua5.1.exe + -if exist ..\..\..\bin\lua5.1.ilk del ..\..\..\bin\lua5.1.ilk + -if exist ..\..\..\bin\lua5.1.pdb del ..\..\..\bin\lua5.1.pdb -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe -if exist ..\..\..\bin\wxlua.ilk del ..\..\..\bin\wxlua.ilk *************** *** 351,357 **** -if exist ..\..\..\bin\wxluafreeze.pdb del ..\..\..\bin\wxluafreeze.pdb !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << --- 382,398 ---- -if exist ..\..\..\bin\wxluafreeze.pdb del ..\..\..\bin\wxluafreeze.pdb + ..\..\..\bin\wxlua-lua.exe: $(APP_LUA_OBJECTS) + link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_16) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:CONSOLE @<< + $(APP_LUA_OBJECTS) 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 wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib + << + + ..\..\..\bin\lua5.1.exe: $(APP_LUAVERBATIM_OBJECTS) + link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_16) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:CONSOLE @<< + $(APP_LUAVERBATIM_OBJECTS) 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 lua5.1.lib + << + !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_16) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << *************** *** 360,364 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)\lib @<< $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << --- 401,405 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_16) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)\lib @<< $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << *************** *** 367,371 **** !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << --- 408,412 ---- !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_16) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << *************** *** 374,382 **** !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_8) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** --- 415,429 ---- !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_16) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif + msvc$(WXLIBPOSTFIX)\app_lua_lua.obj: ..\..\..\modules\lua\src\lua.c + $(CC) /c /nologo /TC /Fo$@ $(APP_LUA_CFLAGS) $** + + msvc$(WXLIBPOSTFIX)\app_luaverbatim_lua.obj: ..\..\..\modules\lua\src\lua.c + $(CC) /c /nologo /TC /Fo$@ $(APP_LUAVERBATIM_CFLAGS) $** + msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 386,390 **** msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 433,437 ---- msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 395,399 **** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 442,446 ---- msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 413,417 **** msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 460,464 ---- msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 419,422 **** msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** --- 466,469 ---- msvc$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** makefile.bcc 8 May 2006 15:50:47 -0000 1.49 --- makefile.bcc 20 May 2006 13:12:34 -0000 1.50 *************** *** 20,23 **** --- 20,28 ---- # ------------------------------------------------------------------------- + # C compiler + !ifndef CC + CC = bcc32 + !endif + # C++ compiler !ifndef CXX *************** *** 25,28 **** --- 30,38 ---- !endif + # Standard flags for CC + !ifndef CFLAGS + CFLAGS = + !endif + # Standard flags for C++ !ifndef CXXFLAGS *************** *** 118,125 **** ### Variables: ### APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_3) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ --- 128,151 ---- ### Variables: ### + APP_LUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ + -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\lua\include $(CPPFLAGS) \ + $(CFLAGS) + APP_LUA_OBJECTS = \ + borland$(WXLIBPOSTFIX)\app_lua_lua.obj + APP_LUAVERBATIM_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ + -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\lua\include $(CPPFLAGS) \ + $(CFLAGS) + APP_LUAVERBATIM_OBJECTS = \ + borland$(WXLIBPOSTFIX)\app_luaverbatim_lua.obj APP_WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ *************** *** 129,133 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_3) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT_DIR)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) --- 155,159 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT_DIR)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) *************** *** 138,142 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_3) \ -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) --- 164,168 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 150,154 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_3) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ --- 176,180 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ *************** *** 176,180 **** !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_9 = -d_UNICODE !endif !if "$(BUILD)" == "debug" --- 202,206 ---- !endif !if "$(UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_1 = -d_UNICODE !endif !if "$(BUILD)" == "debug" *************** *** 182,186 **** !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_9 = -d__WXDEBUG__ !endif !if "$(SHARED)" == "0" --- 208,212 ---- !endif !if "$(BUILD)" == "debug" ! __WXDEBUG_DEFINE_p_1 = -d__WXDEBUG__ !endif !if "$(SHARED)" == "0" *************** *** 320,327 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_3 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_3 = -v- !endif --- 346,353 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_7 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_7 = -v- !endif *************** *** 333,337 **** ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 359,363 ---- ### Targets: ### ! all: ..\..\..\bin\wxlua-lua.exe ..\..\..\bin\lua5.1.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 339,342 **** --- 365,380 ---- -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm + -if exist ..\..\..\bin\wxlua-lua.exe del ..\..\..\bin\wxlua-lua.exe + -if exist ..\..\..\bin\wxlua-lua.tds del ..\..\..\bin\wxlua-lua.tds + -if exist ..\..\..\bin\wxlua-lua.ilc del ..\..\..\bin\wxlua-lua.ilc + -if exist ..\..\..\bin\wxlua-lua.ild del ..\..\..\bin\wxlua-lua.ild + -if exist ..\..\..\bin\wxlua-lua.ilf del ..\..\..\bin\wxlua-lua.ilf + -if exist ..\..\..\bin\wxlua-lua.ils del ..\..\..\bin\wxlua-lua.ils + -if exist ..\..\..\bin\lua5.1.exe del ..\..\..\bin\lua5.1.exe + -if exist ..\..\..\bin\lua5.1.tds del ..\..\..\bin\lua5.1.tds + -if exist ..\..\..\bin\lua5.1.ilc del ..\..\..\bin\lua5.1.ilc + -if exist ..\..\..\bin\lua5.1.ild del ..\..\..\bin\lua5.1.ild + -if exist ..\..\..\bin\lua5.1.ilf del ..\..\..\bin\lua5.1.ilf + -if exist ..\..\..\bin\lua5.1.ils del ..\..\..\bin\lua5.1.ils -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe -if exist ..\..\..\bin\wxlua.tds del ..\..\..\bin\wxlua.tds *************** *** 364,370 **** -if exist ..\..\..\bin\wxluafreeze.ils del ..\..\..\bin\wxluafreeze.ils !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | --- 402,418 ---- -if exist ..\..\..\bin\wxluafreeze.ils del ..\..\..\bin\wxluafreeze.ils + ..\..\..\bin\wxlua-lua.exe: $(APP_LUA_OBJECTS) + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -ap @&&| + c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, + | + + ..\..\..\bin\lua5.1.exe: $(APP_LUAVERBATIM_OBJECTS) + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -ap @&&| + c0x32.obj $(APP_LUAVERBATIM_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32.lib,, + | + !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | *************** *** 373,377 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa -L$(WXSTEDIT_DIR)\lib @&&| c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | --- 421,425 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa -L$(WXSTEDIT_DIR)\lib @&&| c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | *************** *** 380,384 **** !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res | --- 428,432 ---- !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res | *************** *** 387,395 **** !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res | !endif borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** --- 435,449 ---- !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\bin\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res | !endif + borland$(WXLIBPOSTFIX)\app_lua_lua.obj: ..\..\..\modules\lua\src\lua.c + $(CC) -q -c -P- -o$@ $(APP_LUA_CFLAGS) $** + + borland$(WXLIBPOSTFIX)\app_luaverbatim_lua.obj: ..\..\..\modules\lua\src\lua.c + $(CC) -q -c -P- -o$@ $(APP_LUAVERBATIM_CFLAGS) $** + borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 399,403 **** borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 453,457 ---- borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 408,412 **** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 462,466 ---- borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 426,430 **** borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 480,484 ---- borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 432,435 **** borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_9) $(__WXDEBUG_DEFINE_p_9) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** --- 486,489 ---- borland$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** Index: apps.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps.dsw,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** apps.dsw 12 Apr 2006 18:04:05 -0000 1.9 --- apps.dsw 20 May 2006 13:12:34 -0000 1.10 *************** *** 3,6 **** --- 3,30 ---- ############################################################################### + Project: "app_lua"=apps_app_lua.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + + Project: "app_luaverbatim"=apps_app_luaverbatim.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "app_wxlua"=apps_app_wxlua.dsp - Package Owner=<4> Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** makefile.wat 8 May 2006 15:50:47 -0000 1.50 --- makefile.wat 20 May 2006 13:12:34 -0000 1.51 *************** *** 11,17 **** --- 11,23 ---- # ------------------------------------------------------------------------- + # C compiler + CC = wcc386 + # C++ compiler CXX = wpp386 + # Standard flags for CC + CFLAGS = + # Standard flags for C++ CXXFLAGS = *************** *** 121,130 **** __app_wxluafreeze___depname = ..\..\..\bin\wxluafreeze.exe !endif ! ____BUILD_4 = !ifeq BUILD debug ! ____BUILD_4 = -wx !endif !ifeq BUILD release ! ____BUILD_4 = !endif ____BUILD = --- 127,136 ---- __app_wxluafreeze___depname = ..\..\..\bin\wxluafreeze.exe !endif ! ____BUILD_9 = !ifeq BUILD debug ! ____BUILD_9 = -wx !endif !ifeq BUILD release ! ____BUILD_9 = !endif ____BUILD = *************** *** 135,151 **** ____BUILD = -ot -ox !endif ! ____BUILD_3 = !ifeq BUILD debug ! ____BUILD_3 = -d2 !endif !ifeq BUILD release ! ____BUILD_3 = -d0 !endif ! ____BUILD_5 = !ifeq BUILD debug ! ____BUILD_5 = debug all !endif !ifeq BUILD release ! ____BUILD_5 = !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = --- 141,157 ---- ____BUILD = -ot -ox !endif ! ____BUILD_10 = !ifeq BUILD debug ! ____BUILD_10 = -d2 !endif !ifeq BUILD release ! ____BUILD_10 = -d0 !endif ! ____BUILD_11 = !ifeq BUILD debug ! ____BUILD_11 = debug all !endif !ifeq BUILD release ! ____BUILD_11 = !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = *************** *** 428,435 **** ### Variables: ### APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_4) $(____BUILD) & ! $(____BUILD_3) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & --- 434,455 ---- ### Variables: ### + APP_LUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & + -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & + -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_9) $(____BUILD) & + $(____BUILD_10) -i=..\..\..\modules -i=.\..\..\.. & + -i=..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) + APP_LUA_OBJECTS = & + watcom$(WXLIBPOSTFIX)\app_lua_lua.obj + APP_LUAVERBATIM_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & + -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & + -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_9) $(____BUILD) & + $(____BUILD_10) -i=..\..\..\modules -i=.\..\..\.. & + -i=..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) + APP_LUAVERBATIM_OBJECTS = & + watcom$(WXLIBPOSTFIX)\app_luaverbatim_lua.obj APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_9) $(____BUILD) & ! $(____BUILD_10) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & *************** *** 437,443 **** APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_4) $(____BUILD) & ! $(____BUILD_3) -i=..\..\..\modules -i=.\..\..\.. -i=$(WXSTEDIT_DIR)\include & ! -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & --- 457,464 ---- APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_9) $(____BUILD) & ! $(____BUILD_10) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $(CPPFLAGS) & ! $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & *************** *** 445,450 **** APP_WXLUACAN_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_4) $(____BUILD) & ! $(____BUILD_3) -i=..\..\..\modules -i=.\..\..\.. & -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & --- 466,471 ---- APP_WXLUACAN_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_9) $(____BUILD) & ! $(____BUILD_10) -i=..\..\..\modules -i=.\..\..\.. & -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & *************** *** 456,461 **** APP_WXLUAFREEZE_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_4) $(____BUILD) & ! $(____BUILD_3) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj --- 477,482 ---- APP_WXLUAFREEZE_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_9) $(____BUILD) & ! $(____BUILD_10) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluafreeze_wxluafreeze.obj *************** *** 468,472 **** ### Targets: ### ! all : .SYMBOLIC $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC --- 489,493 ---- ### Targets: ### ! all : .SYMBOLIC ..\..\..\bin\wxlua-lua.exe ..\..\..\bin\lua5.1.exe $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC *************** *** 476,479 **** --- 497,502 ---- -if exist watcom$(WXLIBPOSTFIX)\*.ilk del watcom$(WXLIBPOSTFIX)\*.ilk -if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch + -if exist ..\..\..\bin\wxlua-lua.exe del ..\..\..\bin\wxlua-lua.exe + -if exist ..\..\..\bin\lua5.1.exe del ..\..\..\bin\lua5.1.exe -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe -if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe *************** *** 481,484 **** --- 504,529 ---- -if exist ..\..\..\bin\wxluafreeze.exe del ..\..\..\bin\wxluafreeze.exe + ..\..\..\bin\wxlua-lua.exe : $(APP_LUA_OBJECTS) + @%create watcom$(WXLIBPOSTFIX)\app_lua.lbc + @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc option quiet + @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc name $^@ + @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc option caseexact + @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_11) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt ref 'main_' + @for %i in ($(APP_LUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc file %i + @for %i in ( wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib) do @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc library %i + @%append watcom$(WXLIBPOSTFIX)\app_lua.lbc + wlink @watcom$(WXLIBPOSTFIX)\app_lua.lbc + + ..\..\..\bin\lua5.1.exe : $(APP_LUAVERBATIM_OBJECTS) + @%create watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc + @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc option quiet + @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc name $^@ + @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc option caseexact + @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_11) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt ref 'main_' + @for %i in ($(APP_LUAVERBATIM_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc file %i + @for %i in ( wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib) do @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc library %i + @%append watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc + wlink @watcom$(WXLIBPOSTFIX)\app_luaverbatim.lbc + !ifeq USE_WXBINDSTC 1 !ifeq USE_WXLUAAPP 1 *************** *** 489,493 **** @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_5) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i --- 534,538 ---- @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_11) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i *************** *** 505,509 **** @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_5) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc library %i --- 550,554 ---- @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_11) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:12:49
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated all build system trying to fix SHARED builds Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** makefile.vc 12 Apr 2006 18:04:05 -0000 1.33 --- makefile.vc 20 May 2006 13:12:34 -0000 1.34 *************** *** 11,14 **** --- 11,32 ---- # ------------------------------------------------------------------------- + # C compiler + CC = cl + + # C++ compiler + CXX = cl + + # Standard flags for CC + CFLAGS = + + # Standard flags for C++ + CXXFLAGS = + + # Standard preprocessor flags (common for CC and CXX) + CPPFLAGS = + + # Standard linker flags + LDFLAGS = + # Builds in debug mode [debug,release] # debug - Release *************** *** 51,54 **** --- 69,75 ---- USE_WXLUASOCKET = 1 + # Compile the lua module ? [0,1] + USE_LUAMODULE = 1 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 80,86 **** WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 101,107 ---- WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" *************** *** 156,157 **** --- 177,182 ---- cd ..\build\msw + + !if "$(SHARED)" == "1" && "$(WX_SHARED)" == "0" + !error Cannot build a SHARED version of wxLua (SHARED is 1) against a static version of wxWidgets (WX_SHARED is 0) ! You can only do the opposite (STATIC build of wxLua against SHARED build of wxWidgets) + !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** makefile.bcc 12 Apr 2006 18:04:05 -0000 1.30 --- makefile.bcc 20 May 2006 13:12:34 -0000 1.31 *************** *** 105,108 **** --- 105,113 ---- !endif + # Compile the lua module ? [0,1] + !ifndef USE_LUAMODULE + USE_LUAMODULE = 1 + !endif + # Compile the wxLua app ? [0,1] !ifndef USE_WXLUAAPP *************** *** 145,151 **** -DUSE_APPS="$(USE_APPS)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \ -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" -DWXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ -DUSE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 150,156 ---- -DUSE_APPS="$(USE_APPS)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \ -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \ ! -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! -DWXSTEDIT_DIR="$(WXSTEDIT_DIR)" -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ -DUSE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** makefile.wat 12 Apr 2006 18:04:05 -0000 1.32 --- makefile.wat 20 May 2006 13:12:34 -0000 1.33 *************** *** 11,14 **** --- 11,32 ---- # ------------------------------------------------------------------------- + # C compiler + CC = wcc386 + + # C++ compiler + CXX = wpp386 + + # Standard flags for CC + CFLAGS = + + # Standard flags for C++ + CXXFLAGS = + + # Standard preprocessor flags (common for CC and CXX) + CPPFLAGS = + + # Standard linker flags + LDFLAGS = + # Builds in debug mode [debug,release] # debug - Release *************** *** 51,54 **** --- 69,75 ---- USE_WXLUASOCKET = 1 + # Compile the lua module ? [0,1] + USE_LUAMODULE = 1 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 118,124 **** WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_WXLUAAPP="$(USE_WXLUAAPP)" & ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" & ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 139,145 ---- WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" & ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" & ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** makefile.gcc 12 Apr 2006 18:04:05 -0000 1.31 --- makefile.gcc 20 May 2006 13:12:34 -0000 1.32 *************** *** 11,14 **** --- 11,32 ---- # ------------------------------------------------------------------------- + # C compiler + CC = gcc + + # C++ compiler + CXX = g++ + + # Standard flags for CC + CFLAGS = + + # Standard flags for C++ + CXXFLAGS = + + # Standard preprocessor flags (common for CC and CXX) + CPPFLAGS = + + # Standard linker flags + LDFLAGS = + # Builds in debug mode [debug,release] BUILD = debug *************** *** 44,47 **** --- 62,68 ---- USE_WXLUASOCKET = 1 + # Compile the lua module ? [0,1] + USE_LUAMODULE = 1 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 73,79 **** WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 94,100 ---- WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" |
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:12:49
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/build/bakefiles Modified Files: wxluabase.bkl Log Message: updated all build system trying to fix SHARED builds Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxluabase.bkl 4 Mar 2006 14:23:41 -0000 1.21 --- wxluabase.bkl 20 May 2006 13:12:34 -0000 1.22 *************** *** 31,35 **** NOTE: wxLua version is stored in the following variable, WXLUA_RELEASE, and in ! 1) build\autoconf\configure.ac 2) build\innosetup\wxlua.iss files. Remember to update all of them ! --- 31,35 ---- NOTE: wxLua version is stored in the following variable, WXLUA_RELEASE, and in ! 1) build\autoconf\configure.ac 2) build\innosetup\wxlua.iss files. Remember to update all of them ! |
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:12:49
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/apps/build/bakefiles Modified Files: apps.bkl Log Message: updated all build system trying to fix SHARED builds Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** apps.bkl 20 May 2006 11:33:40 -0000 1.39 --- apps.bkl 20 May 2006 13:12:34 -0000 1.40 *************** *** 42,45 **** --- 42,48 ---- <!-- ================================================================== --> + <set var="LUA_SRC">../modules/lua/src/lua.c</set> + <set var="LUA_HDR"></set> + <set var="WXLUAAPP_SRC">$(fileList('wxlua/src/*.cpp'))</set> <set var="WXLUAAPP_HDR">$(fileList('wxlua/src/*.h'))</set> *************** *** 72,75 **** --- 75,133 ---- + <!-- ================================================================== --> + <!-- The LUA interpreter target --> + <!-- ================================================================== --> + + <exe id="app_lua" template="wxlua"> + <app-type>console</app-type> + <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> + <install-to>$(BINDIR)</install-to> + + <srcdir>$(WXLUA_APPSDIR)</srcdir> + <sources>$(LUA_SRC)</sources> + <headers>$(LUA_HDR)</headers> + + <!-- see modules/build/bakefiles/options.bkl for these --> + <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> + <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + + <!-- avoid overwriting user's lua --> + <include>$(WXLUA_APPSDIR)/../modules/lua/include</include> + <exename>wxlua-lua</exename> + <wxlua-lib>lua</wxlua-lib> + + <if cond="TARGETING_WIN32=='0'"> + <!-- we require the standard MATH library to build the lua sources --> + <sys-lib>m</sys-lib> + </if> + </exe> + + <exe id="app_luaverbatim" template="wxlua"> + <app-type>console</app-type> + <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> + <install-to>$(BINDIR)</install-to> + + <srcdir>$(WXLUA_APPSDIR)</srcdir> + <sources>$(LUA_SRC)</sources> + <headers>$(LUA_HDR)</headers> + + <!-- see modules/build/bakefiles/options.bkl for these --> + <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> + <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + + <!-- avoid overwriting user's lua --> + <include>$(WXLUA_APPSDIR)/../modules/lua/include</include> + <exename>lua5.1</exename> + <sys-lib>lua5.1</sys-lib> + + <if cond="TARGETING_WIN32=='0'"> + <!-- we require the standard MATH library to build the lua sources --> + <sys-lib>m</sys-lib> + </if> + </exe> + + + + <!-- ================================================================== --> |
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:12:49
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/apps Modified Files: Makefile.in Log Message: updated all build system trying to fix SHARED builds Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Makefile.in 8 May 2006 15:50:47 -0000 1.39 --- Makefile.in 20 May 2006 13:12:34 -0000 1.40 *************** *** 21,28 **** --- 21,31 ---- bindir = @bindir@ LDFLAGS_GUI = @LDFLAGS_GUI@ + CC = @CC@ CXX = @CXX@ + CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ + WX_CFLAGS = @WX_CFLAGS@ WX_CXXFLAGS = @WX_CXXFLAGS@ WX_LIBS = @WX_LIBS@ *************** *** 32,39 **** --- 35,54 ---- WX_VERSION_MINOR = @WX_VERSION_MINOR@ WX_GTKPORT_VERSION = @WX_GTKPORT_VERSION@ + LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ + LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ ### Variables: ### DESTDIR = + APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ + -I$(top_srcdir)/apps/../modules/lua/include $(WX_CFLAGS) \ + $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) + APP_LUA_OBJECTS = \ + app_lua_lua.o + APP_LUAVERBATIM_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ + -I$(top_srcdir)/apps/../modules/lua/include $(WX_CFLAGS) \ + $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) + APP_LUAVERBATIM_OBJECTS = \ + app_luaverbatim_lua.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ $(CPPFLAGS) $(CXXFLAGS) *************** *** 65,70 **** ### Conditionally set variables: ### ! @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_WX_PORT_GTK@WX_PORT_WITHVERSION = $(WX_PORT)$(WX_GTKPORT_VERSION) @COND_WX_PORT_MSW@WX_PORT_WITHVERSION = $(WX_PORT) --- 80,87 ---- ### Conditionally set variables: ### ! @COND_DEPS_TRACKING_0@CCC = $(CC) ! @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CXXC = $(CXX) + @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_WX_PORT_GTK@WX_PORT_WITHVERSION = $(WX_PORT)$(WX_GTKPORT_VERSION) @COND_WX_PORT_MSW@WX_PORT_WITHVERSION = $(WX_PORT) *************** *** 76,79 **** --- 93,101 ---- @COND_BUILD_DEBUG_UNICODE_0@WXLIBPOSTFIX = d @COND_BUILD_RELEASE_UNICODE_1@WXLIBPOSTFIX = u + @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ + @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL \ + @COND_PLATFORM_MAC_1@ $(top_builddir)bin/wxlua-lua$(EXEEXT) + @COND_PLATFORM_MAC_1@__app_luaverbatim___mac_setfilecmd \ + @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL $(top_builddir)bin/lua5.1$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ *************** *** 136,146 **** ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) ! install: all $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) --- 158,170 ---- ### Targets: ### ! all: $(top_builddir)bin/wxlua-lua$(EXEEXT) $(top_builddir)bin/lua5.1$(EXEEXT) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) ! install: all install_app_lua install_app_luaverbatim $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua uninstall_app_luaverbatim $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install + $(STRIP) $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) + $(STRIP) $(DESTDIR)$(bindir)/lua5.1$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) *************** *** 151,154 **** --- 175,180 ---- rm -rf ./.deps ./.pch rm -f ./*.o + rm -f $(top_builddir)bin/wxlua-lua$(EXEEXT) + rm -f $(top_builddir)bin/lua5.1$(EXEEXT) rm -f $(top_builddir)bin/wxlua$(EXEEXT) rm -f $(top_builddir)bin/wxluaedit$(EXEEXT) *************** *** 159,162 **** --- 185,212 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile + $(top_builddir)bin/wxlua-lua$(EXEEXT): $(APP_LUA_OBJECTS) + $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lm + + $(__app_lua___mac_setfilecmd) + + install_app_lua: + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) + + uninstall_app_lua: + rm -f $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) + + $(top_builddir)bin/lua5.1$(EXEEXT): $(APP_LUAVERBATIM_OBJECTS) + $(CC) -o $@ $(APP_LUAVERBATIM_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -llua5.1 -lm + + $(__app_luaverbatim___mac_setfilecmd) + + install_app_luaverbatim: + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) $(top_builddir)bin/lua5.1$(EXEEXT) $(DESTDIR)$(bindir) + + uninstall_app_luaverbatim: + rm -f $(DESTDIR)$(bindir)/lua5.1$(EXEEXT) + @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) *************** *** 211,214 **** --- 261,270 ---- @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) + app_lua_lua.o: $(top_srcdir)/apps/../modules/lua/src/lua.c + $(CCC) -c -o $@ $(APP_LUA_CFLAGS) $(top_srcdir)/apps/../modules/lua/src/lua.c + + app_luaverbatim_lua.o: $(top_srcdir)/apps/../modules/lua/src/lua.c + $(CCC) -c -o $@ $(APP_LUAVERBATIM_CFLAGS) $(top_srcdir)/apps/../modules/lua/src/lua.c + app_wxlua_wxlua.o: $(top_srcdir)/apps/wxlua/src/wxlua.cpp $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(top_srcdir)/apps/wxlua/src/wxlua.cpp *************** *** 257,259 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze --- 313,315 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_luaverbatim uninstall_app_luaverbatim install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze |
|
From: Francesco M. <fr...@us...> - 2006-05-20 12:18:51
|
Update of /cvsroot/wxlua/wxLua/util/wrapmodule In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22340/util/wrapmodule Added Files: wrapmodule.wx.lua Log Message: added luamodule --- NEW FILE: wrapmodule.wx.lua --- ----------------------------------------------------------------------------- -- Name: wrapmodule.wx.lua -- Purpose: Allow running wxLua programs using require by "appending" wx.wxGetApp():MainLoop() -- Author: John Labenski -- Modified by: -- Created: 05/13/2006 -- RCS-ID: -- Copyright: (c) 2001 John Labenski. All rights reserved. -- Licence: wxWidgets licence ----------------------------------------------------------------------------- -- Usage: $lua wrapmodule.wx.lua wxluaprogram.wx.lua require("wx") assert(arg and arg[1] and (type(arg[1]) == "string"), "Usage: $lua wrapmodule.wx.lua wxluaprogram.wx.lua") dofile(arg[1]) -- ALWAYS call wx.wxGetApp():MainLoop() last to keep the program active -- otherwise the lua program will exit immediately wx.wxGetApp():MainLoop() |
|
From: Francesco M. <fr...@us...> - 2006-05-20 12:18:51
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22340/samples Added Files: luamodule.wx.lua Log Message: added luamodule --- NEW FILE: luamodule.wx.lua --- ----------------------------------------------------------------------------- -- Name: luamodule.wx.lua -- Purpose: Minimal wxLua sample for use as a lua module using require -- Author: John Labenski -- Modified by: -- Created: 05/13/2006 -- RCS-ID: -- Copyright: (c) 2001 John Labenski. All rights reserved. -- Licence: wxWidgets licence ----------------------------------------------------------------------------- -- find the PATH where the "wx" module of wxLua has been installed (Unix-only) -- tmpfilename = os.tmpname() -- os.execute("pkg-config wxlua --variable=libdir >"..tmpfilename) -- for line in io.lines(tmpfilename) do package.cpath = line.."/lua/5.1/?.so" end package.cpath = ";;../lib/?.so;..\lib\?.dll" require("wx") -- simple test of Non GUI elements p = wx.wxPoint(1,2) print("The point is", p:GetX(), p:GetY()) frame = wx.wxFrame(wx.wxNull, -1, "wxLua module sample") -- create a simple file menu so you can exit the program nicely local fileMenu = wx.wxMenu() fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program") local menuBar = wx.wxMenuBar() menuBar:Append(fileMenu, "&File") frame:SetMenuBar(menuBar) frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(true) end ) frame:Show(true) -- ALWAYS call wx.wxGetApp():MainLoop() last to keep the program active -- otherwise the lua program will exit immediately wx.wxGetApp():MainLoop() |
|
From: Francesco M. <fr...@us...> - 2006-05-20 12:18:51
|
Update of /cvsroot/wxlua/wxLua/modules/luamodule/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22340/modules/luamodule/src Added Files: Makefile luamodule.cpp Log Message: added luamodule --- NEW FILE: luamodule.cpp --- ///////////////////////////////////////////////////////////////////////////// // Purpose: wxLuaModuleApp - code to allow wxLua to be used as a module using require"wx" // Author: John Labenski, J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wx.h" #include "wxlua/include/wxlstate.h" extern "C" { int luaopen_wx(lua_State *L); // force C linkage w/o name mangling } static wxLuaState s_wxlState; // This is our wxLuaState for the module // Declare the binding initialization functions as extern so we don't have to // #include the binding header for simplicity. extern bool wxLuaBinding_wx_init(); extern bool wxLuaBinding_wxstc_init(); // ---------------------------------------------------------------------------- // wxLuaModuleApp // ---------------------------------------------------------------------------- class wxLuaModuleApp : public wxApp { public: wxLuaModuleApp() : wxApp() {} // Override the base class virtual functions bool OnInit(); int OnExit(); int MainLoop(); void OnLua( wxLuaEvent &event ); void DisplayError(const wxString &errorStr) const; private: DECLARE_ABSTRACT_CLASS(wxLuaModuleApp); DECLARE_EVENT_TABLE(); }; // ---------------------------------------------------------------------------- // wxLuaModuleApp // ---------------------------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxLuaModuleApp, wxApp); IMPLEMENT_APP_NO_MAIN(wxLuaModuleApp) BEGIN_EVENT_TABLE(wxLuaModuleApp, wxApp) EVT_LUA_PRINT (wxID_ANY, wxLuaModuleApp::OnLua) EVT_LUA_ERROR (wxID_ANY, wxLuaModuleApp::OnLua) //EVT_LUA_DEBUG_HOOK (wxID_ANY, wxLuaModuleApp::OnLua) END_EVENT_TABLE() // Override the base class virtual functions bool wxLuaModuleApp::OnInit() { return true; } int wxLuaModuleApp::OnExit() { int retval = 0; wxApp::OnExit(); return retval; } int wxLuaModuleApp::MainLoop() { // only run the mainloop if there are any toplevel windows int retval = 0; bool initialized = (wxTopLevelWindows.GetCount() != 0); if (initialized) retval = wxApp::MainLoop(); return retval; } void wxLuaModuleApp::OnLua( wxLuaEvent &event ) { DisplayError(event.GetString()); } void wxLuaModuleApp::DisplayError(const wxString &errorStr) const { #ifdef __WXMSW__ wxMessageBox(errorStr, wxT("wxLua")); #else wxPrintf(wxT("%s\n"), errorStr.c_str()); #endif } // ---------------------------------------------------------------------------- // luaopen_wx the C function for require to call // ---------------------------------------------------------------------------- wxLuaModuleApp* app = NULL; int luaopen_wx(lua_State *L) { // only initialize the wxLuaState once, allows require to be called more than once if (!s_wxlState.Ok()) { int argc = 0; wxChar **argv = NULL; wxEntryStart(argc, argv); wxTheApp->CallOnInit(); wxTheApp->SetExitOnFrameDelete(true); wxInitAllImageHandlers(); wxLuaBinding_wx_init(); s_wxlState.Create(L, WXLUASTATE_SETSTATE); s_wxlState.SetEventHandler((wxEvtHandler*)wxTheApp); } lua_getglobal(L, "wx"); // push global wx table on the stack return 1; } --- NEW FILE: Makefile --- # File: Makefile # Author: John Labenski, J Winwood # Created: 2004 # Updated: # Copyright: (c) 2002. J Winwood # # Makefile for wxLua standalone sample using gmake # --- wxLua parameters ------------------------------------------------------- WXLUA_LIBVERSION_CURRENT = 1 WXLUA_LIBVERSION_REVISION = 5 WXLUA_LIBVERSION_AGE = 0 WXLUA_DIR = ../../.. WXLUA_LIBDIR = $(WXPREFIX)/lib LUA = $(WXLUA_DIR)/bin/lua # --- wxWidgets parameters from wx-config ------------------------------------ WXCONFIG := wx-config WXPREFIX = $(shell $(WXCONFIG) --prefix) WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) WXBASENAME = $(shell $(WXCONFIG) --basename) WXVERSION = $(shell $(WXCONFIG) --version) WXRELEASE = $(shell $(WXCONFIG) --release) WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) WXLDLIBS = $(shell $(WXCONFIG) --libs) WXCXX = $(shell $(WXCONFIG) --cxx) WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall LDLIBS = $(WXLDLIBS) CXX = $(WXCXX) PROGRAM = wx.so LUA_LIBS = $(WXLUA_DIR)/lib/liblua.a WXLUA_LIB = $(WXBASENAME)_wxlua-$(WXRELEASE) WXLUADEBUG_LIB = $(WXBASENAME)_wxluadebug-$(WXRELEASE) WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE) WXLUABIND_LIB = $(WXBASENAME)_wxluabind-$(WXRELEASE) WXLUASTC_LIB = $(WXBASENAME)_wxluastc-$(WXRELEASE) WXSTC_LIB = $(WXBASENAME)_stc-$(WXRELEASE) WXXRC_LIB = $(WXBASENAME)_xrc-$(WXRELEASE) WXFL_LIB = $(WXBASENAME)_fl-$(WXRELEASE) APPEXTRADEFS = -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= -DWXLUA_LUA_NEWTHREAD # This will build a static wxLua app, staticly linked to .a libs #APPEXTRALIBS=-L$(WXLIB_DIR) $(WXLIB_DIR)/lib$(WXLUA_LIB).a $(WXLIB_DIR)/lib$(STC_LIB).a $(WXLIB_DIR)/lib$(WXXRC_LIB).a $(WXLIB_DIR)/lib$(WXFL_LIB).a $(LUA_LIBS) # This will build a shared wxLua app, dynamicly linked to .so libs # -l$(WXFL_LIB) APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUASTC_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) #OBJECTS=luamodule.o #DEPFILES=$(OBJECTS:.o=.d) # NOTE: this works too #wx.so: luamodule.cpp # gcc -I../modules/ `wx-config --cxxflags` -g -O -shared -o wx.so -fpic \ # ~/wx/wx/config_gtk2/lib/libwx_gtk2ud_wxlua-2.7.so \ # ~/wx/wx/config_gtk2/lib/libwx_gtk2ud_wxluabind-2.7.so \ # ~/wx/wx/config_gtk2/lib/libwx_gtk2ud_wxluadebug-2.7.so \ # ~/wx/wx/config_gtk2/lib/libwx_gtk2ud_wxluasocket-2.7.so \ # `wx-config --libs` luamodule.cpp .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings wxSTCBindings wx.so wx.so: luamodule.cpp $(OBJECTS) $(LUA_LIBS) wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(CXX) $(CXXFLAGS) $(APPEXTRADEFS) -g -O -shared -o wx.so -fpic \ $(LDLIBS) $(APPEXTRALIBS) \ luamodule.cpp lua: @(cd $(WXLUA_DIR)/modules/lua && make linux) wxwidgets_bindings: @(cd $(WXLUA_DIR)/bindings/wxwidgets && make) wxstc_bindings: @(cd $(WXLUA_DIR)/bindings/wxstc && make) wxLuaBindings: @(cd $(WXLUA_DIR)/modules/wxbind/src && make) wxSTCBindings: @(cd $(WXLUA_DIR)/modules/wxbindstc/src && make) wxLuaLib: @(cd $(WXLUA_DIR)/modules/wxlua/src && make) wxLuaDebugLib: @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make) wxLuaSocketLib: @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make) clean: rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core cleanall: rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core @(cd $(WXLUA_DIR)/modules/lua && make clean) @(cd $(WXLUA_DIR)/bindings/wxwidgets && make clean) @(cd $(WXLUA_DIR)/modules/wxbind/src && make clean) @(cd $(WXLUA_DIR)/modules/wxbindstc/src && make clean) @(cd $(WXLUA_DIR)/modules/wxlua/src && make clean) @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make clean) @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make clean) #-include $(DEPFILES) |
|
From: Francesco M. <fr...@us...> - 2006-05-20 12:17:00
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21595/build/autoconf Modified Files: aclocal.m4 autoconf_inc.m4 configure.ac Log Message: added luamodule Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** autoconf_inc.m4 8 May 2006 15:50:48 -0000 1.16 --- autoconf_inc.m4 20 May 2006 12:16:53 -0000 1.17 *************** *** 169,172 **** --- 169,178 ---- fi AC_SUBST(COND_USE_BIN2C_1) + dnl ### begin block 20_COND_USE_LUAMODULE_1[../../modules/build/bakefiles/modules.bkl] ### + COND_USE_LUAMODULE_1="#" + if test "x$USE_LUAMODULE" = "x1" ; then + COND_USE_LUAMODULE_1="" + fi + AC_SUBST(COND_USE_LUAMODULE_1) dnl ### begin block 20_COND_USE_SOSYMLINKS_1[../../modules/build/bakefiles/modules.bkl] ### COND_USE_SOSYMLINKS_1="#" Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** configure.ac 14 May 2006 12:55:56 -0000 1.27 --- configure.ac 20 May 2006 12:16:53 -0000 1.28 *************** *** 41,44 **** --- 41,47 ---- [AC_HELP_STRING([--enable-wxluafreeze-app], [Compiles the wxLuaFreeze app (default is yes)])], [], [enable_wxluafreeze_app=yes]) + AC_ARG_ENABLE([luamodule], + [AC_HELP_STRING([--enable-luamodule], [Compiles the lua module (default is yes)])], + [], [enable_luamodule_app=yes]) *************** *** 65,68 **** --- 68,72 ---- AM_YESNO_OPTCHECK([USE_WXLUAEDITAPP], [enable_wxluaedit_app], [--enable-wxluaedit-app]) AM_YESNO_OPTCHECK([USE_WXLUAFREEZEAPP], [enable_wxluafreeze_app], [--enable-wxluafreeze-app]) + AM_YESNO_OPTCHECK([USE_LUAMODULE], [enable_luamodule_app], [--enable-luamodule]) AM_YESNO_OPTCHECK([USE_WXBINDSTC], [enable_wxbindstc], [--enable-wxbindstc]) *************** *** 282,288 **** --- 286,308 ---- AC_BAKEFILE([m4_include(autoconf_inc.m4)]) AC_CONFIG_FILES([Makefile modules/Makefile apps/Makefile build/autoconf/wxlua.pc]) + + # since at least the "luamodule.wx.lua" sample require to be able to find + # the wx.so library in ../lib; thus we need to copy the sample(s) to the + # build directory to preserve the relative path correctness + if [[ ! -z "$srcdir" ]]; then + + AC_MSG_NOTICE([configure: copying $srcdir/samples to ./samples]) + cp -r "$srcdir/samples" samples + + # NB: we don't use AC_CONFIG_LINKS([samples:samples], [cp]) because making + # a symbolic link from $srcdir/samples to samples would not work for + # luamodule.wx.lua (because require("wx") uses the effective path). + fi + AC_OUTPUT + + # output a nice summary of detected options # NOTE: keep build conditions in synch with bakefiles; e.g. app_wxlua is *************** *** 294,297 **** --- 314,318 ---- # applications + echo AM_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], [" - wxLua application: yes"], *************** *** 308,311 **** --- 329,333 ---- # modules + echo AM_BOOLOPT_SUMMARY([USE_WXBINDSTC], [" - wxBindSTC module: yes"], *************** *** 317,321 **** --- 339,348 ---- [" - wxLuaSocket module: yes"], [" - wxLuaSocket module: no"]) + AM_BOOLOPT_SUMMARY([USE_LUAMODULE], + [" - Lua module: yes"], + [" - Lua module: no"]) + # miscellaneous + echo AM_BOOLOPT_SUMMARY([INSTALL_CUSTOM_WXBIND], [" - custom wxBind install: yes"], |
|
From: Francesco M. <fr...@us...> - 2006-05-20 12:04:09
|
Update of /cvsroot/wxlua/wxLua/util/wrapmodule In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17324/wrapmodule Log Message: Directory /cvsroot/wxlua/wxLua/util/wrapmodule added to the repository |
|
From: Francesco M. <fr...@us...> - 2006-05-20 12:03:36
|
Update of /cvsroot/wxlua/wxLua/apps/luamodule/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16983/luamodule/src Removed Files: Makefile luamodule.cpp luamodule.wx.lua wrapmodule.wx.lua Log Message: removed luamodule from APPS for readding it under MODULES --- luamodule.cpp DELETED --- --- wrapmodule.wx.lua DELETED --- --- Makefile DELETED --- --- luamodule.wx.lua DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-05-20 12:03:22
|
Update of /cvsroot/wxlua/wxLua/modules/luamodule/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16963/src Log Message: Directory /cvsroot/wxlua/wxLua/modules/luamodule/src added to the repository |
|
From: Francesco M. <fr...@us...> - 2006-05-20 12:01:59
|
Update of /cvsroot/wxlua/wxLua/modules/luamodule In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16221/luamodule Log Message: Directory /cvsroot/wxlua/wxLua/modules/luamodule added to the repository |
|
From: Francesco M. <fr...@us...> - 2006-05-20 12:01:32
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16179/modules/build/bakefiles Modified Files: common.bkl modules.bkl options.bkl Log Message: Added luamodule; added lua DLL target Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** options.bkl 14 May 2006 12:55:56 -0000 1.11 --- options.bkl 20 May 2006 12:01:26 -0000 1.12 *************** *** 23,27 **** <set var="USE_WXLUADEBUG_DEFAULT">1</set> <set var="USE_WXLUASOCKET_DEFAULT">1</set> ! --- 23,27 ---- <set var="USE_WXLUADEBUG_DEFAULT">1</set> <set var="USE_WXLUASOCKET_DEFAULT">1</set> ! <set var="USE_LUAMODULE_DEFAULT">1</set> *************** *** 51,54 **** --- 51,60 ---- </option> + <option name="USE_LUAMODULE"> + <values>0,1</values> + <default-value>$(USE_LUAMODULE_DEFAULT)</default-value> + <description>Compile the lua module ?</description> + </option> + <if cond="TARGETING_UNIX=='1'"> <option name="INSTALL_CUSTOM_WXBIND"> *************** *** 68,71 **** --- 74,79 ---- <set var="USE_WXLUADEBUG">1</set> <set var="USE_WXLUASOCKET">1</set> + <set var="USE_LUAMODULE">1</set> + <set var="INSTALL_CUSTOM_WXBIND">0</set> </if> Index: common.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** common.bkl 29 Mar 2006 18:41:41 -0000 1.3 --- common.bkl 20 May 2006 12:01:26 -0000 1.4 *************** *** 72,75 **** --- 72,77 ---- <set var="WXLUASOCKET_HDR">$(fileList('wxluasocket/include/*.h'))</set> + <set var="LUAMODULE_SRC">$(fileList('luamodule/src/*.cpp'))</set> + <set var="LUAMODULE_HDR">$(fileList('luamodule/src/*.h'))</set> *************** *** 161,166 **** <msvc-file-group>$(__modname) headers:*.h</msvc-file-group> ! <!-- now, shared stuff --> ! <define>$(value)_MAKINGDLL</define> </define-tag> </define-rule> --- 163,167 ---- <msvc-file-group>$(__modname) headers:*.h</msvc-file-group> ! <define>WXMAKINGDLL_$(value)</define> </define-tag> </define-rule> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** modules.bkl 14 May 2006 12:55:56 -0000 1.30 --- modules.bkl 20 May 2006 12:01:26 -0000 1.31 *************** *** 47,54 **** NOTE: we won't use the lua_lib rule since the LUA module does not follow the same conventions followed by other modules... --> ! <lib id="mod_lua_lib" template="wxbase"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <define>WXLUA_LUA_NEWTHREAD</define> ! <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> --- 47,54 ---- NOTE: we won't use the lua_lib rule since the LUA module does not follow the same conventions followed by other modules... --> ! <lib id="mod_lua_lib" template="wxbase" cond="SHARED=='0'"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <define>WXLUA_LUA_NEWTHREAD</define> ! <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> *************** *** 64,67 **** --- 64,95 ---- <headers-install-to>$(INCLUDEDIR)</headers-install-to> </lib> + <dll id="mod_lua_dll" template="wxbase" cond="SHARED=='1'"> + <srcdir>$(WXLUA_SOURCEDIR)</srcdir> + <define>WXLUA_LUA_NEWTHREAD</define> + + <if cond="TARGETING_WIN32=='1'"> + <define>LUA_BUILD_AS_DLL</define> + </if> + + <!-- The DLL version --> + <version>$(WXLUA_VERSION)</version> + <so_version>$(WXLUA_SOVERSION)</so_version> + <mac_version>$(WXLUA_MACVERSION)</mac_version> + + <!-- see options.bkl for these --> + <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> + <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + + <sources>$(LUALIB_SRC)</sources> + <headers>$(LUALIB_HDR)</headers> + <include>$(WXLUA_SOURCEDIR)/lua/include</include> + <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname> + <wxlike-libname prefix='lua'>lua</wxlike-libname> + <wxlike-dllname prefix='lua'>lua</wxlike-dllname> + + <install-to>$(LIBDIR)</install-to> + <headers-install-to>$(INCLUDEDIR)</headers-install-to> + </dll> + <!-- this is the lua app *************** *** 69,75 **** <exe id="mod_lua" template="wxbase"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> ! <library>mod_lua_lib</library> <sources>$(LUA_SRC)</sources> <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> --- 97,111 ---- <exe id="mod_lua" template="wxbase"> <srcdir>$(WXLUA_SOURCEDIR)</srcdir> ! <wxlua-lib>lua</wxlua-lib> <sources>$(LUA_SRC)</sources> + <if cond="TARGETING_WIN32=='1' or FORMAT=='gnu'"> + <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path> + </if> + <if cond="TARGETING_WIN32=='0' and FORMAT!='gnu'"> + <lib-path>$(top_builddir)$(WXLUA_OUTPUT_FOLDER)</lib-path> + </if> + + <!-- see options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> *************** *** 97,100 **** --- 133,137 ---- <wxlua_stddll id="wxlua_dll" cond="SHARED=='1'"> <module-name>WXLUA</module-name> + <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 105,108 **** --- 142,146 ---- <wxlua_stddll id="wxbind_dll" cond="SHARED=='1'"> <module-name>WXBIND</module-name> + <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 113,116 **** --- 151,155 ---- <wxlua_stddll id="wxbindstc_dll" cond="SHARED=='1' and USE_WXBINDSTC=='1'"> <module-name>WXBINDSTC</module-name> + <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 121,124 **** --- 160,164 ---- <wxlua_stddll id="wxluadebug_dll" cond="SHARED=='1' and USE_WXLUADEBUG=='1'"> <module-name>WXLUADEBUG</module-name> + <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> *************** *** 129,134 **** --- 169,193 ---- <wxlua_stddll id="wxluasocket_dll" cond="SHARED=='1' and USE_WXLUASOCKET=='1'"> <module-name>WXLUASOCKET</module-name> + <wxlua-lib>lua</wxlua-lib> </wxlua_stddll> + <!-- the luamodule --> + <module id="mod_luamodule" template="wxlua" cond="USE_LUAMODULE=='1'"> + <srcdir>$(WXLUA_SOURCEDIR)</srcdir> + <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> + + <!-- $libdir/lua/5.1 looks to be the standard folder for lua modules... --> + <install-to>$(LIBDIR)/lua/5.1</install-to> + + <sources>$(LUAMODULE_SRC)</sources> + <headers>$(LUAMODULE_HDR)</headers> + + <!-- It's important to keep the module name 'wx' to make require("wx") work --> + <dllname>wx</dllname> + + <wxlua-allstdlibs/> + <wx-alllibs-req-bywxlua/> + </module> + <!-- since all the previous targets would generate each one a different DSP project |
