Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2005-11-19 07:08:49
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18351/wxLua/apps/wxlua/src Modified Files: Makefile Makefile_import editor.h wxlua.cpp Log Message: the wxLua app now runs add back wxExecute and add wxProcess add bin2c.lua to generate editor.h for wxlua app Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxlua.cpp 20 Jun 2005 06:55:22 -0000 1.4 --- wxlua.cpp 19 Nov 2005 07:08:39 -0000 1.5 *************** *** 376,382 **** } int wxLuaStandaloneApp::RunEditor() { - #include "editor.h" /* wxFileSystem::AddHandler(new wxMemoryFSHandler); --- 376,383 ---- } + #include "editor.h" + int wxLuaStandaloneApp::RunEditor() { /* wxFileSystem::AddHandler(new wxMemoryFSHandler); *************** *** 390,394 **** lua_setglobal(m_luaState, "standaloneLoadBitmaps"); */ ! return m_luaInterpreter->RunBuffer(wxLuaEditor, sizeof(wxLuaEditor), g_strProgramName); } --- 391,395 ---- lua_setglobal(m_luaState, "standaloneLoadBitmaps"); */ ! return m_luaInterpreter->RunBuffer(wxLuaEditor, wxLuaEditor_len, g_strProgramName); } Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 17 Nov 2005 05:51:20 -0000 1.3 --- Makefile 19 Nov 2005 07:08:38 -0000 1.4 *************** *** 23,26 **** --- 23,27 ---- WXLUA = ../../.. + LUA = $(WXLUA)/bin/lua LUA_LIBS = ../../../lib/liblua.a ../../../lib/liblualib.a *************** *** 85,93 **** ../../../modules/wxbind/src/xml.o - .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua bindings wxLuaLib wxLuaDebugLib wxLuaSocketLib $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) --- 86,93 ---- ../../../modules/wxbind/src/xml.o .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) *************** *** 100,114 **** make -f Makefile_import wxLuaBindings: $(WXLUABINDINGS) $(CXX) -o $@ $(WXLUABINDINGS) $(LDLIBS) $(APPEXTRALIBS) wxLuaLib: ! @(cd ../../../modules/wxlua/src && make) wxLuaDebugLib: ! @(cd ../../../modules/wxluadebug/src && make) wxLuaSocketLib: ! @(cd ../../../modules/wxluasocket/src && make) clean: --- 100,117 ---- make -f Makefile_import + editor: + $(LUA) $(WXLUA)/util/bin2c/bin2c.lua -t $(WXLUA)/samples/editor.wx.lua wxLuaEditor > editor.h + wxLuaBindings: $(WXLUABINDINGS) $(CXX) -o $@ $(WXLUABINDINGS) $(LDLIBS) $(APPEXTRALIBS) wxLuaLib: ! @(cd $(WXLUA)/modules/wxlua/src && make) wxLuaDebugLib: ! @(cd $(WXLUA)/modules/wxluadebug/src && make) wxLuaSocketLib: ! @(cd $(WXLUA)/modules/wxluasocket/src && make) clean: *************** *** 118,125 **** rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core make -f Makefile_import clean ! @(cd ../../../modules/wxlua/src && make clean) ! @(cd ../../../modules/wxluadebug/src && make clean) ! @(cd ../../../modules/wxluasocket/src && make clean) ! -include $(DEPFILES) --- 121,127 ---- rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core make -f Makefile_import clean ! @(cd $(WXLUA)/modules/wxlua/src && make clean) ! @(cd $(WXLUA)/modules/wxluadebug/src && make clean) ! @(cd $(WXLUA)/modules/wxluasocket/src && make clean) -include $(DEPFILES) Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** editor.h 7 Jun 2005 04:17:29 -0000 1.1 --- editor.h 19 Nov 2005 07:08:38 -0000 1.2 *************** *** 1,2582 **** ! /* Editor.wx.luc */ ! static const unsigned char wxLuaEditor[]={ ! 27, 76,117, 97, 80, 1, 4, 4, 4, 6, 8, 9, 9, 8,182, 9,147,104,231,245, ! 125, 65, 8, 0, 0, 0, 61, 40,110,111,110,101, 41, 0, 0, 0, 0, 0, 0, 0, ! 0, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 1, 0, 0, 4, 3, ! 0, 0, 0,119,120, 0, 4, 13, 0, 0, 0,119,120, 73, 68, 95, 72, 73, 71, 72, ! 69, 83, 84, 0, 3, 0, 0, 0, 0, 0, 0,240, 63, 3, 0, 0, 0, 0, 0, 0, ! 0, 64, 3, 0, 0, 0, 0, 0, 0, 8, 64, 3, 0, 0, 0, 0, 0, 0, 16, 64, ! 3, 0, 0, 0, 0, 0, 0, 20, 64, 3, 0, 0, 0, 0, 0, 0, 24, 64, 3, 0, ! 0, 0, 0, 0, 0, 28, 64, 3, 0, 0, 0, 0, 0, 0, 32, 64, 3, 0, 0, 0, [...4647 lines suppressed...] ! 105,102, 32, 97,114,103,115, 32,116,104,101,110, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 76,111, 97,100,101,100, 10, ! 32, 32, 32, 32,112,114,111,103,114, 97,109, 78, 97,109,101, 32, 61, 32, 97,114,103,115, 91, 48, 93, 32, 32, 32, 32, 10, ! 32, 32, 32, 32,102,111,114, 32,105,110,100,101,120, 44, 32,102,105,108,101, 78, 97,109,101, 32,105,110, 32, 97,114,103,115, 32,100,111, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,105,110,100,101,120, 32,126, 61, 32, 34,110, 34, 32, 97,110,100, 32,105,110,100,101,120, 32,126, 61, 32, 48, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 97,100, 70,105,108,101, 40,102,105,108,101, 78, 97,109,101, 44, 32,102,105,108,101, 78, 97,109,101, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,105,108,101, 76,111, 97,100,101,100, 32, 61, 32, 49, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,110,111,116,101, 98,111,111,107, 58, 71,101,116, 80, 97,103,101, 67,111,117,110,116, 40, 41, 32, 62, 32, 48, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,110,111,116,101, 98,111,111,107, 58, 83,101,116, 83,101,108,101, 99,116,105,111,110, 40, 48, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, ! 32, 32, 32, 32,101,110,100, 10, ! 32, 32, 32, 32,105,102, 32,110,111,116, 32,102,105,108,101, 76,111, 97,100,101,100, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 99,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 10, ! 32, 32, 32, 32, 32, 32, 32,115,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 49, 41, 10, ! 32, 32, 32, 32,101,110,100, 10, ! 101,110,100, 10, ! 10, ! 45, 45, 32,102,114, 97,109,101, 58, 83,101,116, 73, 99,111,110, 40,119,120, 76,117, 97, 69,100,105,116,111,114, 73, 99,111,110, 41, 32, 70, 73, 88, 77, 69, 32, 97,100,100, 32,116,104,105,115, 32, 98, 97, 99,107, 0 }; Index: Makefile_import =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile_import,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile_import 17 Nov 2005 05:51:20 -0000 1.2 --- Makefile_import 19 Nov 2005 07:08:38 -0000 1.3 *************** *** 10,14 **** WXLUA = ../../.. ! LUA=$(WXLUA)/lua WXDIR = $(shell wx-config --prefix) --- 10,14 ---- WXLUA = ../../.. ! LUA=$(WXLUA)/bin/lua WXDIR = $(shell wx-config --prefix) *************** *** 19,35 **** THEWRAPPERS=$(addprefix $(WXLUA)/bindings/wxwidgets/, $(WRAPPERS)) ! all: genwxbind ! DEPFILES = luasetup.h.in # $(WXLUA)/bindings/genwxbind.lua $(WXLUA)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) # This is depricated and does not currenly generate bindings that work with wxLua wxluawrap.cpp: $(DEPFILES) ! $(WXLUA)/bin/lua -e"target=\"gtk\"; wxWinDir=\"$(WXDIR)\"; wxCxxFlags=\"$(WXCXXFLAGS)\"" wrap.lua genwxbind: $(DEPFILES) ! @(cd ../../../bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt) #clean: # rm -f wxluawrap.cpp - --- 19,35 ---- THEWRAPPERS=$(addprefix $(WXLUA)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=luasetup.h.in $(WXLUA)/bindings/genwxbind.lua $(WXLUA)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) ! all: genwxbind # This is depricated and does not currenly generate bindings that work with wxLua wxluawrap.cpp: $(DEPFILES) ! $(LUA) -e"target=\"gtk\"; wxWinDir=\"$(WXDIR)\"; wxCxxFlags=\"$(WXCXXFLAGS)\"" wrap.lua genwxbind: $(DEPFILES) ! @(cd $(WXLUA)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt) #clean: # rm -f wxluawrap.cpp + # -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2005-11-19 07:08:49
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18351/wxLua/modules/wxlua/src Modified Files: internal.cpp interp.cpp Log Message: the wxLua app now runs add back wxExecute and add wxProcess add bin2c.lua to generate editor.h for wxlua app Index: interp.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/interp.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** interp.cpp 23 Aug 2005 21:27:18 -0000 1.5 --- interp.cpp 19 Nov 2005 07:08:39 -0000 1.6 *************** *** 702,706 **** m_is_running = TRUE; ! //int ret_val = luaL_loadbuffer(m_lua_State, wx2lua(script), script.Len(), "=hello"); int ret_val = lua_dobuffer(m_lua_State, (const char*)buf, size, wx2lua(name)); m_is_running = FALSE; --- 702,706 ---- m_is_running = TRUE; ! //int ret_val = luaL_loadbuffer(m_lua_State, (const char*)buf, size, wx2lua(name)); int ret_val = lua_dobuffer(m_lua_State, (const char*)buf, size, wx2lua(name)); m_is_running = FALSE; Index: internal.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** internal.cpp 17 Nov 2005 05:51:20 -0000 1.4 --- internal.cpp 19 Nov 2005 07:08:39 -0000 1.5 *************** *** 57,62 **** #include "wxlua/include/interp.h" - //#include "wxlua/include/htmlwin.h" - //#include "wxlua/include/library.h" // lua registry table --- 57,60 ---- *************** *** 199,202 **** --- 197,202 ---- *pClass->class_tag = iTag; + //wxPrintf(wxT("RegisterGenClasses %d '%s'\n"), iTag, lua2wx(pClass->name).c_str()); + for (unsigned iFunction = 0; iFunction < funcCount; iFunction++) { *************** *** 1394,1398 **** error: ! terror(L, wx2lua(wxString::Format(_("wxLua: Unexpected user defined data type for parameter %d."), iParam))); return NULL; } --- 1394,1398 ---- error: ! terror(L, wx2lua(wxString::Format(_("wxLua: Unexpected user defined data type %d for parameter %d."), iParamTag, iParam))); return NULL; } |
|
From: John L. <jr...@us...> - 2005-11-17 05:51:29
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7199/wxLua/modules/wxluadebug/include Modified Files: staktree.h Log Message: update for wx26/27 Add bindings for builtin (global) functions Handle %if statements for enums Index: staktree.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/staktree.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** staktree.h 7 Jun 2005 04:17:40 -0000 1.2 --- staktree.h 17 Nov 2005 05:51:20 -0000 1.3 *************** *** 42,46 **** wxLuaInterface *luaInterface); ! ~wxLuaStackFrame(); void OnSizeWindow(wxSizeEvent& event); --- 42,46 ---- wxLuaInterface *luaInterface); ! virtual ~wxLuaStackFrame(); void OnSizeWindow(wxSizeEvent& event); *************** *** 109,120 **** const wxSize &sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS); ! ~wxLuaStackTree(); ! ! void DeleteAllItems(); ! ! DECLARE_EVENT_TABLE() private: wxImageList* m_imageList; }; --- 109,117 ---- const wxSize &sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS); ! virtual ~wxLuaStackTree(); private: wxImageList* m_imageList; + DECLARE_EVENT_TABLE() }; |
|
From: John L. <jr...@us...> - 2005-11-17 05:51:29
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7199/wxLua/modules/wxluadebug/src Modified Files: splttree.cpp Log Message: update for wx26/27 Add bindings for builtin (global) functions Handle %if statements for enums Index: splttree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** splttree.cpp 18 Jun 2005 20:46:00 -0000 1.3 --- splttree.cpp 17 Nov 2005 05:51:21 -0000 1.4 *************** *** 551,558 **** tempDC.Clear(); wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID); tempDC.SetPen(pen); tempDC.SetBrush(*wxTRANSPARENT_BRUSH); - wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); tempDC.SetFont(font); --- 551,564 ---- tempDC.Clear(); + #if wxCHECK_VERSION(2,6,0) + wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID); + wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); + #else //!wxCHECK_VERSION(2,6,0) wxPen pen(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID); + wxFont font(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + #endif //wxCHECK_VERSION(2,6,0) + tempDC.SetPen(pen); tempDC.SetBrush(*wxTRANSPARENT_BRUSH); tempDC.SetFont(font); |
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7199/wxLua/bindings/wxwidgets Modified Files: appframe.i controls.i data.i datetime.i defsutil.i dialogs.i gdi.i mdi.i override.hpp print.i windows.i wx.rules Log Message: update for wx26/27 Add bindings for builtin (global) functions Handle %if statements for enums Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** appframe.i 18 Jun 2005 20:45:58 -0000 1.2 --- appframe.i 17 Nov 2005 05:51:20 -0000 1.3 *************** *** 168,173 **** %include "wx/tooltip.h" ! %wxchkver22&!%wxchkver23 %class %noclassinfo wxToolTip, wxObject ! %wxchkver23 %class wxToolTip, wxObject wxToolTip(const wxString &tip) static void Enable(bool flag) --- 168,173 ---- %include "wx/tooltip.h" ! // !%wxchkver23 %class %noclassinfo wxToolTip, wxObject ! %class wxToolTip, wxObject wxToolTip(const wxString &tip) static void Enable(bool flag) *************** *** 231,235 **** wxTaskBarIcon() bool IsIconInstalled() ! %wxchkver24 bool IsOK() bool RemoveIcon() bool SetIcon(const wxIcon& icon, const wxString& tooltip) --- 231,235 ---- wxTaskBarIcon() bool IsIconInstalled() ! %wxchkver24 bool IsOk() bool RemoveIcon() bool SetIcon(const wxIcon& icon, const wxString& tooltip) Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** print.i 18 Jun 2005 20:45:59 -0000 1.2 --- print.i 17 Nov 2005 05:51:20 -0000 1.3 *************** *** 186,202 **** int GetOrientation() wxPaperSize GetPaperId() ! const wxString& GetPrinterName() wxPrintQuality GetQuality() %wxchkver25 wxPrintBin GetBin() const ! const wxSize& GetPaperSize() ! const wxString& GetPrinterCommand() ! const wxString& GetPrinterOptions() ! const wxString& GetPreviewCommand() ! const wxString& GetFilename() ! const wxString& GetFontMetricPath() ! double GetPrinterScaleX() ! double GetPrinterScaleY() ! long GetPrinterTranslateX() ! long GetPrinterTranslateY() wxPrintMode GetPrintMode() void SetCollate(bool flag) --- 186,202 ---- int GetOrientation() wxPaperSize GetPaperId() ! wxString GetPrinterName() wxPrintQuality GetQuality() %wxchkver25 wxPrintBin GetBin() const ! wxSize GetPaperSize() ! !%wxchkver27 const wxString& GetPrinterCommand() ! !%wxchkver27 const wxString& GetPrinterOptions() ! !%wxchkver27 const wxString& GetPreviewCommand() ! wxString GetFilename() ! !%wxchkver27 const wxString& GetFontMetricPath() ! !%wxchkver27 double GetPrinterScaleX() ! !%wxchkver27 double GetPrinterScaleY() ! !%wxchkver27 long GetPrinterTranslateX() ! !%wxchkver27 long GetPrinterTranslateY() wxPrintMode GetPrintMode() void SetCollate(bool flag) *************** *** 218,241 **** void SetPaperSize(const wxSize& paperSize) %property=PaperSize, read, write ! void SetPrinterCommand(const wxString& command) ! %property=PrinterCommand, read, write ! void SetPrinterOptions(const wxString& options) ! %property=PrinterOptions, read, write ! void SetPreviewCommand(const wxString& command) ! %property=PreviewCommand, read, write void SetFilename(const wxString& filename) %property=Filename, read, write ! void SetFontMetricPath(const wxString& path) ! %property=FontMetricPath, read, write ! void SetPrinterScaleX(double x) ! %property=PrinterScaleX, read, write ! void SetPrinterScaleY(double y) ! %property=PrinterScaleY, read, write ! void SetPrinterScaling(double x, double y) ! void SetPrinterTranslateX(long x) ! %property=PrinterTranslateX, read, write ! void SetPrinterTranslateY(long y) ! %property=PrinterTranslateY, read, write ! void SetPrinterTranslation(long x, long y) %property=PrintMode, read, write void SetPrintMode(wxPrintMode printMode) --- 218,241 ---- void SetPaperSize(const wxSize& paperSize) %property=PaperSize, read, write ! !%wxchkver27 void SetPrinterCommand(const wxString& command) ! !%wxchkver27 %property=PrinterCommand, read, write ! !%wxchkver27 void SetPrinterOptions(const wxString& options) ! !%wxchkver27 %property=PrinterOptions, read, write ! !%wxchkver27 void SetPreviewCommand(const wxString& command) ! !%wxchkver27 %property=PreviewCommand, read, write void SetFilename(const wxString& filename) %property=Filename, read, write ! !%wxchkver27 void SetFontMetricPath(const wxString& path) ! !%wxchkver27 %property=FontMetricPath, read, write ! !%wxchkver27 void SetPrinterScaleX(double x) ! !%wxchkver27 %property=PrinterScaleX, read, write ! !%wxchkver27 void SetPrinterScaleY(double y) ! !%wxchkver27 %property=PrinterScaleY, read, write ! !%wxchkver27 void SetPrinterScaling(double x, double y) ! !%wxchkver27 void SetPrinterTranslateX(long x) ! !%wxchkver27 %property=PrinterTranslateX, read, write ! !%wxchkver27 void SetPrinterTranslateY(long y) ! !%wxchkver27 %property=PrinterTranslateY, read, write ! !%wxchkver27 void SetPrinterTranslation(long x, long y) %property=PrintMode, read, write void SetPrintMode(wxPrintMode printMode) *************** *** 309,314 **** // wxPrintDialog ! !%wxchkver26 %class wxPrintDialog, wxDialog ! %wxchkver26 %class wxPrintDialog, wxObject // FIXME how to make this work wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL) wxPrintDialogData& GetPrintDialogData() --- 309,314 ---- // wxPrintDialog ! //!%wxchkver26 %class wxPrintDialog, wxDialog ! %class wxPrintDialog, wxObject // FIXME how to make this work wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL) wxPrintDialogData& GetPrintDialogData() *************** *** 355,359 **** %property=PrintToFile, read, write void SetSelection(bool flag) ! void SetSetupDialog(bool flag) void SetToPage(int page) %property=ToPage, read, write --- 355,359 ---- %property=PrintToFile, read, write void SetSelection(bool flag) ! !%wxchkver27 void SetSetupDialog(bool flag) void SetToPage(int page) %property=ToPage, read, write Index: mdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/mdi.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mdi.i 18 Jun 2005 20:45:59 -0000 1.2 --- mdi.i 17 Nov 2005 05:51:20 -0000 1.3 *************** *** 9,12 **** --- 9,14 ---- %if wxLUA_USE_MDI + %include "wx/cmdproc.h" + /////////////////////////////////////////////////////////////////////////////// // wxMDIClientWindow *************** *** 95,99 **** wxString GetLastDirectory() const int GetMaxDocsOpen() ! int GetNoHistoryFiles() bool Initialize() bool MakeDefaultName(wxString& buf) // FIXME needs override to return string --- 97,102 ---- wxString GetLastDirectory() const int GetMaxDocsOpen() ! !%wxchkver26 int GetNoHistoryFiles() ! %wxchkver26 size_t GetHistoryFilesCount() const; bool Initialize() bool MakeDefaultName(wxString& buf) // FIXME needs override to return string Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** windows.i 20 Jun 2005 06:55:23 -0000 1.3 --- windows.i 17 Nov 2005 05:51:20 -0000 1.4 *************** *** 39,43 **** void CentreOnParent(int direction = wxBOTH) void CentreOnScreen(int direction = wxBOTH) ! %wxchkver22&!%wxchkver25 void Clear() %wxchkver25 void ClearBackground() virtual void ClientToScreen(int* x, int* y) const --- 39,43 ---- void CentreOnParent(int direction = wxBOTH) void CentreOnScreen(int direction = wxBOTH) ! !%wxchkver25 void Clear() %wxchkver25 void ClearBackground() virtual void ClientToScreen(int* x, int* y) const *************** *** 86,90 **** // virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = FALSE) const virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL ) const ! virtual wxString GetTitle() virtual wxRegion GetUpdateRegion() const wxValidator* GetValidator() const --- 86,90 ---- // virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = FALSE) const virtual void GetTextExtent(const wxString& string, int* x, int* y, int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL ) const ! !%wxchkver27 virtual wxString GetTitle() virtual wxRegion GetUpdateRegion() const wxValidator* GetValidator() const *************** *** 151,156 **** virtual void SetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1) void SetSizer(wxSizer* sizer) ! virtual void SetTitle(const wxString& title) ! %property=Title, read, write virtual void SetValidator(const wxValidator& validator) %property=Validator, read, write --- 151,156 ---- virtual void SetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1) void SetSizer(wxSizer* sizer) ! !%wxchkver27 virtual void SetTitle(const wxString& title) ! !%wxchkver27 %property=Title, read, write virtual void SetValidator(const wxValidator& validator) %property=Validator, read, write Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gdi.i 18 Jun 2005 20:45:59 -0000 1.3 --- gdi.i 17 Nov 2005 05:51:20 -0000 1.4 *************** *** 639,643 **** %include "wx/cursor.h" ! %enum wxStockCursor wxCURSOR_NONE wxCURSOR_ARROW --- 639,643 ---- %include "wx/cursor.h" ! %enum // wxStockCursor anonymous because we use wxStockCursor as wxCursor constructor wxCURSOR_NONE wxCURSOR_ARROW Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** override.hpp 18 Jun 2005 20:45:59 -0000 1.2 --- override.hpp 17 Nov 2005 05:51:20 -0000 1.3 *************** *** 4140,4141 **** --- 4140,4169 ---- } %end + + %override builtin_wxFileSeparator + // %builtin wxString wxFileSeparator() + int LUACALL builtin_wxFileSeparator(lua_State *L) + { + // push the result string + lua_pushstring(L, wx2lua(wxFILE_SEP_PATH)); + return 1; + } + %end + + %override builtin_wxFileSize + // %builtin long wxFileSize(const wxString& fileName) + int LUACALL builtin_wxFileSize(lua_State *L) + { + wxString str = lua2wx(lua_tostring(L, 1)); + if (!str.IsEmpty()) + { + wxStructStat statstr; + wxStat(str, &statstr); + // push the result string + lua_pushnumber(L, (int)statstr.st_size); + + return 1; + } + return 0; + } + %end Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** datetime.i 18 Jun 2005 20:45:58 -0000 1.2 --- datetime.i 17 Nov 2005 05:51:20 -0000 1.3 *************** *** 172,177 **** bool SetToLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) wxDateTime GetLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) ! bool SetToTheWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) ! wxDateTime GetWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) const %wxchkver25 static wxDateTime SetToWeekOfYear(int year, wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) wxDateTime& SetToLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) --- 172,177 ---- bool SetToLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) wxDateTime GetLastWeekDay(wxDateTime::WeekDay weekday, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) ! !%wxchkver26 bool SetToTheWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) ! !%wxchkver26 wxDateTime GetWeek(wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) const %wxchkver25 static wxDateTime SetToWeekOfYear(int year, wxDateTime::wxDateTime_t numWeek, wxDateTime::WeekDay weekday = wxDateTime::Mon) wxDateTime& SetToLastMonthDay(wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year) Index: wx.rules =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx.rules,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wx.rules 18 Jun 2005 20:53:41 -0000 1.1 --- wx.rules 17 Nov 2005 05:51:20 -0000 1.2 *************** *** 16,19 **** --- 16,21 ---- hook_event_file=hook_namespace.."_event" hook_event_fn="GetEventList_"..hook_namespace + hook_builtin_file=hook_namespace.."_builtin" + hook_builtin_fn="GetBuiltinList_"..hook_namespace hook_class_file=hook_namespace.."_class" hook_class_fn="GetClassList_"..hook_namespace Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** controls.i 18 Jun 2005 20:45:58 -0000 1.2 --- controls.i 17 Nov 2005 05:51:20 -0000 1.3 *************** *** 342,346 **** int GetItemCount() const %property=ItemCount, read ! int GetItemSpacing(bool isSmall) const wxString GetItemText(long item) const long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const --- 342,347 ---- int GetItemCount() const %property=ItemCount, read ! !%wxchkver26 int GetItemSpacing(bool isSmall) const ! %wxchkver26 wxSize GetItemSpacing() const wxString GetItemText(long item) const long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** defsutil.i 20 Jun 2005 06:55:23 -0000 1.3 --- defsutil.i 17 Nov 2005 05:51:20 -0000 1.4 *************** *** 271,280 **** %endenum %endif - - %include "wx/txtstrm.h" - %enum wxEOL - wxEOL_NATIVE - wxEOL_UNIX - wxEOL_MAC - wxEOL_DOS - %endenum --- 271,272 ---- Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** data.i 18 Jun 2005 20:45:58 -0000 1.2 --- data.i 17 Nov 2005 05:51:20 -0000 1.3 *************** *** 296,300 **** --- 296,310 ---- // wxStreamBase + %if wxUSE_STREAMS + %include "wx/stream.h" + %include "wx/txtstrm.h" + + %enum wxEOL + wxEOL_NATIVE + wxEOL_UNIX + wxEOL_MAC + wxEOL_DOS + %endenum %enum wxSeekMode // also used in file.i included here for streams *************** *** 353,356 **** --- 363,368 ---- %endclass + %endif // wxUSE_STREAMS + /////////////////////////////////////////////////////////////////////////////// // wxProtocol Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dialogs.i 18 Jun 2005 20:45:58 -0000 1.2 --- dialogs.i 17 Nov 2005 05:51:20 -0000 1.3 *************** *** 21,25 **** wxSAVE wxOVERWRITE_PROMPT ! wxHIDE_READONLY wxFILE_MUST_EXIST wxMULTIPLE --- 21,25 ---- wxSAVE wxOVERWRITE_PROMPT ! %wxcompat24 wxHIDE_READONLY wxFILE_MUST_EXIST wxMULTIPLE *************** *** 31,34 **** --- 31,35 ---- %if wxUSE_NUMBERDLG + %include "wx/numdlg.h" // FIXME not in 2.4 %builtin long wxGetNumberFromUser( const wxString& message, const wxString& prompt, const wxString& caption, long value, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition) %endif wxUSE_NUMBERDLG |
|
From: John L. <jr...@us...> - 2005-11-17 05:51:29
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7199/wxLua/modules/wxluasocket/src Modified Files: dserver.cpp dtarget.cpp Log Message: update for wx26/27 Add bindings for builtin (global) functions Handle %if statements for enums Index: dtarget.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dtarget.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dtarget.cpp 7 Jun 2005 04:17:41 -0000 1.2 --- dtarget.cpp 17 Nov 2005 05:51:21 -0000 1.3 *************** *** 24,27 **** --- 24,31 ---- #include "wxluasocket/include/dtarget.h" + #if !wxCHECK_VERSION(2, 6, 0) + #define wxMilliSleep wxUsleep + #endif // !wxCHECK_VERSION(2, 6, 0) + static const char *debugName = "__wxLuaDebug__"; static const int connectTimeout = 200; // 20 seconds *************** *** 83,87 **** break; ! wxUsleep(100); } return m_fConnected; --- 87,91 ---- break; ! wxMilliSleep(100); } return m_fConnected; *************** *** 145,149 **** { m_clientSocket.Shutdown(SD_BOTH); ! wxUsleep(100); m_clientSocket.Close(); } --- 149,153 ---- { m_clientSocket.Shutdown(SD_BOTH); ! wxMilliSleep(100); m_clientSocket.Close(); } *************** *** 280,283 **** --- 284,291 ---- } break; + case CMD_DISABLE_BREAKPOINT: + break; + case CMD_ENABLE_BREAKPOINT: + break; } } Index: dserver.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dserver.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dserver.cpp 7 Jun 2005 04:17:41 -0000 1.2 --- dserver.cpp 17 Nov 2005 05:51:21 -0000 1.3 *************** *** 28,33 **** #if wxCHECK_VERSION(2, 3, 0) ! #include "wxluadebug/include/staktree.h" ! #endif wxString g_strProgramName; --- 28,37 ---- #if wxCHECK_VERSION(2, 3, 0) ! #include "wxluadebug/include/staktree.h" ! #endif // wxCHECK_VERSION(2, 3, 0) ! ! #if !wxCHECK_VERSION(2, 6, 0) ! #define wxMilliSleep wxUsleep ! #endif // !wxCHECK_VERSION(2, 6, 0) wxString g_strProgramName; *************** *** 122,126 **** } ! wxUsleep(100); wxLuaSocket *acceptedSocket = m_acceptedSocket; --- 126,130 ---- } ! wxMilliSleep(100); wxLuaSocket *acceptedSocket = m_acceptedSocket; *************** *** 152,156 **** closeSocket.Shutdown(SD_BOTH); ! wxUsleep(100); wxLuaSocket *serverSocket = m_serverSocket; --- 156,160 ---- closeSocket.Shutdown(SD_BOTH); ! wxMilliSleep(100); wxLuaSocket *serverSocket = m_serverSocket; *************** *** 512,516 **** #if wxCHECK_VERSION(2, 3, 3) ! wxUsleep(500); // why ?? #endif --- 516,520 ---- #if wxCHECK_VERSION(2, 3, 3) ! wxMilliSleep(500); // why ?? #endif |
|
From: John L. <jr...@us...> - 2005-11-17 05:51:29
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7199/wxLua/bindings Modified Files: genwxbind.lua wxluawrap.lua Log Message: update for wx26/27 Add bindings for builtin (global) functions Handle %if statements for enums Index: wxluawrap.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxluawrap.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxluawrap.lua 18 Jun 2005 20:45:58 -0000 1.2 --- wxluawrap.lua 17 Nov 2005 05:51:20 -0000 1.3 *************** *** 111,114 **** --- 111,117 ---- if wxVer24 == nil then wxVer24 = 0 end if wxVer25 == nil then wxVer25 = 0 end + if wxVer26 == nil then wxVer26 = 0 end + if wxVer27 == nil then wxVer27 = 0 end + if wxVer28 == nil then wxVer28 = 0 end -- wx Compat versions *************** *** 116,119 **** --- 119,123 ---- if wxCompat22 == nil then wxCompat22 = 0 end if wxCompat24 == nil then wxCompat24 = 0 end + if wxCompat26 == nil then wxCompat26 = 0 end if wxUnicode == nil then wxUnicode = 0 end *************** *** 190,196 **** print("Warning: Cannot Find wxWindows Base Path Environment Variable. Please Set "..wxWinEnv) ! if (wxVer22 == 0) and (wxVer23 == 0) and (wxVer24 == 0) and (wxVer25 == 0) then print("Error: no version of wxWindows set. Assuming you have 2.6") ! wxVer25 = 1 wxCompat24 = 1 end --- 194,200 ---- print("Warning: Cannot Find wxWindows Base Path Environment Variable. Please Set "..wxWinEnv) ! if (wxVer22 == 0) and (wxVer23 == 0) and (wxVer24 == 0) and (wxVer25 == 0) and (wxVer26 == 0) and (wxVer27 == 0) and (wxVer28 == 0) then print("Error: no version of wxWindows set. Assuming you have 2.6") ! wxVer26 = 1 wxCompat24 = 1 end *************** *** 1104,1146 **** function InitKeywords() -- we always have target in case we haven't added it to list ! skipToken[1] = {token = "%"..target, value = 1 } ! skipToken[2] = {token = "%wxchkver22", value = wxVer22 } ! skipToken[3] = {token = "%wxchkver23", value = wxVer23 } ! skipToken[4] = {token = "%wxchkver24", value = wxVer24 } ! skipToken[5] = {token = "%wxchkver25", value = wxVer25 } ! skipToken[6] = {token = "<wxchkver23", value = wxVer22 } ! if (wxVer23 == 1 or wxVer22 == 1) then ! skipToken[7] = {token = "<wxchkver24", value = 1 } else ! skipToken[7] = {token = "<wxchkver24", value = 0 } end ! if (wxVer24 == 1 or wxVer23 == 1 or wxVer22 == 1) then ! skipToken[8] = {token = "<wxchkver25", value = 1 } else ! skipToken[8] = {token = "<wxchkver25", value = 0 } end ! skipToken[9] = {token = "%wxcompat20", value = wxCompat20 } ! skipToken[10] = {token = "%wxcompat22", value = wxCompat22 } ! skipToken[11] = {token = "%wxcompat24", value = wxCompat22 } ! skipToken[12] = {token = "%embedded", value = isEmbedded } ! skipToken[13] = {token = "%standalone", value = isStandalone } ! skipToken[14] = {token = "%unicode", value = wxUnicode } ! skipToken[15] = {token = "%win", value = isTarget("%msw") } ! skipToken[16] = {token = "%msw", value = isTarget("%msw") } ! skipToken[17] = {token = "%gtk", value = isTarget("%gtk") } ! skipToken[18] = {token = "%mac", value = isTarget("%mac") } ! skipToken[19] = {token = "%mgl", value = isTarget("%mgl") } ! skipToken[20] = {token = "%motif", value = isTarget("%motif") } ! skipToken[21] = {token = "%os2", value = isTarget("%os2") } ! skipToken[22] = {token = "%univ", value = isTarget("%univ") } ! skipToken[23] = {token = "%x11", value = isTarget("%x11") } ! skipToken[24] = {token = "%cocoa", value = isTarget("%cocoa") } -- Add New Target Here When They Are Available on wxWindows ! conjTokenMax = 24 -- create conjugated tokens --- 1108,1172 ---- function InitKeywords() -- we always have target in case we haven't added it to list ! table.insert(skipToken, {token = "%"..target, value = 1 }) ! table.insert(skipToken, {token = "%wxchkver22", value = wxVer22 }) ! table.insert(skipToken, {token = "%wxchkver23", value = wxVer23 }) ! table.insert(skipToken, {token = "%wxchkver24", value = wxVer24 }) ! table.insert(skipToken, {token = "%wxchkver25", value = wxVer25 }) ! table.insert(skipToken, {token = "%wxchkver26", value = wxVer26 }) ! table.insert(skipToken, {token = "%wxchkver27", value = wxVer27 }) ! table.insert(skipToken, {token = "%wxchkver28", value = wxVer28 }) ! table.insert(skipToken, {token = "<wxchkver23", value = wxVer22 }) ! if ((wxVer23 == 1) or (wxVer22 == 1)) then ! table.insert(skipToken, {token = "<wxchkver24", value = 1 }) else ! table.insert(skipToken, {token = "<wxchkver24", value = 0 }) end ! if ((wxVer24 == 1) or (wxVer23 == 1) or (wxVer22 == 1)) then ! table.insert(skipToken, {token = "<wxchkver25", value = 1 }) else ! table.insert(skipToken, {token = "<wxchkver25", value = 0 }) end ! if ((wxVer25 == 1) or (wxVer24 == 1) or (wxVer23 == 1) or (wxVer22 == 1)) then ! table.insert(skipToken, {token = "<wxchkver26", value = 1 }) ! else ! table.insert(skipToken, {token = "<wxchkver26", value = 0 }) ! end ! ! if ((wxVer26 == 1) or (wxVer25 == 1) or (wxVer24 == 1) or (wxVer23 == 1) or (wxVer22 == 1)) then ! table.insert(skipToken, {token = "<wxchkver27", value = 1 }) ! else ! table.insert(skipToken, {token = "<wxchkver27", value = 0 }) ! end ! ! if ((wxVer27 == 1) or (wxVer26 == 1) or (wxVer25 == 1) or (wxVer24 == 1) or (wxVer23 == 1) or (wxVer22 == 1)) then ! table.insert(skipToken, {token = "<wxchkver28", value = 1 }) ! else ! table.insert(skipToken, {token = "<wxchkver28", value = 0 }) ! end ! ! table.insert(skipToken, {token = "%wxcompat20", value = wxCompat20 }) ! table.insert(skipToken, {token = "%wxcompat22", value = wxCompat22 }) ! table.insert(skipToken, {token = "%wxcompat24", value = wxCompat24 }) ! table.insert(skipToken, {token = "%wxcompat26", value = wxCompat26 }) ! table.insert(skipToken, {token = "%embedded", value = isEmbedded }) ! table.insert(skipToken, {token = "%standalone", value = isStandalone }) ! table.insert(skipToken, {token = "%unicode", value = wxUnicode }) ! table.insert(skipToken, {token = "%win", value = isTarget("%msw") }) ! table.insert(skipToken, {token = "%msw", value = isTarget("%msw") }) ! table.insert(skipToken, {token = "%gtk", value = isTarget("%gtk") }) ! table.insert(skipToken, {token = "%mac", value = isTarget("%mac") }) ! table.insert(skipToken, {token = "%mgl", value = isTarget("%mgl") }) ! table.insert(skipToken, {token = "%motif", value = isTarget("%motif") }) ! table.insert(skipToken, {token = "%os2", value = isTarget("%os2") }) ! table.insert(skipToken, {token = "%univ", value = isTarget("%univ") }) ! table.insert(skipToken, {token = "%x11", value = isTarget("%x11") }) ! table.insert(skipToken, {token = "%cocoa", value = isTarget("%cocoa") }) -- Add New Target Here When They Are Available on wxWindows ! conjTokenMax = table.getn(skipToken) -- create conjugated tokens *************** *** 1740,1743 **** --- 1766,1794 ---- end end + + if major == "2" and minor == "6" then + wxVer26 = 1 + outputDir = "wx26/" + if fVerbose >= 1 then + print("Version: wxWindows 2.6") + end + end + + if major == "2" and minor == "7" then + wxVer27 = 1 + outputDir = "wx27/" + if fVerbose >= 1 then + print("Version: wxWindows 2.7") + end + end + + if major == "2" and minor == "8" then + wxVer28 = 1 + outputDir = "wx28/" + if fVerbose >= 1 then + print("Version: wxWindows 2.8") + end + end + end *************** *** 1770,1773 **** --- 1821,1831 ---- end + if item[1] == "#define" and item[2] == "WXWIN_COMPATIBILITY_2_6" and item[3] == "1" then + wxCompat26 = 1 + if fVerbose >= 1 then + print("Setup: Compatibility For wxWindows Version 2.6") + end + end + if item[1] == "#define" and item[2] == "wxUSE_UNICODE" and item[3] == "1" then wxUnicode = 1 *************** *** 2029,2033 **** print(theClass.." Skipping: "..a) else ! print("Skipping "..a) end end --- 2087,2091 ---- print(theClass.." Skipping: "..a) else ! print("Skipping : "..inFileName.." "..a) end end *************** *** 2664,2668 **** if determancy < 1 then if fVerbose >= 1 then ! print("Skipping "..classDataType.."::"..func..": Cannot Find DataType "..msg) end skipClassInPrototype = 1 --- 2722,2726 ---- if determancy < 1 then if fVerbose >= 1 then ! print("Skipping, "..inFileName.." "..classDataType.."::"..func..": Cannot Find DataType "..msg) end skipClassInPrototype = 1 *************** *** 3030,3033 **** --- 3088,3101 ---- end + if (wxCompat26 == 1) then + outfile:write("#if !WXWIN_COMPATIBILITY_2_6\n") + outfile:write(" #error Lua Interface was generated with WXWIN_COMPATIBILITY_2_6 = 1\n") + outfile:write("#endif\n\n") + else + outfile:write("#if WXWIN_COMPATIBILITY_2_6\n") + outfile:write(" #error Lua Interface was generated with WXWIN_COMPATIBILITY_2_6 = 0\n") + outfile:write("#endif\n\n") + end + if (wxUnicode == 1) then outfile:write("#if !wxUSE_UNICODE\n") Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** genwxbind.lua 20 Jun 2005 06:55:23 -0000 1.2 --- genwxbind.lua 17 Nov 2005 05:51:20 -0000 1.3 *************** *** 23,65 **** ------------------------------------------------------------------------------- ! keywords = {} -- Keyword table ! conditions = {} -- Preprocessor conditions ! conditionOperators = {} -- Preprocessor operators ! ignore = {} -- Keyword ignore table delimiters = { "[]", "==", "&&", "||", "//", "/*", "*/", "\t", "\r", "\n", " ", "*", "&", "|", "(", ")", "[", "]", ",", ";", "=", "{", "}", "!" } keep = { "[]", "==", "&&", "||", "//", "/*", "*/", "*", "&", "|", "(", ")", "[", "]", ",", "=", "{", "!" } -- keep delimiters, except for white space [...1735 lines suppressed...] *************** *** 4032,4035 **** --- 4148,4153 ---- local object = interface.objectData[o] + print("Output ", object.DefType, object.Name) + if object.DefType == "class" or object.DefType == "struct" then local ObjectName = object.Name *************** *** 4060,4064 **** --- 4178,4185 ---- local bindCount = table.getn(BindTableList) for i=1,bindCount do + + if BindTableList[i].Method then + local lineCount = table.getn(BindTableList[i].Method) for line=1, lineCount do |
|
From: John L. <jr...@us...> - 2005-11-17 05:51:28
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7199/wxLua/modules/wxlua/src Modified Files: internal.cpp Log Message: update for wx26/27 Add bindings for builtin (global) functions Handle %if statements for enums Index: internal.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** internal.cpp 18 Jun 2005 20:46:00 -0000 1.3 --- internal.cpp 17 Nov 2005 05:51:20 -0000 1.4 *************** *** 85,93 **** : wxObject(), - m_typesRegistered(false), pfGetClassList(NULL), pfGetDefineList(NULL), pfGetEventList(NULL), pfGetObjectList(NULL), m_classCount(0), m_classList(NULL), --- 85,93 ---- : wxObject(), pfGetClassList(NULL), pfGetDefineList(NULL), pfGetEventList(NULL), pfGetObjectList(NULL), + pfGetBuiltinList(NULL), m_classCount(0), m_classList(NULL), *************** *** 97,101 **** m_eventList(NULL), m_objectCount(0), ! m_objectList(NULL) { } --- 97,107 ---- m_eventList(NULL), m_objectCount(0), ! m_objectList(NULL), ! m_builtinCount(0), ! m_builtinList(NULL), ! m_typesRegistered(false), ! m_startTag(0), ! m_lastTag(0), ! m_wxLuaTable(0) { } *************** *** 210,213 **** --- 216,229 ---- } m_lastTag = iTag; + + // register all the builtin functions + m_builtinList = (*pfGetBuiltinList)(m_builtinCount); + for (size_t iBuiltin= 0; iBuiltin < m_builtinCount; ++iBuiltin) + { + WXLUAMETHOD *pMethod = m_builtinList + iBuiltin; + lua_pushstring(L, pMethod->name); + lua_pushcfunction(L, pMethod->func); + lua_rawset(L, tableOffset); + } // for backward compatibility |
|
From: John L. <jr...@us...> - 2005-11-17 05:51:28
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7199/wxLua/modules/wxlua/include Modified Files: internal.h Log Message: update for wx26/27 Add bindings for builtin (global) functions Handle %if statements for enums Index: internal.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** internal.h 18 Jun 2005 20:45:59 -0000 1.3 --- internal.h 17 Nov 2005 05:51:20 -0000 1.4 *************** *** 114,117 **** --- 114,118 ---- typedef WXLUAEVENT* (*GetEventListFunction)(size_t &); typedef WXLUAOBJECT* (*GetObjectListFunction)(size_t &); + typedef WXLUAMETHOD* (*GetBuiltinListFunction)(size_t &); class WXDLLIMPEXP_WXLUA wxLuaBinding : public wxObject *************** *** 128,131 **** --- 129,133 ---- GetEventListFunction pfGetEventList; GetObjectListFunction pfGetObjectList; + GetBuiltinListFunction pfGetBuiltinList; // Registers binding *************** *** 146,149 **** --- 148,154 ---- WXLUAOBJECT* GetLuaObjectList() { return m_objectList; } + size_t GetLuaBuiltinCount() { return m_builtinCount; } + WXLUAMETHOD* GetLuaBuiltinList() { return m_builtinList; } + bool IsTag(int tag) { return (tag >= m_startTag && tag <= m_lastTag); } *************** *** 166,169 **** --- 171,176 ---- size_t m_objectCount; WXLUAOBJECT* m_objectList; + size_t m_builtinCount; + WXLUAMETHOD* m_builtinList; bool m_typesRegistered; // Is the binding registered |
|
From: John L. <jr...@us...> - 2005-11-17 05:51:28
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7199/wxLua/apps/wxlua/src Modified Files: Makefile Makefile_import Log Message: update for wx26/27 Add bindings for builtin (global) functions Handle %if statements for enums Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 7 Jun 2005 04:42:49 -0000 1.2 --- Makefile 17 Nov 2005 05:51:20 -0000 1.3 *************** *** 22,25 **** --- 22,27 ---- PROGRAM = wxLua + WXLUA = ../../.. + LUA_LIBS = ../../../lib/liblua.a ../../../lib/liblualib.a WXLUA_LIB = $(WXLIBBASE)_wxlua-$(WXRELEASE) *************** *** 39,50 **** APPEXTRALIBS=-L$(WXLIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) ! OBJECTS=wxlua.o wxluawrap.o DEPFILES=$(OBJECTS:.o=.d) .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib luawrappers $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) --- 41,93 ---- APPEXTRALIBS=-L$(WXLIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) ! OBJECTS=wxlua.o $(WXLUABINDINGS) ! #wxluawrap.o ../../../modules/wxbind/src/wxlhtmlwin.o ../../../modules/wxbind/src/wxlprint.o DEPFILES=$(OBJECTS:.o=.d) + WXLUABINDINGS = \ + ../../../modules/wxbind/src/appframe.o \ + ../../../modules/wxbind/src/clipdrag.o \ + ../../../modules/wxbind/src/config.o \ + ../../../modules/wxbind/src/controls.o \ + ../../../modules/wxbind/src/data.o \ + ../../../modules/wxbind/src/datetime.o \ + ../../../modules/wxbind/src/defsutil.o \ + ../../../modules/wxbind/src/dialogs.o\ + ../../../modules/wxbind/src/event.o \ + ../../../modules/wxbind/src/file.o \ + ../../../modules/wxbind/src/fl.o \ + ../../../modules/wxbind/src/gdi.o \ + ../../../modules/wxbind/src/geometry.o \ + ../../../modules/wxbind/src/grid.o \ + ../../../modules/wxbind/src/help.o \ + ../../../modules/wxbind/src/html.o \ + ../../../modules/wxbind/src/image.o \ + ../../../modules/wxbind/src/mdi.o \ + ../../../modules/wxbind/src/menutool.o \ + ../../../modules/wxbind/src/plot.o \ + ../../../modules/wxbind/src/print.o \ + ../../../modules/wxbind/src/regex.o \ + ../../../modules/wxbind/src/sizer.o \ + ../../../modules/wxbind/src/socket.o \ + ../../../modules/wxbind/src/stc.o \ + ../../../modules/wxbind/src/thread.o \ + ../../../modules/wxbind/src/wave.o \ + ../../../modules/wxbind/src/windows.o \ + ../../../modules/wxbind/src/wx_builtin.o \ + ../../../modules/wxbind/src/wx_class.o \ + ../../../modules/wxbind/src/wx_define.o \ + ../../../modules/wxbind/src/wx_event.o \ + ../../../modules/wxbind/src/wxlhtmlwin.o \ + ../../../modules/wxbind/src/wxlprint.o \ + ../../../modules/wxbind/src/wxlua.o \ + ../../../modules/wxbind/src/wx_object.o \ + ../../../modules/wxbind/src/xml.o + + .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< ! all: lua bindings wxLuaLib wxLuaDebugLib wxLuaSocketLib $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) *************** *** 54,60 **** @(cd $(LUADIR) && make) ! luawrappers: make -f Makefile_import wxLuaLib: @(cd ../../../modules/wxlua/src && make) --- 97,106 ---- @(cd $(LUADIR) && make) ! bindings: make -f Makefile_import + wxLuaBindings: $(WXLUABINDINGS) + $(CXX) -o $@ $(WXLUABINDINGS) $(LDLIBS) $(APPEXTRALIBS) + wxLuaLib: @(cd ../../../modules/wxlua/src && make) Index: Makefile_import =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile_import,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile_import 7 Jun 2005 04:17:29 -0000 1.1 --- Makefile_import 17 Nov 2005 05:51:20 -0000 1.2 *************** *** 19,31 **** THEWRAPPERS=$(addprefix $(WXLUA)/bindings/wxwidgets/, $(WRAPPERS)) ! all: wxluawrap.cpp ! DEPFILES = wrap.lua luasetup.h.in $(WXLUA)/bindings/wxluawrap.lua $(WXLUA)/bindings/wxwidgets/override.hpp $(THEWRAPPERS) wxluawrap.cpp: $(DEPFILES) $(WXLUA)/bin/lua -e"target=\"gtk\"; wxWinDir=\"$(WXDIR)\"; wxCxxFlags=\"$(WXCXXFLAGS)\"" wrap.lua ! clean: ! rm -f wxluawrap.cpp --- 19,35 ---- THEWRAPPERS=$(addprefix $(WXLUA)/bindings/wxwidgets/, $(WRAPPERS)) ! all: genwxbind ! DEPFILES = luasetup.h.in # $(WXLUA)/bindings/genwxbind.lua $(WXLUA)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) + # This is depricated and does not currenly generate bindings that work with wxLua wxluawrap.cpp: $(DEPFILES) $(WXLUA)/bin/lua -e"target=\"gtk\"; wxWinDir=\"$(WXDIR)\"; wxCxxFlags=\"$(WXCXXFLAGS)\"" wrap.lua ! genwxbind: $(DEPFILES) ! @(cd ../../../bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt) ! ! #clean: ! # rm -f wxluawrap.cpp |
|
From: John L. <jr...@us...> - 2005-08-23 21:27:27
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26620/src Modified Files: interp.cpp Log Message: return NULL not false for wxFindWindowByPointer Index: interp.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/interp.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** interp.cpp 17 Jul 2005 05:12:49 -0000 1.4 --- interp.cpp 23 Aug 2005 21:27:18 -0000 1.5 *************** *** 118,122 **** // ---------------------------------------------------------------------------- // wxFindWindowByPointer - find a window by it's pointer ! // return FALSE if doesn't exist, see wxFindWindowByID and wxFindWindowByLabel // ---------------------------------------------------------------------------- static wxWindow *wxFindWindowPointerRecursively(const wxWindow *parent, const wxWindow *win) --- 118,122 ---- // ---------------------------------------------------------------------------- // wxFindWindowByPointer - find a window by it's pointer ! // return NULL if doesn't exist, see wxFindWindowByID and wxFindWindowByLabel // ---------------------------------------------------------------------------- static wxWindow *wxFindWindowPointerRecursively(const wxWindow *parent, const wxWindow *win) *************** *** 170,174 **** } ! return FALSE; } --- 170,174 ---- } ! return NULL; } |
|
From: John L. <jr...@us...> - 2005-08-01 19:43:42
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10491/wxwidgets Modified Files: wave.i Log Message: fix missing % in wxchkver25 Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wave.i 18 Jun 2005 20:45:59 -0000 1.2 --- wave.i 1 Aug 2005 19:43:33 -0000 1.3 *************** *** 8,12 **** %win %define wxSOUND_LOOP ! %if %msw&!wxchkver25 %include "wx/wave.h" --- 8,12 ---- %win %define wxSOUND_LOOP ! %if %msw&!%wxchkver25 %include "wx/wave.h" |
|
From: John L. <jr...@us...> - 2005-07-17 05:12:57
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21722/wxLua/modules/wxlua/src Modified Files: interp.cpp Log Message: Don't double up on '\' in MSW, the caller must remember to do it if they have strings containing them. This was a hack for running scripts with DOS paths as strings. Index: interp.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/interp.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** interp.cpp 18 Jun 2005 20:46:00 -0000 1.3 --- interp.cpp 17 Jul 2005 05:12:49 -0000 1.4 *************** *** 682,703 **** m_user_break = FALSE; - #ifdef __WXMSW__ - // FIXME - hack for \ getting stripped out by lua - wxString s; - size_t len = script.Length(); - for (size_t n = 0; n < len; n++) - { - s += script.GetChar(n); - if (script.GetChar(n) == wxT('\\')) - s += wxT("\\"); - } - #else - wxString s = script; - #endif - - // This is simple code to run the string, it calls _ALERT function on error m_is_running = TRUE; ! //int ret_val = luaL_loadbuffer(m_lua_State, wx2lua(s), s.Len(), wx2lua(name)); ! int ret_val = lua_dostring(m_lua_State, wx2lua(s)); m_is_running = FALSE; --- 682,688 ---- m_user_break = FALSE; m_is_running = TRUE; ! //int ret_val = luaL_loadbuffer(m_lua_State, wx2lua(script), script.Len(), wx2lua(name)); ! int ret_val = lua_dostring(m_lua_State, wx2lua(script)); m_is_running = FALSE; |
|
From: Francesco <fr...@us...> - 2005-06-20 19:56:31
|
Update of /cvsroot/wxlua/wxLua/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27671/bin Removed Files: luad.exe Log Message: --- luad.exe DELETED --- |
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules.dsw Added Files: modules_mod_lua.dsp modules_mod_lua_lib.dsp modules_mod_wxbind.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Removed Files: modules_lua.dsp modules_lua_lib.dsp modules_wxbind_dll.dsp modules_wxbind_lib.dsp modules_wxlua.dsp modules_wxlua_dll.dsp modules_wxlua_lib.dsp modules_wxluadebug_dll.dsp modules_wxluadebug_lib.dsp modules_wxluasocket_dll.dsp modules_wxluasocket_lib.dsp Log Message: --- modules_lua.dsp DELETED --- Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.bcc 20 Jun 2005 09:02:57 -0000 1.6 --- makefile.bcc 20 Jun 2005 09:48:36 -0000 1.7 *************** *** 83,120 **** ### Variables: ### ! LUA_LIB_CFLAGS = -I$(BCCDIR)\include -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) ! LUA_LIB_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\lua_lib_lapi.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lcode.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_ldebug.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_ldllmain.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_ldo.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_ldump.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lfunc.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lgc.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_llex.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lmem.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lobject.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lopcodes.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lparser.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lstate.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lstring.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_ltable.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_ltests.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_ltm.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lundump.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lvm.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lzio.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lbaselib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_ldblib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_liolib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lmathlib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_loadlib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_lstrlib.obj \ ! borland$(WXLIBPOSTFIX)\lua_lib_ltablib.obj ! LUA_CFLAGS = -I$(BCCDIR)\include -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) ! LUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\lua_lua.obj WXLUA_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 83,121 ---- ### Variables: ### ! MOD_LUA_LIB_CFLAGS = -I$(BCCDIR)\include -I..\..\lua\include $(CPPFLAGS) \ ! $(CFLAGS) ! MOD_LUA_LIB_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lcode.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ldebug.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ldo.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ldump.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lfunc.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lgc.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_llex.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lmem.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lobject.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lopcodes.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lparser.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lstate.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lstring.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ltable.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ltests.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ltm.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lundump.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lvm.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lzio.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lauxlib.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lbaselib.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ldblib.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_liolib.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lmathlib.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_loadlib.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lstrlib.obj \ ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ltablib.obj ! MOD_LUA_CFLAGS = -I$(BCCDIR)\include -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) ! MOD_LUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\mod_lua_lua.obj WXLUA_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 393,405 **** if not exist ..\..\..\lib\bcc_dll mkdir ..\..\..\lib\bcc_dll ! ..\..\..\lib\bcc_lib\lua.lib: $(LUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| ! $(LUA_LIB_OBJECTS) | ! ..\..\..\bin\lua.exe: $(LUA_OBJECTS) ..\..\..\lib\bcc_lib\lua.lib ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk @&&| ! c0x32.obj $(LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib\lua.lib import32.lib cw32.lib,, | --- 394,406 ---- if not exist ..\..\..\lib\bcc_dll mkdir ..\..\..\lib\bcc_dll ! ..\..\..\lib\bcc_lib\lua.lib: $(MOD_LUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| ! $(MOD_LUA_LIB_OBJECTS) | ! ..\..\..\bin\lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\bcc_lib\lua.lib ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk @&&| ! c0x32.obj $(MOD_LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib\lua.lib import32.lib cw32.lib,, | *************** *** 468,560 **** !endif ! borland$(WXLIBPOSTFIX)\lua_lib_lapi.obj: ..\..\lua\src\lapi.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lcode.obj: ..\..\lua\src\lcode.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_ldebug.obj: ..\..\lua\src\ldebug.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_ldllmain.obj: ..\..\lua\src\ldllmain.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_ldo.obj: ..\..\lua\src\ldo.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_ldump.obj: ..\..\lua\src\ldump.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lfunc.obj: ..\..\lua\src\lfunc.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lgc.obj: ..\..\lua\src\lgc.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_llex.obj: ..\..\lua\src\llex.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lmem.obj: ..\..\lua\src\lmem.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lobject.obj: ..\..\lua\src\lobject.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lopcodes.obj: ..\..\lua\src\lopcodes.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lparser.obj: ..\..\lua\src\lparser.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lstate.obj: ..\..\lua\src\lstate.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lstring.obj: ..\..\lua\src\lstring.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_ltable.obj: ..\..\lua\src\ltable.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_ltests.obj: ..\..\lua\src\ltests.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_ltm.obj: ..\..\lua\src\ltm.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lundump.obj: ..\..\lua\src\lundump.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lvm.obj: ..\..\lua\src\lvm.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lzio.obj: ..\..\lua\src\lzio.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lauxlib.obj: ..\..\lua\src\lib\lauxlib.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lbaselib.obj: ..\..\lua\src\lib\lbaselib.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_ldblib.obj: ..\..\lua\src\lib\ldblib.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_liolib.obj: ..\..\lua\src\lib\liolib.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lmathlib.obj: ..\..\lua\src\lib\lmathlib.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_loadlib.obj: ..\..\lua\src\lib\loadlib.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_lstrlib.obj: ..\..\lua\src\lib\lstrlib.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lib_ltablib.obj: ..\..\lua\src\lib\ltablib.c ! $(CC) -q -c -P- -o$@ $(LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\lua_lua.obj: ..\..\lua\src\lua\lua.c ! $(CC) -q -c -P- -o$@ $(LUA_CFLAGS) $** borland$(WXLIBPOSTFIX)\wxlua_lib_internal.obj: ..\..\wxlua\src\internal.cpp --- 469,561 ---- !endif ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lapi.obj: ..\..\lua\src\lapi.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lcode.obj: ..\..\lua\src\lcode.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ldebug.obj: ..\..\lua\src\ldebug.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.obj: ..\..\lua\src\ldllmain.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ldo.obj: ..\..\lua\src\ldo.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ldump.obj: ..\..\lua\src\ldump.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lfunc.obj: ..\..\lua\src\lfunc.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lgc.obj: ..\..\lua\src\lgc.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_llex.obj: ..\..\lua\src\llex.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lmem.obj: ..\..\lua\src\lmem.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lobject.obj: ..\..\lua\src\lobject.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lopcodes.obj: ..\..\lua\src\lopcodes.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lparser.obj: ..\..\lua\src\lparser.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lstate.obj: ..\..\lua\src\lstate.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lstring.obj: ..\..\lua\src\lstring.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ltable.obj: ..\..\lua\src\ltable.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ltests.obj: ..\..\lua\src\ltests.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ltm.obj: ..\..\lua\src\ltm.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lundump.obj: ..\..\lua\src\lundump.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lvm.obj: ..\..\lua\src\lvm.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lzio.obj: ..\..\lua\src\lzio.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lauxlib.obj: ..\..\lua\src\lib\lauxlib.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lbaselib.obj: ..\..\lua\src\lib\lbaselib.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ldblib.obj: ..\..\lua\src\lib\ldblib.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_liolib.obj: ..\..\lua\src\lib\liolib.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lmathlib.obj: ..\..\lua\src\lib\lmathlib.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_loadlib.obj: ..\..\lua\src\lib\loadlib.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_lstrlib.obj: ..\..\lua\src\lib\lstrlib.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lib_ltablib.obj: ..\..\lua\src\lib\ltablib.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** ! borland$(WXLIBPOSTFIX)\mod_lua_lua.obj: ..\..\lua\src\lua\lua.c ! $(CC) -q -c -P- -o$@ $(MOD_LUA_CFLAGS) $** borland$(WXLIBPOSTFIX)\wxlua_lib_internal.obj: ..\..\wxlua\src\internal.cpp --- modules_lua_lib.dsp DELETED --- --- modules_wxlua_lib.dsp DELETED --- --- modules_wxluadebug_dll.dsp DELETED --- Index: modules.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules.dsw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** modules.dsw 20 Jun 2005 09:02:58 -0000 1.1 --- modules.dsw 20 Jun 2005 09:48:37 -0000 1.2 *************** *** 3,7 **** ############################################################################### ! Project: "lua_lib"=modules_lua_lib.dsp - Package Owner=<4> Package=<5> --- 3,7 ---- ############################################################################### ! Project: "mod_lua_lib"=modules_mod_lua_lib.dsp - Package Owner=<4> Package=<5> *************** *** 15,19 **** ############################################################################### ! Project: "lua"=modules_lua.dsp - Package Owner=<4> Package=<5> --- 15,19 ---- ############################################################################### ! Project: "mod_lua"=modules_mod_lua.dsp - Package Owner=<4> Package=<5> *************** *** 24,28 **** {{{ Begin Project Dependency ! Project_Dep_Name lua_lib End Project Dependency }}} --- 24,28 ---- {{{ Begin Project Dependency ! Project_Dep_Name mod_lua_lib End Project Dependency }}} *************** *** 30,82 **** ############################################################################### ! Project: "wxlua_lib"=modules_wxlua_lib.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "wxlua_dll"=modules_wxlua_dll.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "wxbind_lib"=modules_wxbind_lib.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "wxbind_dll"=modules_wxbind_dll.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "wxluadebug_lib"=modules_wxluadebug_lib.dsp - Package Owner=<4> Package=<5> --- 30,34 ---- ############################################################################### ! Project: "mod_wxlua"=modules_mod_wxlua.dsp - Package Owner=<4> Package=<5> *************** *** 90,94 **** ############################################################################### ! Project: "wxluadebug_dll"=modules_wxluadebug_dll.dsp - Package Owner=<4> Package=<5> --- 42,46 ---- ############################################################################### ! Project: "mod_wxbind"=modules_mod_wxbind.dsp - Package Owner=<4> Package=<5> *************** *** 102,106 **** ############################################################################### ! Project: "wxluasocket_lib"=modules_wxluasocket_lib.dsp - Package Owner=<4> Package=<5> --- 54,58 ---- ############################################################################### ! Project: "mod_wxluadebug"=modules_mod_wxluadebug.dsp - Package Owner=<4> Package=<5> *************** *** 114,118 **** ############################################################################### ! Project: "wxluasocket_dll"=modules_wxluasocket_dll.dsp - Package Owner=<4> Package=<5> --- 66,70 ---- ############################################################################### ! Project: "mod_wxluasocket"=modules_mod_wxluasocket.dsp - Package Owner=<4> Package=<5> Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.gcc 20 Jun 2005 09:02:57 -0000 1.6 --- makefile.gcc 20 Jun 2005 09:48:37 -0000 1.7 *************** *** 52,89 **** ### Variables: ### ! LUA_LIB_CFLAGS = -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) ! LUA_LIB_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lapi.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lcode.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_ldebug.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_ldllmain.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_ldo.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_ldump.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lfunc.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lgc.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_llex.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lmem.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lobject.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lopcodes.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lparser.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lstate.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lstring.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_ltable.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_ltests.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_ltm.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lundump.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lvm.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lzio.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lauxlib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lbaselib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_ldblib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_liolib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lmathlib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_loadlib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_lstrlib.o \ ! mingw$(WXLIBPOSTFIX)\lua_lib_ltablib.o ! LUA_CFLAGS = -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) ! LUA_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\lua_lua.o WXLUA_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 52,89 ---- ### Variables: ### ! MOD_LUA_LIB_CFLAGS = -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) ! MOD_LUA_LIB_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lapi.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lcode.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldebug.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldo.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldump.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lfunc.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lgc.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_llex.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lmem.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lobject.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lopcodes.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lparser.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstate.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstring.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltable.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltests.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltm.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lundump.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lvm.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lzio.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lauxlib.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lbaselib.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldblib.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_liolib.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lmathlib.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_loadlib.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstrlib.o \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltablib.o ! MOD_LUA_CFLAGS = -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) ! MOD_LUA_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\mod_lua_lua.o WXLUA_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 351,361 **** if not exist ..\..\..\lib\gcc_dll mkdir ..\..\..\lib\gcc_dll ! ..\..\..\lib\gcc_lib\liblua.a: $(LUA_LIB_OBJECTS) if exist $@ del $@ ! ar rcu $@ $(LUA_LIB_OBJECTS) ranlib $@ ! ..\..\..\bin\lua.exe: $(LUA_OBJECTS) ..\..\..\lib\gcc_lib\liblua.a ! $(CC) -o $@ $(LUA_OBJECTS) $(LDFLAGS) ..\..\..\lib\gcc_lib\liblua.a ifeq ($(WX_SHARED),0) --- 351,361 ---- if not exist ..\..\..\lib\gcc_dll mkdir ..\..\..\lib\gcc_dll ! ..\..\..\lib\gcc_lib\liblua.a: $(MOD_LUA_LIB_OBJECTS) if exist $@ del $@ ! ar rcu $@ $(MOD_LUA_LIB_OBJECTS) ranlib $@ ! ..\..\..\bin\lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\gcc_lib\liblua.a ! $(CC) -o $@ $(MOD_LUA_OBJECTS) $(LDFLAGS) ..\..\..\lib\gcc_lib\liblua.a ifeq ($(WX_SHARED),0) *************** *** 407,499 **** endif ! mingw$(WXLIBPOSTFIX)\lua_lib_lapi.o: ../../lua/src/lapi.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lcode.o: ../../lua/src/lcode.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_ldebug.o: ../../lua/src/ldebug.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_ldllmain.o: ../../lua/src/ldllmain.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_ldo.o: ../../lua/src/ldo.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_ldump.o: ../../lua/src/ldump.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lfunc.o: ../../lua/src/lfunc.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lgc.o: ../../lua/src/lgc.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_llex.o: ../../lua/src/llex.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lmem.o: ../../lua/src/lmem.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lobject.o: ../../lua/src/lobject.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lopcodes.o: ../../lua/src/lopcodes.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lparser.o: ../../lua/src/lparser.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lstate.o: ../../lua/src/lstate.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lstring.o: ../../lua/src/lstring.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_ltable.o: ../../lua/src/ltable.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_ltests.o: ../../lua/src/ltests.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_ltm.o: ../../lua/src/ltm.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lundump.o: ../../lua/src/lundump.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lvm.o: ../../lua/src/lvm.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lzio.o: ../../lua/src/lzio.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lauxlib.o: ../../lua/src/lib/lauxlib.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lbaselib.o: ../../lua/src/lib/lbaselib.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_ldblib.o: ../../lua/src/lib/ldblib.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_liolib.o: ../../lua/src/lib/liolib.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lmathlib.o: ../../lua/src/lib/lmathlib.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_loadlib.o: ../../lua/src/lib/loadlib.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_lstrlib.o: ../../lua/src/lib/lstrlib.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lib_ltablib.o: ../../lua/src/lib/ltablib.c ! $(CC) -c -o $@ $(LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\lua_lua.o: ../../lua/src/lua/lua.c ! $(CC) -c -o $@ $(LUA_CFLAGS) $< mingw$(WXLIBPOSTFIX)\wxlua_lib_internal.o: ../../wxlua/src/internal.cpp --- 407,499 ---- endif ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lapi.o: ../../lua/src/lapi.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lcode.o: ../../lua/src/lcode.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldebug.o: ../../lua/src/ldebug.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.o: ../../lua/src/ldllmain.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldo.o: ../../lua/src/ldo.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldump.o: ../../lua/src/ldump.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lfunc.o: ../../lua/src/lfunc.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lgc.o: ../../lua/src/lgc.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_llex.o: ../../lua/src/llex.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lmem.o: ../../lua/src/lmem.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lobject.o: ../../lua/src/lobject.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lopcodes.o: ../../lua/src/lopcodes.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lparser.o: ../../lua/src/lparser.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstate.o: ../../lua/src/lstate.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstring.o: ../../lua/src/lstring.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltable.o: ../../lua/src/ltable.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltests.o: ../../lua/src/ltests.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltm.o: ../../lua/src/ltm.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lundump.o: ../../lua/src/lundump.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lvm.o: ../../lua/src/lvm.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lzio.o: ../../lua/src/lzio.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lauxlib.o: ../../lua/src/lib/lauxlib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lbaselib.o: ../../lua/src/lib/lbaselib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldblib.o: ../../lua/src/lib/ldblib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_liolib.o: ../../lua/src/lib/liolib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lmathlib.o: ../../lua/src/lib/lmathlib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_loadlib.o: ../../lua/src/lib/loadlib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstrlib.o: ../../lua/src/lib/lstrlib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lib_ltablib.o: ../../lua/src/lib/ltablib.c ! $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $< ! mingw$(WXLIBPOSTFIX)\mod_lua_lua.o: ../../lua/src/lua/lua.c ! $(CC) -c -o $@ $(MOD_LUA_CFLAGS) $< mingw$(WXLIBPOSTFIX)\wxlua_lib_internal.o: ../../wxlua/src/internal.cpp --- NEW FILE: modules_mod_wxluasocket.dsp --- # Microsoft Developer Studio Project File - Name="modules_mod_wxluasocket" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=mod_wxluasocket - Win32 Default !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxluasocket.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxluasocket.mak" CFG="mod_wxluasocket - Win32 Default" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "mod_wxluasocket - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxluasocket - Win32 DLL Unicode" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxluasocket - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxluasocket - Win32 DLL" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxluasocket - Win32 Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxluasocket - Win32 Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxluasocket - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxluasocket - Win32 Default" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "mod_wxluasocket - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "msvc6prjud\mod_wxluasocket" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "msvc6prjud\mod_wxluasocket" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /c # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUASOCKETMAKINGDLL # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUASOCKETMAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxmsw26ud_adv.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\wxluasocket_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxluasocket.lib" /debug # ADD LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxmsw26ud_adv.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\wxluasocket_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxluasocket.lib" /debug !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "msvc6prju\mod_wxluasocket" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "msvc6prju\mod_wxluasocket" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /c # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUASOCKETMAKINGDLL # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUASOCKETMAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxmsw26u_adv.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\wxluasocket_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxluasocket.lib" # ADD LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxmsw26u_adv.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\wxluasocket_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "msvc6prjd\mod_wxluasocket" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "msvc6prjd\mod_wxluasocket" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /c # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUASOCKETMAKINGDLL # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUASOCKETMAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxmsw26d_adv.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\wxluasocket_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxluasocket.lib" /debug # ADD LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxmsw26d_adv.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\wxluasocket_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxluasocket.lib" /debug !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 DLL" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "msvc6prj\mod_wxluasocket" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "msvc6prj\mod_wxluasocket" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /c # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxluasocket_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "A2DWXLUASOCKETMAKINGDLL" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUASOCKETMAKINGDLL # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "WXUSINGDLL" /i "$(WXWIN)\contrib\include" /d A2DWXLUASOCKETMAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxmsw26_adv.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\wxluasocket_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxluasocket.lib" # ADD LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxmsw26_adv.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\wxluasocket_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prjud\mod_wxluasocket" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prjud\mod_wxluasocket" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxluasocket.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxluasocket.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxluasocket.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prju\mod_wxluasocket" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prju\mod_wxluasocket" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxluasocket.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxluasocket.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxluasocket.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prjd\mod_wxluasocket" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prjd\mod_wxluasocket" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxluasocket.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxluasocket.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxluasocket.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxluasocket.lib" !ELSEIF "$(CFG)" == "mod_wxluasocket - Win32 Default" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\lib\vc_lib" # PROP BASE Intermediate_Dir "msvc6prj\mod_wxluasocket" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prj\mod_wxluasocket" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxluasocket.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxluasocket.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxluasocket.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxluasocket.lib" !ENDIF # Begin Target # Name "mod_wxluasocket - Win32 DLL Unicode Debug" # Name "mod_wxluasocket - Win32 DLL Unicode" # Name "mod_wxluasocket - Win32 DLL Debug" # Name "mod_wxluasocket - Win32 DLL" # Name "mod_wxluasocket - Win32 Unicode Debug" # Name "mod_wxluasocket - Win32 Unicode" # Name "mod_wxluasocket - Win32 Debug" # Name "mod_wxluasocket - Win32 Default" # Begin Group "WXLUASOCKET sources" # PROP Default_Filter "" # Begin Source File SOURCE=..\..\wxluasocket\src\debugio.cpp # End Source File # Begin Source File SOURCE=..\..\wxluasocket\src\dserver.cpp # End Source File # Begin Source File SOURCE=..\..\wxluasocket\src\dtarget.cpp # End Source File # Begin Source File SOURCE=..\..\wxluasocket\src\socket.cpp # End Source File # End Group # Begin Group "WXLUASOCKET headers" # PROP Default_Filter "" # Begin Source File SOURCE=..\..\wxluasocket\include\debugio.h # End Source File # Begin Source File SOURCE=..\..\wxluasocket\include\dserver.h # End Source File # Begin Source File SOURCE=..\..\wxluasocket\include\dtarget.h # End Source File # Begin Source File SOURCE=..\..\wxluasocket\include\socket.h # End Source File # End Group # End Target # End Project --- NEW FILE: modules_mod_lua_lib.dsp --- # Microsoft Developer Studio Project File - Name="modules_mod_lua_lib" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 CFG=mod_lua_lib - Win32 Default !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "modules_mod_lua_lib.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "modules_mod_lua_lib.mak" CFG="mod_lua_lib - Win32 Default" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "mod_lua_lib - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 DLL Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 DLL Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 DLL" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 Default" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "mod_lua_lib - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # 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 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /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\lua.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Unicode" # 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 /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /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\lua.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # 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 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /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\lua.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL" # 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 /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /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\lua.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # 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 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /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\lua.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode" # 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 /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /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\lua.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # 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 0 # PROP Output_Dir "..\..\..\lib\vc_lib" # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /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\lua.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Default" # 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 /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /c # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "..\..\lua\include" /D "WIN32" /D "_LIB" /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\lua.lib" # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ENDIF # Begin Target # Name "mod_lua_lib - Win32 DLL Unicode Debug" # Name "mod_lua_lib - Win32 DLL Unicode" # Name "mod_lua_lib - Win32 DLL Debug" # Name "mod_lua_lib - Win32 DLL" # Name "mod_lua_lib - Win32 Unicode Debug" # Name "mod_lua_lib - Win32 Unicode" # Name "mod_lua_lib - Win32 Debug" # Name "mod_lua_lib - Win32 Default" # Begin Group "Source Files" # PROP Default_Filter "" # Begin Source File SOURCE=..\..\lua\src\lapi.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lib\lauxlib.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lib\lbaselib.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lcode.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lib\ldblib.c # End Source File # Begin Source File SOURCE=..\..\lua\src\ldebug.c # End Source File # Begin Source File SOURCE=..\..\lua\src\ldllmain.c # End Source File # Begin Source File SOURCE=..\..\lua\src\ldo.c # End Source File # Begin Source File SOURCE=..\..\lua\src\ldump.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lfunc.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lgc.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lib\liolib.c # End Source File # Begin Source File SOURCE=..\..\lua\src\llex.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lib\lmathlib.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lmem.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lib\loadlib.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lobject.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lopcodes.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lparser.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lstate.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lstring.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lib\lstrlib.c # End Source File # Begin Source File SOURCE=..\..\lua\src\ltable.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lib\ltablib.c # End Source File # Begin Source File SOURCE=..\..\lua\src\ltests.c # End Source File # Begin Source File SOURCE=..\..\lua\src\ltm.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lundump.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lvm.c # End Source File # Begin Source File SOURCE=..\..\lua\src\lzio.c # End Source File # End Group # End Target # End Project --- NEW FILE: modules_mod_wxlua.dsp --- # Microsoft Developer Studio Project File - Name="modules_mod_wxlua" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=mod_wxlua - Win32 Default !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak" CFG="mod_wxlua - Win32 Default" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "mod_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxlua - Win32 DLL Unicode" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxlua - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxlua - Win32 DLL" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxlua - Win32 Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxlua - Win32 Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxlua - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxlua - Win32 Default" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\lib\vc_dll" # PROP BASE Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\lib\vc_dll" # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /c # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "A2DWXLUAMAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /D "... [truncated message content] |
|
From: Francesco <fr...@us...> - 2005-06-20 09:49:19
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985/apps/build/msw Modified Files: apps.dsp apps.dsw makefile.bcc makefile.gcc makefile.wat Log Message: Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.bcc 20 Jun 2005 09:02:46 -0000 1.4 --- makefile.bcc 20 Jun 2005 09:48:35 -0000 1.5 *************** *** 83,100 **** ### Variables: ### ! WXLUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS) ! WXLUA_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\wxlua_wxlua.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_lconsole.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj ### Conditionally set variables: ### --- 83,100 ---- ### Variables: ### ! APP_WXLUA_CFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS) ! 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 -I..\..\..\modules $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ -tWM $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! APP_WXLUA_OBJECTS = \ ! borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ ! borland$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj \ ! borland$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj ### Conditionally set variables: ### *************** *** 175,193 **** -if exist ..\..\..\bin\wxlua.ils del ..\..\..\bin\wxlua.ils ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0x32.obj $(WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\wxlua_wxlua.res | ! borland$(WXLIBPOSTFIX)\wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\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 -i..\..\..\modules $(__WX_SHAREDDEFINE_p_1) $** ! borland$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj: ..\..\..\bindings\wxwidgets\wxluawrap.c ! $(CC) -q -c -P- -o$@ $(WXLUA_CFLAGS) $** --- 175,193 ---- -if exist ..\..\..\bin\wxlua.ils del ..\..\..\bin\wxlua.ils ! ..\..\..\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) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0x32.obj $(APP_WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | ! borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! borland$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! 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 -i..\..\..\modules $(__WX_SHAREDDEFINE_p_1) $** ! borland$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj: ..\..\..\bindings\wxwidgets\wxluawrap.c ! $(CC) -q -c -P- -o$@ $(APP_WXLUA_CFLAGS) $** Index: apps.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** apps.dsp 20 Jun 2005 09:02:46 -0000 1.1 --- apps.dsp 20 Jun 2005 09:48:35 -0000 1.2 *************** *** 5,9 **** # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! CFG=wxlua - Win32 Default !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 5,9 ---- # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! CFG=app_wxlua - Win32 Default !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,29 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "apps.mak" CFG="wxlua - Win32 Default" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "wxlua - Win32 DLL Unicode" (based on "Win32 (x86) Console Application") ! !MESSAGE "wxlua - Win32 DLL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "wxlua - Win32 DLL" (based on "Win32 (x86) Console Application") ! !MESSAGE "wxlua - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "wxlua - Win32 Unicode" (based on "Win32 (x86) Console Application") ! !MESSAGE "wxlua - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "wxlua - Win32 Default" (based on "Win32 (x86) Console Application") !MESSAGE --- 14,29 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "apps.mak" CFG="app_wxlua - Win32 Default" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "app_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 DLL Unicode" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 DLL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 DLL" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 Unicode" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "app_wxlua - Win32 Default" (based on "Win32 (x86) Console Application") !MESSAGE *************** *** 35,49 **** RSC=rc.exe ! !IF "$(CFG)" == "wxlua - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /c --- 35,49 ---- RSC=rc.exe ! !IF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /c *************** *** 55,72 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug ! !ELSEIF "$(CFG)" == "wxlua - Win32 DLL Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /c --- 55,72 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug ! !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /c *************** *** 78,95 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" ! !ELSEIF "$(CFG)" == "wxlua - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /c --- 78,95 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" ! !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /c *************** *** 101,118 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug ! !ELSEIF "$(CFG)" == "wxlua - Win32 DLL" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXMSW__" /D "WXUSINGDLL" /c --- 101,118 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug ! !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXMSW__" /D "WXUSINGDLL" /c *************** *** 124,141 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" ! !ELSEIF "$(CFG)" == "wxlua - Win32 Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c --- 124,141 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" ! !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c *************** *** 147,164 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug ! !ELSEIF "$(CFG)" == "wxlua - Win32 Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXMSW__" /c --- 147,164 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug ! !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXMSW__" /c *************** *** 170,187 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" ! !ELSEIF "$(CFG)" == "wxlua - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c --- 170,187 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" ! !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c *************** *** 193,210 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug ! !ELSEIF "$(CFG)" == "wxlua - Win32 Default" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXMSW__" /c --- 193,210 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug ! !ELSEIF "$(CFG)" == "app_wxlua - Win32 Default" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\app_wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\app_wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXMSW__" /c *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" !ENDIF --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" !ENDIF *************** *** 223,234 **** # Begin Target ! # Name "wxlua - Win32 DLL Unicode Debug" ! # Name "wxlua - Win32 DLL Unicode" ! # Name "wxlua - Win32 DLL Debug" ! # Name "wxlua - Win32 DLL" ! # Name "wxlua - Win32 Unicode Debug" ! # Name "wxlua - Win32 Unicode" ! # Name "wxlua - Win32 Debug" ! # Name "wxlua - Win32 Default" # Begin Group "Source Files" --- 223,234 ---- # Begin Target ! # Name "app_wxlua - Win32 DLL Unicode Debug" ! # Name "app_wxlua - Win32 DLL Unicode" ! # Name "app_wxlua - Win32 DLL Debug" ! # Name "app_wxlua - Win32 DLL" ! # Name "app_wxlua - Win32 Unicode Debug" ! # Name "app_wxlua - Win32 Unicode" ! # Name "app_wxlua - Win32 Debug" ! # Name "app_wxlua - Win32 Default" # Begin Group "Source Files" Index: apps.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps.dsw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** apps.dsw 20 Jun 2005 09:02:46 -0000 1.1 --- apps.dsw 20 Jun 2005 09:48:35 -0000 1.2 *************** *** 3,7 **** ############################################################################### ! Project: "wxlua"=apps.dsp - Package Owner=<4> Package=<5> --- 3,7 ---- ############################################################################### ! Project: "app_wxlua"=apps.dsp - Package Owner=<4> Package=<5> Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.wat 20 Jun 2005 09:02:46 -0000 1.4 --- makefile.wat 20 Jun 2005 09:48:36 -0000 1.5 *************** *** 144,161 **** ### Variables: ### ! WXLUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS_0) & $(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) & $(CFLAGS) ! WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS_0) & $(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) & $(CXXFLAGS) ! WXLUA_OBJECTS = & ! watcom$(WXLIBPOSTFIX)\wxlua_wxlua.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_lconsole.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj --- 144,161 ---- ### Variables: ### ! APP_WXLUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS_0) & $(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) & $(CFLAGS) ! APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include -i=..\..\..\modules $(__WARNINGS_0) & $(__OPTIMIZEFLAG_1) $(__DEBUGINFO_2) -bm $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) & $(CXXFLAGS) ! APP_WXLUA_OBJECTS = & ! watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & ! watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj & ! watcom$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj *************** *** 176,200 **** -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! ..\..\..\bin\wxlua.exe : $(WXLUA_OBJECTS) watcom$(WXLIBPOSTFIX)\wxlua_wxlua.res ! @%create watcom$(WXLIBPOSTFIX)\wxlua.lbc ! @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc option quiet ! @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc name $^@ ! @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) ! @for %i in ($(WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc file %i ! @for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib 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)\wxlua.lbc library %i ! @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\wxlua_wxlua.res ! wlink @watcom$(WXLIBPOSTFIX)\wxlua.lbc ! watcom$(WXLIBPOSTFIX)\wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp ! $(CXX) -zq -fo=$^@ $(WXLUA_CXXFLAGS) $< ! watcom$(WXLIBPOSTFIX)\wxlua_lconsole.obj : .AUTODEPEND ..\..\wxlua\src\lconsole.cpp ! $(CXX) -zq -fo=$^@ $(WXLUA_CXXFLAGS) $< ! watcom$(WXLIBPOSTFIX)\wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $< ! watcom$(WXLIBPOSTFIX)\wxlua_wxluawrap.obj : .AUTODEPEND ..\..\..\bindings\wxwidgets\wxluawrap.c ! $(CC) -zq -fo=$^@ $(WXLUA_CFLAGS) $< --- 176,200 ---- -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! ..\..\..\bin\wxlua.exe : $(APP_WXLUA_OBJECTS) watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! @%create watcom$(WXLIBPOSTFIX)\app_wxlua.lbc ! @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option quiet ! @%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) $(__DEBUGINFO_3) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) ! @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i ! @for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib 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 ! @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc ! watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp ! $(CXX) -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< ! watcom$(WXLIBPOSTFIX)\app_wxlua_lconsole.obj : .AUTODEPEND ..\..\wxlua\src\lconsole.cpp ! $(CXX) -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< ! watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules $(__WX_SHAREDDEFINE_p) $< ! watcom$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.obj : .AUTODEPEND ..\..\..\bindings\wxwidgets\wxluawrap.c ! $(CC) -zq -fo=$^@ $(APP_WXLUA_CFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** makefile.gcc 20 Jun 2005 09:02:46 -0000 1.4 --- makefile.gcc 20 Jun 2005 09:48:36 -0000 1.5 *************** *** 52,68 **** ### Variables: ### ! WXLUA_CFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) \ ! -D__WXMSW__ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ -I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS) ! WXLUA_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) \ ! -D__WXMSW__ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ -I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\wxlua_wxlua.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_lconsole.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_wxlua_rc.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_wxluawrap.o ### Conditionally set variables: ### --- 52,70 ---- ### Variables: ### ! APP_WXLUA_CFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ -I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CFLAGS) ! APP_WXLUA_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ ! $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ ! -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ -I..\..\..\modules $(__WARNINGS_0) $(__OPTIMIZEFLAG_1) $(__DEBUGINFO) \ -mthreads $(__WX_SHAREDDEFINE_p) $(CPPFLAGS) $(CXXFLAGS) ! APP_WXLUA_OBJECTS = \ ! mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \ ! mingw$(WXLIBPOSTFIX)\app_wxlua_lconsole.o \ ! mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o \ ! mingw$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.o ### Conditionally set variables: ### *************** *** 148,165 **** -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\wxlua_wxlua_rc.o ! $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -lwxluadebug -lwxluasocket -lwxlua -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 ! mingw$(WXLIBPOSTFIX)\wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp ! $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< ! mingw$(WXLIBPOSTFIX)\wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp ! $(CXX) -c -o $@ $(WXLUA_CXXFLAGS) $< ! mingw$(WXLIBPOSTFIX)\wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_1) ! mingw$(WXLIBPOSTFIX)\wxlua_wxluawrap.o: ../../../bindings/wxwidgets/wxluawrap.c ! $(CC) -c -o $@ $(WXLUA_CFLAGS) $< .PHONY: all clean --- 150,167 ---- -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 ! mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp ! $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $< ! mingw$(WXLIBPOSTFIX)\app_wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp ! $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $< ! mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ..\..\..\modules $(__WX_SHAREDDEFINE_p_1) ! mingw$(WXLIBPOSTFIX)\app_wxlua_wxluawrap.o: ../../../bindings/wxwidgets/wxluawrap.c ! $(CC) -c -o $@ $(APP_WXLUA_CFLAGS) $< .PHONY: all clean |
|
From: Francesco <fr...@us...> - 2005-06-20 09:49:19
|
Update of /cvsroot/wxlua/wxLua/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985/util Modified Files: Makefile.in Log Message: Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 14 Jun 2005 21:44:42 -0000 1.2 --- Makefile.in 20 Jun 2005 09:48:38 -0000 1.3 *************** *** 22,28 **** DESTDIR = ! BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) ! BIN2C_OBJECTS = \ ! bin2c_bin2c.o ### Conditionally set variables: ### --- 22,28 ---- DESTDIR = ! UTIL_BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) ! UTIL_BIN2C_OBJECTS = \ ! autoconf/util_bin2c_bin2c.o ### Conditionally set variables: ### *************** *** 30,40 **** @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CCC = $(CC) ! @COND_USE_BIN2C_1@__bin2c___depname = ./../bin/bin2c$(EXEEXT) ! @COND_PLATFORM_MAC_1@__bin2c___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL bin2c$(EXEEXT) ### Targets: ### ! all: $(__bin2c___depname) install: all --- 30,40 ---- @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CCC = $(CC) ! @COND_USE_BIN2C_1@__util_bin2c___depname = ./../bin/bin2c$(EXEEXT) ! @COND_PLATFORM_MAC_1@__util_bin2c___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL bin2c$(EXEEXT) ### Targets: ### ! all: $(__util_bin2c___depname) install: all *************** *** 45,50 **** clean: ! rm -rf ./.deps ./.pch ! rm -f ./*.o rm -f ./../bin/bin2c$(EXEEXT) --- 45,50 ---- clean: ! rm -rf autoconf/.deps autoconf/.pch ! rm -f autoconf/*.o rm -f ./../bin/bin2c$(EXEEXT) *************** *** 52,62 **** rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_USE_BIN2C_1@./../bin/bin2c$(EXEEXT): $(BIN2C_OBJECTS) ! @COND_USE_BIN2C_1@ $(CC) -o $@ $(BIN2C_OBJECTS) $(LDFLAGS) @COND_USE_BIN2C_1@ ! @COND_USE_BIN2C_1@ $(__bin2c___mac_setfilecmd) ! bin2c_bin2c.o: ./bin2c/bin2c.c ! $(CCC) -c -o $@ $(BIN2C_CFLAGS) ./bin2c/bin2c.c --- 52,62 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_USE_BIN2C_1@./../bin/bin2c$(EXEEXT): $(UTIL_BIN2C_OBJECTS) ! @COND_USE_BIN2C_1@ $(CC) -o $@ $(UTIL_BIN2C_OBJECTS) $(LDFLAGS) @COND_USE_BIN2C_1@ ! @COND_USE_BIN2C_1@ $(__util_bin2c___mac_setfilecmd) ! autoconf/util_bin2c_bin2c.o: ./bin2c/bin2c.c ! $(CCC) -c -o $@ $(UTIL_BIN2C_CFLAGS) ./bin2c/bin2c.c |
|
From: Francesco <fr...@us...> - 2005-06-20 09:49:19
|
Update of /cvsroot/wxlua/wxLua/util/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985/util/build/bakefiles Modified Files: util.bkl Log Message: Index: util.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/bakefiles/util.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** util.bkl 14 Jun 2005 21:44:42 -0000 1.2 --- util.bkl 20 Jun 2005 09:48:38 -0000 1.3 *************** *** 29,37 **** </if> <set var="SRCDIR">$(UTIL_BASEDIR)</set> ! <!-- our utilities --> ! <exe id="bin2c" cond="USE_BIN2C=='1'"> <dirname>$(UTIL_BASEDIR)$(DIRSEP)..$(DIRSEP)bin</dirname> <sources>bin2c/bin2c.c</sources> --- 29,38 ---- </if> <set var="SRCDIR">$(UTIL_BASEDIR)</set> ! <set var="BUILDDIR">$(FORMAT)</set> <!-- our utilities --> ! <exe id="util_bin2c" cond="USE_BIN2C=='1'"> ! <exename>bin2c</exename> <dirname>$(UTIL_BASEDIR)$(DIRSEP)..$(DIRSEP)bin</dirname> <sources>bin2c/bin2c.c</sources> |
|
From: Francesco <fr...@us...> - 2005-06-20 09:49:16
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985/modules Modified Files: Makefile.in Log Message: Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 20 Jun 2005 09:02:47 -0000 1.4 --- Makefile.in 20 Jun 2005 09:48:36 -0000 1.5 *************** *** 37,74 **** DESTDIR = ! LUA_LIB_CFLAGS = -I./lua/include $(CPPFLAGS) $(CFLAGS) ! LUA_LIB_OBJECTS = \ ! lua_lib_lapi.o \ ! lua_lib_lcode.o \ ! lua_lib_ldebug.o \ ! lua_lib_ldllmain.o \ ! lua_lib_ldo.o \ ! lua_lib_ldump.o \ ! lua_lib_lfunc.o \ ! lua_lib_lgc.o \ ! lua_lib_llex.o \ ! lua_lib_lmem.o \ ! lua_lib_lobject.o \ ! lua_lib_lopcodes.o \ ! lua_lib_lparser.o \ ! lua_lib_lstate.o \ ! lua_lib_lstring.o \ ! lua_lib_ltable.o \ ! lua_lib_ltests.o \ ! lua_lib_ltm.o \ ! lua_lib_lundump.o \ ! lua_lib_lvm.o \ ! lua_lib_lzio.o \ ! lua_lib_lauxlib.o \ ! lua_lib_lbaselib.o \ ! lua_lib_ldblib.o \ ! lua_lib_liolib.o \ ! lua_lib_lmathlib.o \ ! lua_lib_loadlib.o \ ! lua_lib_lstrlib.o \ ! lua_lib_ltablib.o ! LUA_CFLAGS = -I./lua/include $(CPPFLAGS) $(CFLAGS) ! LUA_OBJECTS = \ ! lua_lua.o WXLUA_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ --- 37,74 ---- DESTDIR = ! MOD_LUA_LIB_CFLAGS = -I./lua/include $(CPPFLAGS) $(CFLAGS) ! MOD_LUA_LIB_OBJECTS = \ ! mod_lua_lib_lapi.o \ ! mod_lua_lib_lcode.o \ ! mod_lua_lib_ldebug.o \ ! mod_lua_lib_ldllmain.o \ ! mod_lua_lib_ldo.o \ ! mod_lua_lib_ldump.o \ ! mod_lua_lib_lfunc.o \ ! mod_lua_lib_lgc.o \ ! mod_lua_lib_llex.o \ ! mod_lua_lib_lmem.o \ ! mod_lua_lib_lobject.o \ ! mod_lua_lib_lopcodes.o \ ! mod_lua_lib_lparser.o \ ! mod_lua_lib_lstate.o \ ! mod_lua_lib_lstring.o \ ! mod_lua_lib_ltable.o \ ! mod_lua_lib_ltests.o \ ! mod_lua_lib_ltm.o \ ! mod_lua_lib_lundump.o \ ! mod_lua_lib_lvm.o \ ! mod_lua_lib_lzio.o \ ! mod_lua_lib_lauxlib.o \ ! mod_lua_lib_lbaselib.o \ ! mod_lua_lib_ldblib.o \ ! mod_lua_lib_liolib.o \ ! mod_lua_lib_lmathlib.o \ ! mod_lua_lib_loadlib.o \ ! mod_lua_lib_lstrlib.o \ ! mod_lua_lib_ltablib.o ! MOD_LUA_CFLAGS = -I./lua/include $(CPPFLAGS) $(CFLAGS) ! MOD_LUA_OBJECTS = \ ! mod_lua_lua.o WXLUA_LIB_CXXFLAGS = -I./../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ *************** *** 191,195 **** @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) ! @COND_PLATFORM_MAC_1@__lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL lua$(EXEEXT) @COND_WX_SHARED_0@__wxlua_lib___depname = \ --- 191,195 ---- @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) ! @COND_PLATFORM_MAC_1@__mod_lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL lua$(EXEEXT) @COND_WX_SHARED_0@__wxlua_lib___depname = \ *************** *** 315,327 **** rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! ./../lib/$(LIBPREFIX)lua$(LIBEXT): $(LUA_LIB_OBJECTS) rm -f $@ ! $(AR) rcu $@ $(LUA_LIB_OBJECTS) $(RANLIB) $@ ! ./../bin/lua$(EXEEXT): $(LUA_OBJECTS) ./../lib/$(LIBPREFIX)lua$(LIBEXT) ! $(CC) -o $@ $(LUA_OBJECTS) -L./../lib $(LDFLAGS) -llua ! $(__lua___mac_setfilecmd) @COND_WX_SHARED_0@./../lib/$(LIBPREFIX)wxlua$(LIBEXT): $(WXLUA_LIB_OBJECTS) --- 315,327 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! ./../lib/$(LIBPREFIX)lua$(LIBEXT): $(MOD_LUA_LIB_OBJECTS) rm -f $@ ! $(AR) rcu $@ $(MOD_LUA_LIB_OBJECTS) $(RANLIB) $@ ! ./../bin/lua$(EXEEXT): $(MOD_LUA_OBJECTS) ./../lib/$(LIBPREFIX)lua$(LIBEXT) ! $(CC) -o $@ $(MOD_LUA_OBJECTS) -L./../lib $(LDFLAGS) -llua ! $(__mod_lua___mac_setfilecmd) @COND_WX_SHARED_0@./../lib/$(LIBPREFIX)wxlua$(LIBEXT): $(WXLUA_LIB_OBJECTS) *************** *** 365,457 **** @COND_WX_SHARED_1@ $(__wxluasocket_dll___so_symlinks_cmd) ! lua_lib_lapi.o: ./lua/src/lapi.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lapi.c ! lua_lib_lcode.o: ./lua/src/lcode.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lcode.c ! lua_lib_ldebug.o: ./lua/src/ldebug.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ldebug.c ! lua_lib_ldllmain.o: ./lua/src/ldllmain.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ldllmain.c ! lua_lib_ldo.o: ./lua/src/ldo.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ldo.c ! lua_lib_ldump.o: ./lua/src/ldump.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ldump.c ! lua_lib_lfunc.o: ./lua/src/lfunc.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lfunc.c ! lua_lib_lgc.o: ./lua/src/lgc.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lgc.c ! lua_lib_llex.o: ./lua/src/llex.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/llex.c ! lua_lib_lmem.o: ./lua/src/lmem.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lmem.c ! lua_lib_lobject.o: ./lua/src/lobject.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lobject.c ! lua_lib_lopcodes.o: ./lua/src/lopcodes.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lopcodes.c ! lua_lib_lparser.o: ./lua/src/lparser.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lparser.c ! lua_lib_lstate.o: ./lua/src/lstate.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lstate.c ! lua_lib_lstring.o: ./lua/src/lstring.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lstring.c ! lua_lib_ltable.o: ./lua/src/ltable.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ltable.c ! lua_lib_ltests.o: ./lua/src/ltests.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ltests.c ! lua_lib_ltm.o: ./lua/src/ltm.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/ltm.c ! lua_lib_lundump.o: ./lua/src/lundump.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lundump.c ! lua_lib_lvm.o: ./lua/src/lvm.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lvm.c ! lua_lib_lzio.o: ./lua/src/lzio.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lzio.c ! lua_lib_lauxlib.o: ./lua/src/lib/lauxlib.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/lauxlib.c ! lua_lib_lbaselib.o: ./lua/src/lib/lbaselib.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/lbaselib.c ! lua_lib_ldblib.o: ./lua/src/lib/ldblib.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/ldblib.c ! lua_lib_liolib.o: ./lua/src/lib/liolib.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/liolib.c ! lua_lib_lmathlib.o: ./lua/src/lib/lmathlib.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/lmathlib.c ! lua_lib_loadlib.o: ./lua/src/lib/loadlib.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/loadlib.c ! lua_lib_lstrlib.o: ./lua/src/lib/lstrlib.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/lstrlib.c ! lua_lib_ltablib.o: ./lua/src/lib/ltablib.c ! $(CCC) -c -o $@ $(LUA_LIB_CFLAGS) ./lua/src/lib/ltablib.c ! lua_lua.o: ./lua/src/lua/lua.c ! $(CCC) -c -o $@ $(LUA_CFLAGS) ./lua/src/lua/lua.c wxlua_lib_internal.o: ./wxlua/src/internal.cpp --- 365,457 ---- @COND_WX_SHARED_1@ $(__wxluasocket_dll___so_symlinks_cmd) ! mod_lua_lib_lapi.o: ./lua/src/lapi.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lapi.c ! mod_lua_lib_lcode.o: ./lua/src/lcode.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lcode.c ! mod_lua_lib_ldebug.o: ./lua/src/ldebug.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/ldebug.c ! mod_lua_lib_ldllmain.o: ./lua/src/ldllmain.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/ldllmain.c ! mod_lua_lib_ldo.o: ./lua/src/ldo.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/ldo.c ! mod_lua_lib_ldump.o: ./lua/src/ldump.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/ldump.c ! mod_lua_lib_lfunc.o: ./lua/src/lfunc.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lfunc.c ! mod_lua_lib_lgc.o: ./lua/src/lgc.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lgc.c ! mod_lua_lib_llex.o: ./lua/src/llex.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/llex.c ! mod_lua_lib_lmem.o: ./lua/src/lmem.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lmem.c ! mod_lua_lib_lobject.o: ./lua/src/lobject.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lobject.c ! mod_lua_lib_lopcodes.o: ./lua/src/lopcodes.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lopcodes.c ! mod_lua_lib_lparser.o: ./lua/src/lparser.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lparser.c ! mod_lua_lib_lstate.o: ./lua/src/lstate.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lstate.c ! mod_lua_lib_lstring.o: ./lua/src/lstring.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lstring.c ! mod_lua_lib_ltable.o: ./lua/src/ltable.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/ltable.c ! mod_lua_lib_ltests.o: ./lua/src/ltests.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/ltests.c ! mod_lua_lib_ltm.o: ./lua/src/ltm.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/ltm.c ! mod_lua_lib_lundump.o: ./lua/src/lundump.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lundump.c ! mod_lua_lib_lvm.o: ./lua/src/lvm.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lvm.c ! mod_lua_lib_lzio.o: ./lua/src/lzio.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lzio.c ! mod_lua_lib_lauxlib.o: ./lua/src/lib/lauxlib.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lib/lauxlib.c ! mod_lua_lib_lbaselib.o: ./lua/src/lib/lbaselib.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lib/lbaselib.c ! mod_lua_lib_ldblib.o: ./lua/src/lib/ldblib.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lib/ldblib.c ! mod_lua_lib_liolib.o: ./lua/src/lib/liolib.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lib/liolib.c ! mod_lua_lib_lmathlib.o: ./lua/src/lib/lmathlib.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lib/lmathlib.c ! mod_lua_lib_loadlib.o: ./lua/src/lib/loadlib.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lib/loadlib.c ! mod_lua_lib_lstrlib.o: ./lua/src/lib/lstrlib.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lib/lstrlib.c ! mod_lua_lib_ltablib.o: ./lua/src/lib/ltablib.c ! $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/lib/ltablib.c ! mod_lua_lua.o: ./lua/src/lua/lua.c ! $(CCC) -c -o $@ $(MOD_LUA_CFLAGS) ./lua/src/lua/lua.c wxlua_lib_internal.o: ./wxlua/src/internal.cpp |
|
From: Francesco <fr...@us...> - 2005-06-20 09:49:15
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985/modules/build/bakefiles Modified Files: modules.bkl Log Message: Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** modules.bkl 20 Jun 2005 09:02:57 -0000 1.6 --- modules.bkl 20 Jun 2005 09:48:36 -0000 1.7 *************** *** 173,176 **** --- 173,181 ---- <!-- --> <!-- The list of wxLua MODULES --> + <!-- --> + <!-- NOTE: the 'mod_' prefix in the ID is mainly because in this way the --> + <!-- DSP files generated by this bakefile makes clear for the user what --> + <!-- is a module, what is an app (since app bakefile uses 'app_' prefix) --> + <!-- and what is a util... --> <!-- --> *************** *** 181,185 **** 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="lua_lib"> <sources>$(lua_src) $(lualib_src)</sources> <headers>(lua_hdr) $(lualib_hdr)</headers> --- 186,190 ---- 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"> <sources>$(lua_src) $(lualib_src)</sources> <headers>(lua_hdr) $(lualib_hdr)</headers> *************** *** 191,196 **** <!-- this is the lua app NOTE: like for lua_lib we don't use any wxLua-project-specific rule here --> ! <exe id="lua"> ! <library>lua_lib</library> <sources>lua/src/lua/lua.c</sources> <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> --- 196,201 ---- <!-- this is the lua app NOTE: like for lua_lib we don't use any wxLua-project-specific rule here --> ! <exe id="mod_lua"> ! <library>mod_lua_lib</library> <sources>lua/src/lua/lua.c</sources> <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> *************** *** 239,243 **** gets a good idea about what is a MODULE and what is a SAMPLE (see the a2d_sample rule) --> <set var="MSVC6PRJ_MERGED_TARGETS"> ! </set> --- 244,251 ---- gets a good idea about what is a MODULE and what is a SAMPLE (see the a2d_sample rule) --> <set var="MSVC6PRJ_MERGED_TARGETS"> ! mod_wxlua=wxlua_lib+wxlua_dll ! mod_wxbind=wxbind_lib+wxbind_dll ! mod_wxluadebug=wxluadebug_lib+wxluadebug_dll ! mod_wxluasocket=wxluasocket_lib+wxluasocket_dll </set> |
|
From: Francesco <fr...@us...> - 2005-06-20 09:49:14
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985/apps/build/bakefiles Modified Files: apps.bkl Log Message: Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** apps.bkl 20 Jun 2005 09:02:46 -0000 1.3 --- apps.bkl 20 Jun 2005 09:48:35 -0000 1.4 *************** *** 49,57 **** --> ! <exe id="wxlua" template="wxlua"> <!-- <depends>wrap</depends> --> <sources>$(WXLUA_SRC)</sources> <headers>$(WXLUA_HDR)</headers> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname> <win32-res>wxlua/src/wxlua.rc</win32-res> --- 49,60 ---- --> ! <!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use ! as a module target... this would lead to problems when creating global DSW file... --> ! <exe id="app_wxlua" template="wxlua"> <!-- <depends>wrap</depends> --> <sources>$(WXLUA_SRC)</sources> <headers>$(WXLUA_HDR)</headers> <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname> + <exename>wxlua</exename> <win32-res>wxlua/src/wxlua.rc</win32-res> *************** *** 64,67 **** --- 67,71 ---- <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxlua</wxlua-lib> + <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>lua</wxlua-lib> <wx-lib>adv</wx-lib> |
|
From: Francesco <fr...@us...> - 2005-06-20 09:49:14
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985/apps Modified Files: Makefile.in Log Message: Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 20 Jun 2005 09:02:45 -0000 1.3 --- Makefile.in 20 Jun 2005 09:48:35 -0000 1.4 *************** *** 28,38 **** DESTDIR = ! WXLUA_CFLAGS = -I../modules $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS) ! WXLUA_CXXFLAGS = -I../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) ! WXLUA_OBJECTS = \ ! wxlua_wxlua.o \ ! wxlua_lconsole.o \ ! $(__wxlua___win32rc) \ ! wxlua_..\bindings\wxwidgets\wxluawrap.o ### Conditionally set variables: ### --- 28,38 ---- DESTDIR = ! APP_WXLUA_CFLAGS = -I../modules $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS) ! APP_WXLUA_CXXFLAGS = -I../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) ! APP_WXLUA_OBJECTS = \ ! app_wxlua_wxlua.o \ ! app_wxlua_lconsole.o \ ! $(__app_wxlua___win32rc) \ ! app_wxlua_..\bindings\wxwidgets\wxluawrap.o ### Conditionally set variables: ### *************** *** 42,48 **** @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) ! @COND_PLATFORM_MAC_1@__wxlua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxlua$(EXEEXT) ! @COND_PLATFORM_WIN32_1@__wxlua___win32rc = wxlua_wxlua_rc.o ### Targets: ### --- 42,48 ---- @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) ! @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxlua$(EXEEXT) ! @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o ### Targets: ### *************** *** 64,83 **** rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! ../bin/wxlua$(EXEEXT): $(WXLUA_OBJECTS) $(__wxlua___win32rc) ! $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -llua ! $(__wxlua___mac_setfilecmd) ! wxlua_wxlua.o: ./wxlua/src/wxlua.cpp ! $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ./wxlua/src/wxlua.cpp ! wxlua_lconsole.o: ./wxlua/src/lconsole.cpp ! $(CXXC) -c -o $@ $(WXLUA_CXXFLAGS) ./wxlua/src/lconsole.cpp ! wxlua_wxlua_rc.o: ./wxlua/src/wxlua.rc $(RESCOMP) -i$< -o$@ --include-dir ../modules ! wxlua_..\bindings\wxwidgets\wxluawrap.o: ./..\bindings\wxwidgets\wxluawrap.c ! $(CCC) -c -o $@ $(WXLUA_CFLAGS) ./..\bindings\wxwidgets\wxluawrap.c --- 64,83 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! ../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua ! $(__app_wxlua___mac_setfilecmd) ! app_wxlua_wxlua.o: ./wxlua/src/wxlua.cpp ! $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) ./wxlua/src/wxlua.cpp ! app_wxlua_lconsole.o: ./wxlua/src/lconsole.cpp ! $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) ./wxlua/src/lconsole.cpp ! app_wxlua_wxlua_rc.o: ./wxlua/src/wxlua.rc $(RESCOMP) -i$< -o$@ --include-dir ../modules ! app_wxlua_..\bindings\wxwidgets\wxluawrap.o: ./..\bindings\wxwidgets\wxluawrap.c ! $(CCC) -c -o $@ $(APP_WXLUA_CFLAGS) ./..\bindings\wxwidgets\wxluawrap.c |
|
From: Francesco <fr...@us...> - 2005-06-20 09:49:12
|
Update of /cvsroot/wxlua/wxLua/util/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985/util/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat util.dsp util.dsw Log Message: Index: util.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/util.dsw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** util.dsw 20 Jun 2005 09:02:59 -0000 1.1 --- util.dsw 20 Jun 2005 09:48:55 -0000 1.2 *************** *** 3,7 **** ############################################################################### ! Project: "bin2c"=util.dsp - Package Owner=<4> Package=<5> --- 3,7 ---- ############################################################################### ! Project: "util_bin2c"=util.dsp - Package Owner=<4> Package=<5> Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.bcc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.bcc 14 Jun 2005 21:44:42 -0000 1.2 --- makefile.bcc 20 Jun 2005 09:48:39 -0000 1.3 *************** *** 68,90 **** ### Variables: ### ! BIN2C_CFLAGS = -I$(BCCDIR)\include $(CPPFLAGS) $(CFLAGS) ! BIN2C_OBJECTS = \ ! bin2c_bin2c.obj ### Conditionally set variables: ### !if "$(USE_BIN2C)" == "1" ! __bin2c___depname = ..\..\..\bin\bin2c.exe !endif ### Targets: ### ! all: $(__bin2c___depname) clean: ! -if exist .\*.obj del .\*.obj ! -if exist .\*.res del .\*.res ! -if exist .\*.csm del .\*.csm -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe -if exist ..\..\..\bin\bin2c.tds del ..\..\..\bin\bin2c.tds --- 68,94 ---- ### Variables: ### ! UTIL_BIN2C_CFLAGS = -I$(BCCDIR)\include $(CPPFLAGS) $(CFLAGS) ! UTIL_BIN2C_OBJECTS = \ ! borland\util_bin2c_bin2c.obj ### Conditionally set variables: ### !if "$(USE_BIN2C)" == "1" ! __util_bin2c___depname = ..\..\..\bin\bin2c.exe !endif + all: borland + borland: + -if not exist borland mkdir borland + ### Targets: ### ! all: $(__util_bin2c___depname) clean: ! -if exist borland\*.obj del borland\*.obj ! -if exist borland\*.res del borland\*.res ! -if exist borland\*.csm del borland\*.csm -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe -if exist ..\..\..\bin\bin2c.tds del ..\..\..\bin\bin2c.tds *************** *** 95,105 **** !if "$(USE_BIN2C)" == "1" ! ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk @&&| ! c0x32.obj $(BIN2C_OBJECTS),$@,, import32.lib cw32.lib,, | !endif ! bin2c_bin2c.obj: ..\..\bin2c\bin2c.c ! $(CC) -q -c -P- -o$@ $(BIN2C_CFLAGS) $** --- 99,109 ---- !if "$(USE_BIN2C)" == "1" ! ..\..\..\bin\bin2c.exe: $(UTIL_BIN2C_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk @&&| ! c0x32.obj $(UTIL_BIN2C_OBJECTS),$@,, import32.lib cw32.lib,, | !endif ! borland\util_bin2c_bin2c.obj: ..\..\bin2c\bin2c.c ! $(CC) -q -c -P- -o$@ $(UTIL_BIN2C_CFLAGS) $** Index: util.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/util.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** util.dsp 20 Jun 2005 09:02:58 -0000 1.1 --- util.dsp 20 Jun 2005 09:48:55 -0000 1.2 *************** *** 5,9 **** # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! CFG=bin2c - Win32 Default !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run --- 5,9 ---- # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! CFG=util_bin2c - Win32 Default !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run *************** *** 14,29 **** !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "util.mak" CFG="bin2c - Win32 Default" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "bin2c - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "bin2c - Win32 DLL Unicode" (based on "Win32 (x86) Console Application") ! !MESSAGE "bin2c - Win32 DLL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "bin2c - Win32 DLL" (based on "Win32 (x86) Console Application") ! !MESSAGE "bin2c - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "bin2c - Win32 Unicode" (based on "Win32 (x86) Console Application") ! !MESSAGE "bin2c - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "bin2c - Win32 Default" (based on "Win32 (x86) Console Application") !MESSAGE --- 14,29 ---- !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE ! !MESSAGE NMAKE /f "util.mak" CFG="util_bin2c - Win32 Default" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE ! !MESSAGE "util_bin2c - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 DLL Unicode" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 DLL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 DLL" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 Unicode" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 Default" (based on "Win32 (x86) Console Application") !MESSAGE *************** *** 35,49 **** RSC=rc.exe ! !IF "$(CFG)" == "bin2c - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 35,49 ---- RSC=rc.exe ! !IF "$(CFG)" == "util_bin2c - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 58,72 **** # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "bin2c - Win32 DLL Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 58,72 ---- # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 DLL Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 81,95 **** # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "bin2c - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 81,95 ---- # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 104,118 **** # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "bin2c - Win32 DLL" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 104,118 ---- # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 DLL" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 127,141 **** # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "bin2c - Win32 Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 127,141 ---- # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 150,164 **** # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "bin2c - Win32 Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 150,164 ---- # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 173,187 **** # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "bin2c - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 173,187 ---- # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 196,210 **** # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "bin2c - Win32 Default" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "Release\bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "Release\bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c --- 196,210 ---- # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 Default" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c *************** *** 223,234 **** # Begin Target ! # Name "bin2c - Win32 DLL Unicode Debug" ! # Name "bin2c - Win32 DLL Unicode" ! # Name "bin2c - Win32 DLL Debug" ! # Name "bin2c - Win32 DLL" ! # Name "bin2c - Win32 Unicode Debug" ! # Name "bin2c - Win32 Unicode" ! # Name "bin2c - Win32 Debug" ! # Name "bin2c - Win32 Default" # Begin Group "Source Files" --- 223,234 ---- # Begin Target ! # Name "util_bin2c - Win32 DLL Unicode Debug" ! # Name "util_bin2c - Win32 DLL Unicode" ! # Name "util_bin2c - Win32 DLL Debug" ! # Name "util_bin2c - Win32 DLL" ! # Name "util_bin2c - Win32 Unicode Debug" ! # Name "util_bin2c - Win32 Unicode" ! # Name "util_bin2c - Win32 Debug" ! # Name "util_bin2c - Win32 Default" # Begin Group "Source Files" Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.vc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.vc 14 Jun 2005 21:44:42 -0000 1.2 --- makefile.vc 20 Jun 2005 09:48:55 -0000 1.3 *************** *** 43,65 **** ### Variables: ### ! BIN2C_CFLAGS = /MD /DWIN32 $(CPPFLAGS) $(CFLAGS) ! BIN2C_OBJECTS = \ ! bin2c_bin2c.obj ### Conditionally set variables: ### !if "$(USE_BIN2C)" == "1" ! __bin2c___depname = ..\..\..\bin\bin2c.exe !endif ### Targets: ### ! all: $(__bin2c___depname) clean: ! -if exist .\*.obj del .\*.obj ! -if exist .\*.res del .\*.res ! -if exist .\*.pch del .\*.pch -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe -if exist ..\..\..\bin\bin2c.ilk del ..\..\..\bin\bin2c.ilk --- 43,69 ---- ### Variables: ### ! UTIL_BIN2C_CFLAGS = /MD /DWIN32 $(CPPFLAGS) $(CFLAGS) ! UTIL_BIN2C_OBJECTS = \ ! msvc\util_bin2c_bin2c.obj ### Conditionally set variables: ### !if "$(USE_BIN2C)" == "1" ! __util_bin2c___depname = ..\..\..\bin\bin2c.exe !endif + all: msvc + msvc: + -if not exist msvc mkdir msvc + ### Targets: ### ! all: $(__util_bin2c___depname) clean: ! -if exist msvc\*.obj del msvc\*.obj ! -if exist msvc\*.res del msvc\*.res ! -if exist msvc\*.pch del msvc\*.pch -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe -if exist ..\..\..\bin\bin2c.ilk del ..\..\..\bin\bin2c.ilk *************** *** 67,77 **** !if "$(USE_BIN2C)" == "1" ! ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) @<< ! $(BIN2C_OBJECTS) << !endif ! bin2c_bin2c.obj: ..\..\bin2c\bin2c.c ! $(CC) /c /nologo /TC /Fo$@ $(BIN2C_CFLAGS) $** --- 71,81 ---- !if "$(USE_BIN2C)" == "1" ! ..\..\..\bin\bin2c.exe: $(UTIL_BIN2C_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) @<< ! $(UTIL_BIN2C_OBJECTS) << !endif ! msvc\util_bin2c_bin2c.obj: ..\..\bin2c\bin2c.c ! $(CC) /c /nologo /TC /Fo$@ $(UTIL_BIN2C_CFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.wat,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.wat 14 Jun 2005 21:44:42 -0000 1.2 --- makefile.wat 20 Jun 2005 09:48:55 -0000 1.3 *************** *** 58,99 **** ### Conditionally set variables: ### ! __bin2c___depname = !ifeq USE_BIN2C 1 ! __bin2c___depname = ..\..\..\bin\bin2c.exe !endif ### Variables: ### ! BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) ! BIN2C_OBJECTS = & ! bin2c_bin2c.obj ### Targets: ### ! all : .SYMBOLIC $(__bin2c___depname) clean : .SYMBOLIC ! -if exist .\*.obj del .\*.obj ! -if exist .\*.res del .\*.res ! -if exist .\*.lbc del .\*.lbc ! -if exist .\*.ilk del .\*.ilk ! -if exist .\*.pch del .\*.pch -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe !ifeq USE_BIN2C 1 ! ..\..\..\bin\bin2c.exe : $(BIN2C_OBJECTS) ! @%create bin2c.lbc ! @%append bin2c.lbc option quiet ! @%append bin2c.lbc name $^@ ! @%append bin2c.lbc option caseexact ! @%append bin2c.lbc $(LDFLAGS) ! @for %i in ($(BIN2C_OBJECTS)) do @%append bin2c.lbc file %i ! @for %i in () do @%append bin2c.lbc library %i ! @%append bin2c.lbc ! wlink @bin2c.lbc !endif ! bin2c_bin2c.obj : .AUTODEPEND ..\..\bin2c\bin2c.c ! $(CC) -zq -fo=$^@ $(BIN2C_CFLAGS) $< --- 58,103 ---- ### Conditionally set variables: ### ! __util_bin2c___depname = !ifeq USE_BIN2C 1 ! __util_bin2c___depname = ..\..\..\bin\bin2c.exe !endif ### Variables: ### ! UTIL_BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) ! UTIL_BIN2C_OBJECTS = & ! watcom\util_bin2c_bin2c.obj + all : watcom + watcom : + -if not exist watcom mkdir watcom + ### Targets: ### ! all : .SYMBOLIC $(__util_bin2c___depname) clean : .SYMBOLIC ! -if exist watcom\*.obj del watcom\*.obj ! -if exist watcom\*.res del watcom\*.res ! -if exist watcom\*.lbc del watcom\*.lbc ! -if exist watcom\*.ilk del watcom\*.ilk ! -if exist watcom\*.pch del watcom\*.pch -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe !ifeq USE_BIN2C 1 ! ..\..\..\bin\bin2c.exe : $(UTIL_BIN2C_OBJECTS) ! @%create watcom\util_bin2c.lbc ! @%append watcom\util_bin2c.lbc option quiet ! @%append watcom\util_bin2c.lbc name $^@ ! @%append watcom\util_bin2c.lbc option caseexact ! @%append watcom\util_bin2c.lbc $(LDFLAGS) ! @for %i in ($(UTIL_BIN2C_OBJECTS)) do @%append watcom\util_bin2c.lbc file %i ! @for %i in () do @%append watcom\util_bin2c.lbc library %i ! @%append watcom\util_bin2c.lbc ! wlink @watcom\util_bin2c.lbc !endif ! watcom\util_bin2c_bin2c.obj : .AUTODEPEND ..\..\bin2c\bin2c.c ! $(CC) -zq -fo=$^@ $(UTIL_BIN2C_CFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/makefile.gcc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.gcc 14 Jun 2005 21:44:42 -0000 1.2 --- makefile.gcc 20 Jun 2005 09:48:55 -0000 1.3 *************** *** 43,72 **** ### Variables: ### ! BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) ! BIN2C_OBJECTS = \ ! bin2c_bin2c.o ### Conditionally set variables: ### ifeq ($(USE_BIN2C),1) ! __bin2c___depname = ..\..\..\bin\bin2c.exe endif ### Targets: ### ! all: $(__bin2c___depname) clean: ! -if exist .\*.o del .\*.o -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe ifeq ($(USE_BIN2C),1) ! ..\..\..\bin\bin2c.exe: $(BIN2C_OBJECTS) ! $(CC) -o $@ $(BIN2C_OBJECTS) $(LDFLAGS) endif ! bin2c_bin2c.o: ../../bin2c/bin2c.c ! $(CC) -c -o $@ $(BIN2C_CFLAGS) $< .PHONY: all clean --- 43,76 ---- ### Variables: ### ! UTIL_BIN2C_CFLAGS = $(CPPFLAGS) $(CFLAGS) ! UTIL_BIN2C_OBJECTS = \ ! mingw\util_bin2c_bin2c.o ### Conditionally set variables: ### ifeq ($(USE_BIN2C),1) ! __util_bin2c___depname = ..\..\..\bin\bin2c.exe endif + all: mingw + mingw: + -if not exist mingw mkdir mingw + ### Targets: ### ! all: $(__util_bin2c___depname) clean: ! -if exist mingw\*.o del mingw\*.o -if exist ..\..\..\bin\bin2c.exe del ..\..\..\bin\bin2c.exe ifeq ($(USE_BIN2C),1) ! ..\..\..\bin\bin2c.exe: $(UTIL_BIN2C_OBJECTS) ! $(CC) -o $@ $(UTIL_BIN2C_OBJECTS) $(LDFLAGS) endif ! mingw\util_bin2c_bin2c.o: ../../bin2c/bin2c.c ! $(CC) -c -o $@ $(UTIL_BIN2C_CFLAGS) $< .PHONY: all clean |
|
From: Francesco <fr...@us...> - 2005-06-20 09:49:11
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24985/build/msw Added Files: wxLua.dsw Log Message: --- NEW FILE: wxLua.dsw --- Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### Project: "app_wxlua"=..\..\apps\build\msw\apps.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ Begin Project Dependency Project_Dep_Name mod_lua End Project Dependency Begin Project Dependency Project_Dep_Name mod_lua_lib End Project Dependency Begin Project Dependency Project_Dep_Name mod_wxbind End Project Dependency Begin Project Dependency Project_Dep_Name mod_wxlua End Project Dependency Begin Project Dependency Project_Dep_Name mod_wxluadebug End Project Dependency Begin Project Dependency Project_Dep_Name mod_wxluasocket End Project Dependency }}} ############################################################################### Project: "mod_lua"=..\..\modules\build\msw\modules_mod_lua.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "mod_lua_lib"=..\..\modules\build\msw\modules_mod_lua_lib.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "mod_wxbind"=..\..\modules\build\msw\modules_mod_wxbind.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "mod_wxlua"=..\..\modules\build\msw\modules_mod_wxlua.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "mod_wxluadebug"=..\..\modules\build\msw\modules_mod_wxluadebug.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "mod_wxluasocket"=..\..\modules\build\msw\modules_mod_wxluasocket.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "util_bin2c"=..\..\util\build\msw\util.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Global: Package=<5> {{{ }}} Package=<3> {{{ }}} ############################################################################### |
|
From: Francesco <fr...@us...> - 2005-06-20 09:03:28
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28972/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.wat Added Files: apps.dsp apps.dsw Log Message: Added DSW/DSP files Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.bcc 14 Jun 2005 21:44:39 -0000 1.3 --- makefile.bcc 20 Jun 2005 09:02:46 -0000 1.4 *************** *** 162,166 **** ### Targets: ### ! all: wrap ..\..\..\bin\wxlua.exe clean: --- 162,166 ---- ### Targets: ### ! all: ..\..\..\bin\wxlua.exe clean: *************** *** 175,183 **** -if exist ..\..\..\bin\wxlua.ils del ..\..\..\bin\wxlua.ils ! wrap: ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) wrap borland$(WXLIBPOSTFIX)\wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| c0x32.obj $(WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\wxlua_wxlua.res --- 175,179 ---- -if exist ..\..\..\bin\wxlua.ils del ..\..\..\bin\wxlua.ils ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| c0x32.obj $(WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTLIBPOSTFIX).lib wxjpeg$(WX3RDPARTLIBPOSTFIX).lib wxpng$(WX3RDPARTLIBPOSTFIX).lib wxzlib$(WX3RDPARTLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\wxlua_wxlua.res --- NEW FILE: apps.dsp --- # Microsoft Developer Studio Project File - Name="apps" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=wxlua - Win32 Default !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "apps.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "apps.mak" CFG="wxlua - Win32 Default" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") !MESSAGE "wxlua - Win32 DLL Unicode" (based on "Win32 (x86) Console Application") !MESSAGE "wxlua - Win32 DLL Debug" (based on "Win32 (x86) Console Application") !MESSAGE "wxlua - Win32 DLL" (based on "Win32 (x86) Console Application") !MESSAGE "wxlua - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") !MESSAGE "wxlua - Win32 Unicode" (based on "Win32 (x86) Console Application") !MESSAGE "wxlua - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "wxlua - Win32 Default" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "wxlua - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prjud\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prjud\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /c # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d WXUSINGDLL # ADD RSC /l 0x409 /d "_CONSOLE" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d WXUSINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug !ELSEIF "$(CFG)" == "wxlua - Win32 DLL Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prju\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prju\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /c # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d WXUSINGDLL # ADD RSC /l 0x409 /d "_CONSOLE" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /d WXUSINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" !ELSEIF "$(CFG)" == "wxlua - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prjd\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prjd\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /c # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXUSINGDLL" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d WXUSINGDLL # ADD RSC /l 0x409 /d "_CONSOLE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d "_DEBUG" /d WXUSINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /debug !ELSEIF "$(CFG)" == "wxlua - Win32 DLL" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prj\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prj\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXMSW__" /D "WXUSINGDLL" /c # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXMSW__" /D "WXUSINGDLL" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d WXUSINGDLL # ADD RSC /l 0x409 /d "_CONSOLE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /d WXUSINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" !ELSEIF "$(CFG)" == "wxlua - Win32 Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prjud\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prjud\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d _DEBUG # ADD RSC /l 0x409 /d "_CONSOLE" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26ud_adv.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug !ELSEIF "$(CFG)" == "wxlua - Win32 Unicode" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prju\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prju\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXMSW__" /c # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i ..\..\..\modules # ADD RSC /l 0x409 /d "_CONSOLE" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i ..\..\..\modules BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26u_adv.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" !ELSEIF "$(CFG)" == "wxlua - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prjd\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prjd\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /I "..\..\..\modules" /W4 /Od /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d _DEBUG # ADD RSC /l 0x409 /d "_CONSOLE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26d_adv.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /debug !ELSEIF "$(CFG)" == "wxlua - Win32 Default" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "..\..\..\bin" # PROP BASE Intermediate_Dir "msvc6prj\wxlua" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\..\bin" # PROP Intermediate_Dir "msvc6prj\wxlua" # PROP Target_Dir "" # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXMSW__" /c # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /I "..\..\..\modules" /w /O2 /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_CONSOLE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 /d "_CONSOLE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i ..\..\..\modules # ADD RSC /l 0x409 /d "_CONSOLE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i ..\..\..\modules BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib lua.lib wxmsw26_adv.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /subsystem:console /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" !ENDIF # Begin Target # Name "wxlua - Win32 DLL Unicode Debug" # Name "wxlua - Win32 DLL Unicode" # Name "wxlua - Win32 DLL Debug" # Name "wxlua - Win32 DLL" # Name "wxlua - Win32 Unicode Debug" # Name "wxlua - Win32 Unicode" # Name "wxlua - Win32 Debug" # Name "wxlua - Win32 Default" # Begin Group "Source Files" # PROP Default_Filter "" # Begin Source File SOURCE=..\..\wxlua\src\lconsole.cpp # End Source File # Begin Source File SOURCE=..\..\wxlua\src\wxlua.cpp # End Source File # Begin Source File SOURCE=..\..\wxlua\src\wxlua.rc # End Source File # Begin Source File SOURCE=..\..\..\bindings\wxwidgets\wxluawrap.c # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "" # Begin Source File SOURCE=..\..\wxlua\include\editor.h # End Source File # Begin Source File SOURCE=..\..\wxlua\include\lconsole.h # End Source File # Begin Source File SOURCE=..\..\wxlua\include\wxlua.h # End Source File # End Group # End Target # End Project --- NEW FILE: apps.dsw --- Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### Project: "wxlua"=apps.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.wat 14 Jun 2005 21:44:39 -0000 1.3 --- makefile.wat 20 Jun 2005 09:02:46 -0000 1.4 *************** *** 166,170 **** ### Targets: ### ! all : .SYMBOLIC wrap ..\..\..\bin\wxlua.exe clean : .SYMBOLIC --- 166,170 ---- ### Targets: ### ! all : .SYMBOLIC ..\..\..\bin\wxlua.exe clean : .SYMBOLIC *************** *** 176,184 **** -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! wrap : ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ! ..\..\..\bin\wxlua.exe : $(WXLUA_OBJECTS) wrap watcom$(WXLIBPOSTFIX)\wxlua_wxlua.res @%create watcom$(WXLIBPOSTFIX)\wxlua.lbc @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc option quiet --- 176,180 ---- -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! ..\..\..\bin\wxlua.exe : $(WXLUA_OBJECTS) watcom$(WXLIBPOSTFIX)\wxlua_wxlua.res @%create watcom$(WXLIBPOSTFIX)\wxlua.lbc @%append watcom$(WXLIBPOSTFIX)\wxlua.lbc option quiet Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.gcc 14 Jun 2005 21:44:39 -0000 1.3 --- makefile.gcc 20 Jun 2005 09:02:46 -0000 1.4 *************** *** 142,146 **** ### Targets: ### ! all: wrap ..\..\..\bin\wxlua.exe clean: --- 142,146 ---- ### Targets: ### ! all: ..\..\..\bin\wxlua.exe clean: *************** *** 148,156 **** -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! wrap: ..\..\..\bindings\wxwidgets\override.hpp ! ..\..\..\bin\lua -e"target=\"msw\"" ..\..\wxlua\src\wrap.lua ! copy ..\..\..\bindings\wxwidgets\wxluawrap.i ..\..\..\bindings\wxwidgets\wxluawrap.c ! ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) wrap mingw$(WXLIBPOSTFIX)\wxlua_wxlua_rc.o $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -lwxluadebug -lwxluasocket -lwxlua -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 --- 148,152 ---- -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe ! ..\..\..\bin\wxlua.exe: $(WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\wxlua_wxlua_rc.o $(CXX) -o $@ $(WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -lwxluadebug -lwxluasocket -lwxlua -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTLIBPOSTFIX) -lwxjpeg$(WX3RDPARTLIBPOSTFIX) -lwxpng$(WX3RDPARTLIBPOSTFIX) -lwxzlib$(WX3RDPARTLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 |
