Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:39
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/apps Modified Files: Makefile.in Log Message: Added infrastructure to build custom wxbind Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.in 2 Feb 2006 18:46:43 -0000 1.19 --- Makefile.in 2 Feb 2006 23:02:28 -0000 1.20 *************** *** 35,40 **** DESTDIR = ! APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_wxlua.o \ --- 35,40 ---- DESTDIR = ! APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(top_srcdir)/modules/setup $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_wxlua.o \ *************** *** 42,46 **** $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(WXSTEDIT)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ app_wxluaedit_wxledit.o \ --- 42,47 ---- $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(WXSTEDIT)/include -I$(top_srcdir)/modules/setup $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ app_wxluaedit_wxledit.o \ |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:39
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/apps/build/msw Modified Files: apps_app_wxlua.dsp apps_app_wxluaedit.dsp makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Added infrastructure to build custom wxbind Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** makefile.bcc 2 Feb 2006 18:46:43 -0000 1.18 --- makefile.bcc 2 Feb 2006 23:02:28 -0000 1.19 *************** *** 87,91 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ --- 87,92 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\setup $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ *************** *** 96,100 **** -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT)\include \ ! -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ --- 97,102 ---- -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT)\include \ ! -I$(WX_DIR)\contrib\include -I..\..\..\modules\setup $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ Index: apps_app_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** apps_app_wxlua.dsp 2 Feb 2006 18:46:43 -0000 1.9 --- apps_app_wxlua.dsp 2 Feb 2006 23:02:28 -0000 1.10 *************** *** 48,57 **** # 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" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 48,57 ---- # 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" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 73,82 **** # 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" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 73,82 ---- # 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" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 98,107 **** # 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" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 98,107 ---- # 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" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 123,132 **** # 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" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 123,132 ---- # 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" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 148,157 **** # 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" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 148,157 ---- # 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" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 173,182 **** # 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" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 173,182 ---- # 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" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 198,207 **** # 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" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 198,207 ---- # 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" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 223,232 **** # 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" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 223,232 ---- # 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" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** makefile.wat 2 Feb 2006 18:46:43 -0000 1.18 --- makefile.wat 2 Feb 2006 23:02:28 -0000 1.19 *************** *** 169,173 **** -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & --- 169,174 ---- -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. & ! -i=..\..\..\modules\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & *************** *** 177,181 **** -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. -i=$(%WXSTEDIT)\include & ! -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & --- 178,183 ---- -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. -i=$(%WXSTEDIT)\include & ! -i=$(WX_DIR)\contrib\include -i=..\..\..\modules\setup $(CPPFLAGS) & ! $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** makefile.gcc 2 Feb 2006 18:46:43 -0000 1.19 --- makefile.gcc 2 Feb 2006 23:02:28 -0000 1.20 *************** *** 57,61 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) $(____WX_DEBUG_2) \ ! -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \ --- 57,62 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) $(____WX_DEBUG_2) \ ! -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\setup $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \ *************** *** 67,71 **** $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) $(____WX_DEBUG_2) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT)\include \ ! -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o \ --- 68,73 ---- $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) $(____WX_DEBUG_2) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT)\include \ ! -I$(WX_DIR)\contrib\include -I..\..\..\modules\setup $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o \ Index: apps_app_wxluaedit.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxluaedit.dsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** apps_app_wxluaedit.dsp 2 Feb 2006 18:46:43 -0000 1.10 --- apps_app_wxluaedit.dsp 2 Feb 2006 23:02:28 -0000 1.11 *************** *** 48,57 **** # PROP Intermediate_Dir "msvc6prjud\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 48,57 ---- # PROP Intermediate_Dir "msvc6prjud\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 73,82 **** # PROP Intermediate_Dir "msvc6prju\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 73,82 ---- # PROP Intermediate_Dir "msvc6prju\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 98,107 **** # PROP Intermediate_Dir "msvc6prjd\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 98,107 ---- # PROP Intermediate_Dir "msvc6prjd\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 123,132 **** # PROP Intermediate_Dir "msvc6prj\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 123,132 ---- # PROP Intermediate_Dir "msvc6prj\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 148,157 **** # PROP Intermediate_Dir "msvc6prjud\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 148,157 ---- # PROP Intermediate_Dir "msvc6prjud\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 173,182 **** # PROP Intermediate_Dir "msvc6prju\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 173,182 ---- # PROP Intermediate_Dir "msvc6prju\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 198,207 **** # PROP Intermediate_Dir "msvc6prjd\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 198,207 ---- # PROP Intermediate_Dir "msvc6prjd\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 223,232 **** # PROP Intermediate_Dir "msvc6prj\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 223,232 ---- # PROP Intermediate_Dir "msvc6prj\app_wxluaedit" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** makefile.vc 2 Feb 2006 18:46:43 -0000 1.17 --- makefile.vc 2 Feb 2006 23:02:28 -0000 1.18 *************** *** 61,65 **** /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_0) \ $(____WX_DEBUG_1) $(______WX_DEBUG) /Fd..\..\..\bin\wxlua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ --- 61,66 ---- /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_0) \ $(____WX_DEBUG_1) $(______WX_DEBUG) /Fd..\..\..\bin\wxlua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I..\..\..\modules\setup /GR /EHsc \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ *************** *** 72,76 **** $(____WX_DEBUG_1) $(______WX_DEBUG) /Fd..\..\..\bin\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I$(WXSTEDIT)\include \ ! /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ --- 73,78 ---- $(____WX_DEBUG_1) $(______WX_DEBUG) /Fd..\..\..\bin\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I$(WXSTEDIT)\include \ ! /I$(WX_DIR)\contrib\include /I..\..\..\modules\setup /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:39
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549 Modified Files: configure Log Message: Added infrastructure to build custom wxbind Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure 29 Jan 2006 15:45:38 -0000 1.8 --- configure 2 Feb 2006 23:02:28 -0000 1.9 *************** *** 4577,4580 **** --- 4577,4588 ---- + WXLUA_MODNAMES="$WXLUA_MODNAMES wxbindstc" + TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_wxbindstc""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" + + WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP" + + WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" + + WXLUA_MODNAMES="$WXLUA_MODNAMES lua" TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_lua""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:39
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/apps/build/bakefiles Modified Files: apps.bkl Log Message: Added infrastructure to build custom wxbind Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** apps.bkl 2 Feb 2006 18:46:43 -0000 1.19 --- apps.bkl 2 Feb 2006 23:02:28 -0000 1.20 *************** *** 77,80 **** --- 77,83 ---- <win32-res>wxlua/src/wxlua.rc</win32-res> + <!-- always use wxLua's official wxluasetup.h --> + <include>$(WXLUA_BASEDIR)/modules/setup</include> + <wxlua-alllibs/> <wx-alllibs/> *************** *** 107,110 **** --- 110,115 ---- <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> + <!-- always use wxLua's official wxluasetup.h --> + <include>$(WXLUA_BASEDIR)/modules/setup</include> <wxlua-alllibs/> |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:39
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/build/bakefiles Modified Files: Bakefiles.bkgen wxluabase.bkl Added Files: wxbindcustom.bkgen Log Message: Added infrastructure to build custom wxbind --- NEW FILE: wxbindcustom.bkgen --- <?xml version="1.0" ?> <!-- $Id: wxbindcustom.bkgen,v 1.1 2006/02/02 23:02:28 frm Exp $ --> <bakefile-gen> <!-- ================================================================== --> <!-- Input bakefiles --> <!-- ================================================================== --> <input> ../../modules/wxbind/build/wxbindcustom.bkl </input> <!-- required since wxLua bakefiles use wx presets stored in wxWidgets subfolders... --> <add-flags>-I%WXWIN%/build/bakefiles/wxpresets</add-flags> <!-- ================================================================== --> <!-- Formats to (not) generate --> <!-- ================================================================== --> <disable-formats>msvc6prj,dmars,cbx_unix,cbuilderx</disable-formats> <!-- List of output formats to generate: --> <add-formats> borland,dmars,mingw,msvc,watcom,cbuilderx,cbx_unix,gnu </add-formats> <!-- ================================================================== --> <!-- Output directories --> <!-- ================================================================== --> <!-- Directories where msw makefiles should go: --> <add-flags formats="borland">--crlf=dos -o$(INPUT_FILE_DIR)/makefile.bcc</add-flags> <add-flags formats="mingw">--crlf=dos -o$(INPUT_FILE_DIR)/makefile.gcc</add-flags> <add-flags formats="msvc">--crlf=dos -o$(INPUT_FILE_DIR)/makefile.vc</add-flags> <add-flags formats="watcom">--crlf=dos -o$(INPUT_FILE_DIR)/makefile.wat</add-flags> <add-flags formats="gnu">--crlf=dos -o$(INPUT_FILE_DIR)/makefile.gnu</add-flags> </bakefile-gen> Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxluabase.bkl 2 Feb 2006 18:46:43 -0000 1.10 --- wxluabase.bkl 2 Feb 2006 23:02:28 -0000 1.11 *************** *** 179,186 **** <!-- a template for wxLua-based exe/dll targets --> <template id="wxlua" template="wx,wxlua-base"> ! <if cond="TARGETING_WIN32=='1'"> <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path> </if> ! <if cond="TARGETING_WIN32=='0'"> <lib-path>$(top_builddir)$(WXLUA_OUTPUT_FOLDER)</lib-path> </if> --- 179,186 ---- <!-- a template for wxLua-based exe/dll targets --> <template id="wxlua" template="wx,wxlua-base"> ! <if cond="TARGETING_WIN32=='1' or FORMAT=='gnu'"> <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path> </if> ! <if cond="TARGETING_WIN32=='0' and FORMAT!='gnu'"> <lib-path>$(top_builddir)$(WXLUA_OUTPUT_FOLDER)</lib-path> </if> Index: Bakefiles.bkgen =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/Bakefiles.bkgen,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Bakefiles.bkgen 25 Jan 2006 18:35:58 -0000 1.5 --- Bakefiles.bkgen 2 Feb 2006 23:02:28 -0000 1.6 *************** *** 14,17 **** --- 14,18 ---- ../../modules/build/bakefiles/modules.bkl ../../util/build/bakefiles/util.bkl + ../../modules/wxbind/build/wxbindcustom.bkl </input> *************** *** 33,36 **** --- 34,43 ---- msvc6prj </del-formats> + <del-formats files="../../modules/wxbind/build/wxbindcustom.bkl"> + msvc6prj,autoconf + </del-formats> + <add-formats files="../../modules/wxbind/build/wxbindcustom.bkl"> + gnu + </add-formats> *************** *** 41,45 **** <!-- Directories where msw makefiles should go: --> ! <add-flags formats="borland" >-o$(INPUT_FILE_DIR)/../msw/makefile.bcc</add-flags> <add-flags formats="mingw">-o$(INPUT_FILE_DIR)/../msw/makefile.gcc</add-flags> <add-flags formats="msvc">-o$(INPUT_FILE_DIR)/../msw/makefile.vc</add-flags> --- 48,52 ---- <!-- Directories where msw makefiles should go: --> ! <add-flags formats="borland">-o$(INPUT_FILE_DIR)/../msw/makefile.bcc</add-flags> <add-flags formats="mingw">-o$(INPUT_FILE_DIR)/../msw/makefile.gcc</add-flags> <add-flags formats="msvc">-o$(INPUT_FILE_DIR)/../msw/makefile.vc</add-flags> |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:39
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat wxLua.dsw Log Message: Added infrastructure to build custom wxbind Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** makefile.vc 27 Jan 2006 21:57:09 -0000 1.12 --- makefile.vc 2 Feb 2006 23:02:29 -0000 1.13 *************** *** 64,70 **** WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" \ USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ ! USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ ! WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" ### Conditionally set variables: ### --- 64,69 ---- WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" \ USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ ! USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" ### Conditionally set variables: ### Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile.bcc 27 Jan 2006 21:57:09 -0000 1.11 --- makefile.bcc 2 Feb 2006 23:02:29 -0000 1.12 *************** *** 100,113 **** !endif - # The folder where wxluasetup.h is searched - !ifndef WXLUASETUP_DIR - WXLUASETUP_DIR = ..\..\modules\wxbind\src - !endif - - # The folder where wxLuaBind library is sent - !ifndef WXLUABINDLIB_DIR - WXLUABINDLIB_DIR = ..\..\lib - !endif - # Compile the wxLua app ? [0,1] !ifndef USE_WXLUAAPP --- 100,103 ---- *************** *** 136,142 **** -DUSE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ -DUSE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ ! -DWXLUASETUP_DIR="$(WXLUASETUP_DIR)" \ ! -DWXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" ### Conditionally set variables: ### --- 126,130 ---- -DUSE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ -DUSE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ ! -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" ### Conditionally set variables: ### Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/wxLua.dsw,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxLua.dsw 25 Jan 2006 19:17:09 -0000 1.4 --- wxLua.dsw 2 Feb 2006 23:02:29 -0000 1.5 *************** *** 22,25 **** --- 22,28 ---- End Project Dependency Begin Project Dependency + Project_Dep_Name mod_wxbindstc + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_wxlua End Project Dependency *************** *** 52,55 **** --- 55,61 ---- End Project Dependency Begin Project Dependency + Project_Dep_Name mod_wxbindstc + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_wxlua End Project Dependency *************** *** 103,106 **** --- 109,124 ---- ############################################################################### + Project: "mod_wxbindstc"=..\..\modules\build\msw\modules_mod_wxbindstc.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "mod_wxlua"=..\..\modules\build\msw\modules_mod_wxlua.dsp - Package Owner=<4> Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile.wat 27 Jan 2006 21:57:09 -0000 1.11 --- makefile.wat 2 Feb 2006 23:02:29 -0000 1.12 *************** *** 106,112 **** WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" & USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" & ! USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" & ! WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" & ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" --- 106,111 ---- WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" & USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" & ! USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" & ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile.gcc 27 Jan 2006 21:57:09 -0000 1.11 --- makefile.gcc 2 Feb 2006 23:02:29 -0000 1.12 *************** *** 60,66 **** WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" \ USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ ! USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ ! WXLUASETUP_DIR="$(WXLUASETUP_DIR)" WXLUABINDLIB_DIR="$(WXLUABINDLIB_DIR)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" ### Conditionally set variables: ### --- 60,65 ---- WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" USE_APPS="$(USE_APPS)" \ USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ ! USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" ### Conditionally set variables: ### |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:38
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/modules/wxbind/src Removed Files: wxluasetup.h Log Message: Added infrastructure to build custom wxbind --- wxluasetup.h DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:38
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/modules Modified Files: Makefile.in Log Message: Added infrastructure to build custom wxbind Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile.in 2 Feb 2006 18:46:43 -0000 1.20 --- Makefile.in 2 Feb 2006 23:02:29 -0000 1.21 *************** *** 82,87 **** MOD_LUA_OBJECTS = \ mod_lua_lua.o ! WXLUA_LIB_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ wxlua_lib_wxlcallb.o \ --- 82,88 ---- MOD_LUA_OBJECTS = \ mod_lua_lua.o ! WXLUA_LIB_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ wxlua_lib_wxlcallb.o \ *************** *** 90,95 **** wxlua_lib_internal.o \ wxlua_lib_wxlintrp.o ! WXLUA_DLL_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -DWXLUA_MAKINGDLL $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ wxlua_dll_wxlcallb.o \ --- 91,97 ---- wxlua_lib_internal.o \ wxlua_lib_wxlintrp.o ! WXLUA_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXLUA_MAKINGDLL $(PIC_FLAG) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ wxlua_dll_wxlcallb.o \ *************** *** 98,103 **** wxlua_dll_internal.o \ wxlua_dll_wxlintrp.o ! WXBIND_LIB_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) WXBIND_LIB_OBJECTS = \ wxbind_lib_wxlua.o \ --- 100,106 ---- wxlua_dll_internal.o \ wxlua_dll_wxlintrp.o ! WXBIND_LIB_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) $(CPPFLAGS) \ ! $(CXXFLAGS) WXBIND_LIB_OBJECTS = \ wxbind_lib_wxlua.o \ *************** *** 137,142 **** wxbind_lib_thread.o \ wxbind_lib_help.o ! WXBIND_DLL_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -DWXBIND_MAKINGDLL $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = \ wxbind_dll_wxlua.o \ --- 140,146 ---- wxbind_lib_thread.o \ wxbind_lib_help.o ! WXBIND_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXBIND_MAKINGDLL $(PIC_FLAG) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = \ wxbind_dll_wxlua.o \ *************** *** 176,181 **** wxbind_dll_thread.o \ wxbind_dll_help.o ! WXBINDSTC_LIB_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_LIB_OBJECTS = \ wxbindstc_lib_wxstc_class.o \ --- 180,186 ---- wxbind_dll_thread.o \ wxbind_dll_help.o ! WXBINDSTC_LIB_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) $(CPPFLAGS) \ ! $(CXXFLAGS) WXBINDSTC_LIB_OBJECTS = \ wxbindstc_lib_wxstc_class.o \ *************** *** 185,190 **** wxbindstc_lib_wxstc_define.o \ wxbindstc_lib_wxstc_builtin.o ! WXBINDSTC_DLL_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -DWXBINDSTC_MAKINGDLL $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = \ wxbindstc_dll_wxstc_class.o \ --- 190,196 ---- wxbindstc_lib_wxstc_define.o \ wxbindstc_lib_wxstc_builtin.o ! WXBINDSTC_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXBINDSTC_MAKINGDLL $(PIC_FLAG) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = \ wxbindstc_dll_wxstc_class.o \ *************** *** 194,211 **** wxbindstc_dll_wxstc_define.o \ wxbindstc_dll_wxstc_builtin.o ! WXLUADEBUG_LIB_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ wxluadebug_lib_wxldebug.o \ wxluadebug_lib_splttree.o \ wxluadebug_lib_staktree.o ! WXLUADEBUG_DLL_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -DWXLUADEBUG_MAKINGDLL $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ wxluadebug_dll_wxldebug.o \ wxluadebug_dll_splttree.o \ wxluadebug_dll_staktree.o ! WXLUASOCKET_LIB_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ wxluasocket_lib_wxlsock.o \ --- 200,220 ---- wxbindstc_dll_wxstc_define.o \ wxbindstc_dll_wxstc_builtin.o ! WXLUADEBUG_LIB_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = \ wxluadebug_lib_wxldebug.o \ wxluadebug_lib_splttree.o \ wxluadebug_lib_staktree.o ! WXLUADEBUG_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXLUADEBUG_MAKINGDLL \ ! $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = \ wxluadebug_dll_wxldebug.o \ wxluadebug_dll_splttree.o \ wxluadebug_dll_staktree.o ! WXLUASOCKET_LIB_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ wxluasocket_lib_wxlsock.o \ *************** *** 215,220 **** wxluasocket_lib_wxldserv.o \ wxluasocket_lib_dservice.o ! WXLUASOCKET_DLL_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -DWXLUASOCKET_MAKINGDLL $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ wxluasocket_dll_wxlsock.o \ --- 224,230 ---- wxluasocket_lib_wxldserv.o \ wxluasocket_lib_dservice.o ! WXLUASOCKET_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ ! -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXLUASOCKET_MAKINGDLL \ ! $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ wxluasocket_dll_wxlsock.o \ |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:37
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/modules/wxbind/build Added Files: makefile.bcc makefile.gcc makefile.gnu makefile.vc makefile.wat wxbindcustom.bkl Log Message: Added infrastructure to build custom wxbind --- NEW FILE: makefile.bcc --- # ========================================================================= # This makefile was generated by # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= .autodepend !ifndef BCCDIR !ifndef MAKEDIR !error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 !endif BCCDIR = $(MAKEDIR)\.. !endif # ------------------------------------------------------------------------- # These are configurable options: # ------------------------------------------------------------------------- # C++ compiler !ifndef CXX CXX = bcc32 !endif # Standard flags for C++ !ifndef CXXFLAGS CXXFLAGS = !endif # Standard preprocessor flags (common for CC and CXX) !ifndef CPPFLAGS CPPFLAGS = -a8 -g0 !endif # Standard linker flags !ifndef LDFLAGS LDFLAGS = !endif # The directory where wxWidgets library is installed !ifndef WX_DIR WX_DIR = $(WXWIN) !endif # Use DLL build of wx library to use? [0,1] !ifndef WX_SHARED WX_SHARED = 0 !endif # Compile Unicode build of wxWidgets? [0,1] !ifndef WX_UNICODE WX_UNICODE = 0 !endif # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] !ifndef WX_DEBUG WX_DEBUG = 1 !endif # Version of the wx library to build against. !ifndef WX_VERSION WX_VERSION = 26 !endif # The folder where user's custom wxluasetup.h is searched !ifndef WXLUASETUP_DIR WXLUASETUP_DIR = ..\..\..\modules\wxbind\src !endif # The folder where user's custom wxLuaBind library is sent !ifndef WXLUABINDLIB_DIR WXLUABINDLIB_DIR = ..\..\..\lib !endif # ------------------------------------------------------------------------- # Do not modify the rest of this file! # ------------------------------------------------------------------------- ### Variables: ### WXBINDCUSTOM_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_xml.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_geometry.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_data.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_html.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_grid.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_mdi.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_file.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_config.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_object.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_menutool.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_event.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_gdi.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlprint.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_fl.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_defsutil.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_image.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_sizer.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wave.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_socket.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_event.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_windows.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlhtmlwin.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_define.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_appframe.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_regex.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_builtin.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_controls.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_class.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_plot.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_datetime.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_dialogs.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_clipdrag.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_print.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_thread.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_help.obj WXBINDCUSTOM_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ -DWXBINDCUSTOM_MAKINGDLL -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_xml.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_geometry.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_data.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_html.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_grid.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_mdi.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_file.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_config.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_object.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_menutool.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_event.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_gdi.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlprint.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_fl.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_defsutil.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_image.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_sizer.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wave.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_socket.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_event.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_windows.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlhtmlwin.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_define.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_appframe.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_regex.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_builtin.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_controls.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_class.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_plot.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_datetime.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_dialogs.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_clipdrag.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_print.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_thread.obj \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_help.obj ### Conditionally set variables: ### !if "$(WX_DEBUG)" == "1" WX3RDPARTYLIBPOSTFIX = d !endif !if "$(WX_SHARED)" == "0" __wxbindcustom_lib___depname = \ $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib !endif !if "$(WX_SHARED)" == "1" __wxbindcustom_dll___depname = $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll !endif !if "$(WX_SHARED)" == "0" __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib$(WXLIBPOSTFIX) !endif !if "$(WX_SHARED)" == "1" __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll$(WXLIBPOSTFIX) !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif !if "$(WX_SHARED)" == "0" ____WX_SHARED = !endif !if "$(WX_SHARED)" == "1" ____WX_SHARED = -DWXUSINGDLL !endif !if "$(WX_DEBUG)" == "0" ____WX_DEBUG = -O2 !endif !if "$(WX_DEBUG)" == "1" ____WX_DEBUG = -Od !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib !endif !if "$(WX_SHARED)" == "1" __WXLIBPATH_FILENAMES = \lib\bcc_dll !endif !if "$(WX_DEBUG)" == "0" ____WX_DEBUG_1 = -v- !endif !if "$(WX_DEBUG)" == "1" ____WX_DEBUG_1 = -v !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u !endif !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif all: borland$(WXLIBPOSTFIX) borland$(WXLIBPOSTFIX): -if not exist borland$(WXLIBPOSTFIX) mkdir borland$(WXLIBPOSTFIX) ### Targets: ### all: $(__wxbindcustom_lib___depname) $(__wxbindcustom_dll___depname) clean: -if exist borland$(WXLIBPOSTFIX)\*.obj del borland$(WXLIBPOSTFIX)\*.obj -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm -if exist $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib del $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib -if exist $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll del $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll -if exist $(WXLUABINDLIB_DIR)\wxbindcustom_dll.tds del $(WXLUABINDLIB_DIR)\wxbindcustom_dll.tds -if exist $(WXLUABINDLIB_DIR)\wxbindcustom_dll.ilc del $(WXLUABINDLIB_DIR)\wxbindcustom_dll.ilc -if exist $(WXLUABINDLIB_DIR)\wxbindcustom_dll.ild del $(WXLUABINDLIB_DIR)\wxbindcustom_dll.ild -if exist $(WXLUABINDLIB_DIR)\wxbindcustom_dll.ilf del $(WXLUABINDLIB_DIR)\wxbindcustom_dll.ilf -if exist $(WXLUABINDLIB_DIR)\wxbindcustom_dll.ils del $(WXLUABINDLIB_DIR)\wxbindcustom_dll.ils -if exist $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib del $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib !if "$(WX_SHARED)" == "0" $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib: $(WXBINDCUSTOM_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| $(WXBINDCUSTOM_LIB_OBJECTS) | !endif !if "$(WX_SHARED)" == "1" $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| c0d32.obj $(WXBINDCUSTOM_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom $@ !endif borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj: ..\..\wxbind\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_xml.obj: ..\..\wxbind\src\xml.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_geometry.obj: ..\..\wxbind\src\geometry.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_data.obj: ..\..\wxbind\src\data.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_html.obj: ..\..\wxbind\src\html.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_mdi.obj: ..\..\wxbind\src\mdi.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_file.obj: ..\..\wxbind\src\file.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_config.obj: ..\..\wxbind\src\config.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_object.obj: ..\..\wxbind\src\wx_object.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_menutool.obj: ..\..\wxbind\src\menutool.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_event.obj: ..\..\wxbind\src\event.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_gdi.obj: ..\..\wxbind\src\gdi.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_fl.obj: ..\..\wxbind\src\fl.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_defsutil.obj: ..\..\wxbind\src\defsutil.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_image.obj: ..\..\wxbind\src\image.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_sizer.obj: ..\..\wxbind\src\sizer.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wave.obj: ..\..\wxbind\src\wave.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_socket.obj: ..\..\wxbind\src\socket.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_event.obj: ..\..\wxbind\src\wx_event.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_windows.obj: ..\..\wxbind\src\windows.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_define.obj: ..\..\wxbind\src\wx_define.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_appframe.obj: ..\..\wxbind\src\appframe.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_regex.obj: ..\..\wxbind\src\regex.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_builtin.obj: ..\..\wxbind\src\wx_builtin.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_controls.obj: ..\..\wxbind\src\controls.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_class.obj: ..\..\wxbind\src\wx_class.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_plot.obj: ..\..\wxbind\src\plot.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_datetime.obj: ..\..\wxbind\src\datetime.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_dialogs.obj: ..\..\wxbind\src\dialogs.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_clipdrag.obj: ..\..\wxbind\src\clipdrag.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_print.obj: ..\..\wxbind\src\print.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_thread.obj: ..\..\wxbind\src\thread.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_lib_help.obj: ..\..\wxbind\src\help.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj: ..\..\wxbind\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_xml.obj: ..\..\wxbind\src\xml.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_geometry.obj: ..\..\wxbind\src\geometry.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_data.obj: ..\..\wxbind\src\data.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_html.obj: ..\..\wxbind\src\html.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_mdi.obj: ..\..\wxbind\src\mdi.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_file.obj: ..\..\wxbind\src\file.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_config.obj: ..\..\wxbind\src\config.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_object.obj: ..\..\wxbind\src\wx_object.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_menutool.obj: ..\..\wxbind\src\menutool.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_event.obj: ..\..\wxbind\src\event.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_gdi.obj: ..\..\wxbind\src\gdi.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_fl.obj: ..\..\wxbind\src\fl.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_defsutil.obj: ..\..\wxbind\src\defsutil.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_image.obj: ..\..\wxbind\src\image.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_sizer.obj: ..\..\wxbind\src\sizer.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wave.obj: ..\..\wxbind\src\wave.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_socket.obj: ..\..\wxbind\src\socket.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_event.obj: ..\..\wxbind\src\wx_event.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_windows.obj: ..\..\wxbind\src\windows.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_define.obj: ..\..\wxbind\src\wx_define.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_appframe.obj: ..\..\wxbind\src\appframe.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_regex.obj: ..\..\wxbind\src\regex.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_builtin.obj: ..\..\wxbind\src\wx_builtin.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_controls.obj: ..\..\wxbind\src\controls.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_class.obj: ..\..\wxbind\src\wx_class.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_plot.obj: ..\..\wxbind\src\plot.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_datetime.obj: ..\..\wxbind\src\datetime.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_dialogs.obj: ..\..\wxbind\src\dialogs.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_clipdrag.obj: ..\..\wxbind\src\clipdrag.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_print.obj: ..\..\wxbind\src\print.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_thread.obj: ..\..\wxbind\src\thread.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** borland$(WXLIBPOSTFIX)\wxbindcustom_dll_help.obj: ..\..\wxbind\src\help.cpp $(CXX) -q -c -P -o$@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $** --- NEW FILE: wxbindcustom.bkl --- <?xml version="1.0" ?> <!-- Author: Francesco Montorsi <fr...@us...> --> <!-- RCS-ID: $Id: wxbindcustom.bkl,v 1.1 2006/02/02 23:02:29 frm Exp $ --> <makefile> <include file="../../build/bakefiles/common.bkl" once="1"/> <!-- the user's custom wxbind library is built from same sources of the wxbind module --> <set var="WXBINDCUSTOM_SRC">$(WXBIND_SRC)</set> <set var="WXBINDCUSTOM_HDR">$(WXBIND_HDR)</set> <!-- ================================================================== --> <!-- The list of wxLua module OPTIONS DEFAULTS --> <!-- ================================================================== --> <!-- the default path for the wxluasetup.h file --> <set var="WXLUASETUP_DIR_DEFAULT">$(nativePaths(WXLUA_BASEDIR + '/modules/wxbind/src'))</set> <!-- the default output path for wxLuaBind library --> <set var="WXLUABINDLIB_DIR_DEFAULT">$(nativePaths(WXLUA_BASEDIR + '/lib'))</set> <!-- ================================================================== --> <!-- The list of wxLua module OPTIONS --> <!-- ================================================================== --> <!-- Options which allow the user, when BUILD_CUSTOM_WXBIND==1, to build a custom wxbind library (which goes in the WXLUABINDLIB_DIR directory) using his own wxluasetup.h searched in the WXLUASETUP_DIR folder. --> <option name="WXLUASETUP_DIR" category="path"> <default-value>$(WXLUASETUP_DIR_DEFAULT)</default-value> <description>The folder where user's custom wxluasetup.h is searched</description> </option> <option name="WXLUABINDLIB_DIR" category="path"> <default-value>$(WXLUABINDLIB_DIR_DEFAULT)</default-value> <description>The folder where user's custom wxLuaBind library is sent</description> </option> <!-- ================================================================== --> <!-- Targets --> <!-- ================================================================== --> <!-- the CUSTOM wxBind lib & dll --> <wxlua_lib id="wxbindcustom_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXBINDCUSTOM</module-name> <dirname>$(WXLUABINDLIB_DIR)</dirname> <include>$(WXLUASETUP_DIR)</include> </wxlua_lib> <wxlua_dll id="wxbindcustom_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXBINDCUSTOM</module-name> <dirname>$(WXLUABINDLIB_DIR)</dirname> <include>$(WXLUASETUP_DIR)</include> </wxlua_dll> </makefile> --- NEW FILE: makefile.wat --- # ========================================================================= # This makefile was generated by # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= # ------------------------------------------------------------------------- # These are configurable options: # ------------------------------------------------------------------------- # C++ compiler CXX = wpp386 # Standard flags for C++ CXXFLAGS = # Standard preprocessor flags (common for CC and CXX) CPPFLAGS = # Standard linker flags LDFLAGS = # The directory where wxWidgets library is installed WX_DIR = $(%WXWIN) # Use DLL build of wx library to use? [0,1] # 1 - DLL WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] # 1 - Unicode WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] # 0 - Release # 1 - Debug WX_DEBUG = 1 # Version of the wx library to build against. WX_VERSION = 26 # The folder where user's custom wxluasetup.h is searched WXLUASETUP_DIR = ..\..\..\modules\wxbind\src # The folder where user's custom wxLuaBind library is sent WXLUABINDLIB_DIR = ..\..\..\lib # ------------------------------------------------------------------------- # Do not modify the rest of this file! # ------------------------------------------------------------------------- # Speed up compilation a bit: !ifdef __LOADDLL__ ! loaddll wcc wccd ! loaddll wccaxp wccdaxp ! loaddll wcc386 wccd386 ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 ! loaddll wlink wlink ! loaddll wlib wlibd !endif # We need these variables in some bakefile-made rules: WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- ### Conditionally set variables: ### WX3RDPARTYLIBPOSTFIX = !ifeq WX_DEBUG 1 WX3RDPARTYLIBPOSTFIX = d !endif __wxbindcustom_lib___depname = !ifeq WX_SHARED 0 __wxbindcustom_lib___depname = & $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib !endif __wxbindcustom_dll___depname = !ifeq WX_SHARED 1 __wxbindcustom_dll___depname = $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll !endif ____WX_DEBUG_14_16 = !ifeq WX_DEBUG 0 ____WX_DEBUG_14_16 = !endif !ifeq WX_DEBUG 1 ____WX_DEBUG_14_16 = debug all !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = !ifeq WX_SHARED 0 __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_lib$(WXLIBPOSTFIX) !endif !ifeq WX_SHARED 1 __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_dll$(WXLIBPOSTFIX) !endif __WXUNICODE_DEFINE_p = !ifeq WX_UNICODE 1 __WXUNICODE_DEFINE_p = -d_UNICODE !endif __WXDEBUG_DEFINE_p = !ifeq WX_DEBUG 1 __WXDEBUG_DEFINE_p = -d__WXDEBUG__ !endif ____WX_SHARED = !ifeq WX_SHARED 0 ____WX_SHARED = !endif !ifeq WX_SHARED 1 ____WX_SHARED = -dWXUSINGDLL !endif ____WX_DEBUG_1 = !ifeq WX_DEBUG 0 ____WX_DEBUG_1 = !endif !ifeq WX_DEBUG 1 ____WX_DEBUG_1 = -wx !endif ____WX_DEBUG = !ifeq WX_DEBUG 0 ____WX_DEBUG = -ot -ox !endif !ifeq WX_DEBUG 1 ____WX_DEBUG = -od !endif ____WX_DEBUG_0 = !ifeq WX_DEBUG 0 ____WX_DEBUG_0 = -d0 !endif !ifeq WX_DEBUG 1 ____WX_DEBUG_0 = -d2 !endif __WXLIBPATH_FILENAMES = !ifeq WX_SHARED 0 __WXLIBPATH_FILENAMES = \lib\wat_lib !endif !ifeq WX_SHARED 1 __WXLIBPATH_FILENAMES = \lib\wat_dll !endif WXLIBPOSTFIX = !ifeq WX_DEBUG 0 !ifeq WX_UNICODE 1 WXLIBPOSTFIX = u !endif !endif !ifeq WX_DEBUG 1 !ifeq WX_UNICODE 0 WXLIBPOSTFIX = d !endif !endif !ifeq WX_DEBUG 1 !ifeq WX_UNICODE 1 WXLIBPOSTFIX = ud !endif !endif ### Variables: ### WXBINDCUSTOM_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include -i=$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_xml.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_geometry.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_data.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_html.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_grid.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_mdi.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_file.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_config.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_object.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_menutool.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_event.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_gdi.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlprint.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_fl.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_defsutil.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_image.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_sizer.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wave.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_socket.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_event.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_windows.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlhtmlwin.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_define.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_appframe.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_regex.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_builtin.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_controls.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_class.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_plot.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_datetime.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_dialogs.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_clipdrag.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_print.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_thread.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_help.obj WXBINDCUSTOM_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include -dWXBINDCUSTOM_MAKINGDLL -i=$(WXLUASETUP_DIR) & $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_xml.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_geometry.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_data.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_html.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_grid.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_mdi.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_file.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_config.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_object.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_menutool.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_event.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_gdi.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlprint.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_fl.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_defsutil.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_image.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_sizer.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wave.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_socket.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_event.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_windows.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlhtmlwin.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_define.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_appframe.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_regex.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_builtin.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_controls.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_class.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_plot.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_datetime.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_dialogs.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_clipdrag.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_print.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_thread.obj & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_help.obj all : watcom$(WXLIBPOSTFIX) watcom$(WXLIBPOSTFIX) : -if not exist watcom$(WXLIBPOSTFIX) mkdir watcom$(WXLIBPOSTFIX) ### Targets: ### all : .SYMBOLIC $(__wxbindcustom_lib___depname) $(__wxbindcustom_dll___depname) clean : .SYMBOLIC -if exist watcom$(WXLIBPOSTFIX)\*.obj del watcom$(WXLIBPOSTFIX)\*.obj -if exist watcom$(WXLIBPOSTFIX)\*.res del watcom$(WXLIBPOSTFIX)\*.res -if exist watcom$(WXLIBPOSTFIX)\*.lbc del watcom$(WXLIBPOSTFIX)\*.lbc -if exist watcom$(WXLIBPOSTFIX)\*.ilk del watcom$(WXLIBPOSTFIX)\*.ilk -if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch -if exist $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib del $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib -if exist $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll del $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll -if exist $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib del $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib !ifeq WX_SHARED 0 $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib : $(WXBINDCUSTOM_LIB_OBJECTS) @%create watcom$(WXLIBPOSTFIX)\wxbindcustom_lib.lbc @for %i in ($(WXBINDCUSTOM_LIB_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_lib.lbc +%i wlib -q -p4096 -n -b $^@ @watcom$(WXLIBPOSTFIX)\wxbindcustom_lib.lbc !endif !ifeq WX_SHARED 1 $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll : $(WXBINDCUSTOM_DLL_OBJECTS) @%create watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc option quiet @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc option caseexact @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_14_16) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXBINDCUSTOM_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc library %i @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc system nr_dll wlink @watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc wlib -q -n -b $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib +$^@ !endif watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj : .AUTODEPEND ..\..\wxbind\src\wxlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_xml.obj : .AUTODEPEND ..\..\wxbind\src\xml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_geometry.obj : .AUTODEPEND ..\..\wxbind\src\geometry.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_data.obj : .AUTODEPEND ..\..\wxbind\src\data.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_html.obj : .AUTODEPEND ..\..\wxbind\src\html.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_grid.obj : .AUTODEPEND ..\..\wxbind\src\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_mdi.obj : .AUTODEPEND ..\..\wxbind\src\mdi.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_file.obj : .AUTODEPEND ..\..\wxbind\src\file.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_config.obj : .AUTODEPEND ..\..\wxbind\src\config.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_object.obj : .AUTODEPEND ..\..\wxbind\src\wx_object.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_menutool.obj : .AUTODEPEND ..\..\wxbind\src\menutool.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_event.obj : .AUTODEPEND ..\..\wxbind\src\event.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_gdi.obj : .AUTODEPEND ..\..\wxbind\src\gdi.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlprint.obj : .AUTODEPEND ..\..\wxbind\src\wxlprint.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_fl.obj : .AUTODEPEND ..\..\wxbind\src\fl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_defsutil.obj : .AUTODEPEND ..\..\wxbind\src\defsutil.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_image.obj : .AUTODEPEND ..\..\wxbind\src\image.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_sizer.obj : .AUTODEPEND ..\..\wxbind\src\sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wave.obj : .AUTODEPEND ..\..\wxbind\src\wave.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_socket.obj : .AUTODEPEND ..\..\wxbind\src\socket.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_event.obj : .AUTODEPEND ..\..\wxbind\src\wx_event.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_windows.obj : .AUTODEPEND ..\..\wxbind\src\windows.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlhtmlwin.obj : .AUTODEPEND ..\..\wxbind\src\wxlhtmlwin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_define.obj : .AUTODEPEND ..\..\wxbind\src\wx_define.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_appframe.obj : .AUTODEPEND ..\..\wxbind\src\appframe.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_regex.obj : .AUTODEPEND ..\..\wxbind\src\regex.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_builtin.obj : .AUTODEPEND ..\..\wxbind\src\wx_builtin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_controls.obj : .AUTODEPEND ..\..\wxbind\src\controls.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_class.obj : .AUTODEPEND ..\..\wxbind\src\wx_class.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_plot.obj : .AUTODEPEND ..\..\wxbind\src\plot.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_datetime.obj : .AUTODEPEND ..\..\wxbind\src\datetime.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_dialogs.obj : .AUTODEPEND ..\..\wxbind\src\dialogs.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_clipdrag.obj : .AUTODEPEND ..\..\wxbind\src\clipdrag.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_print.obj : .AUTODEPEND ..\..\wxbind\src\print.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_thread.obj : .AUTODEPEND ..\..\wxbind\src\thread.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_help.obj : .AUTODEPEND ..\..\wxbind\src\help.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj : .AUTODEPEND ..\..\wxbind\src\wxlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_xml.obj : .AUTODEPEND ..\..\wxbind\src\xml.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_geometry.obj : .AUTODEPEND ..\..\wxbind\src\geometry.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_data.obj : .AUTODEPEND ..\..\wxbind\src\data.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_html.obj : .AUTODEPEND ..\..\wxbind\src\html.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_grid.obj : .AUTODEPEND ..\..\wxbind\src\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_mdi.obj : .AUTODEPEND ..\..\wxbind\src\mdi.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_file.obj : .AUTODEPEND ..\..\wxbind\src\file.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_config.obj : .AUTODEPEND ..\..\wxbind\src\config.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_object.obj : .AUTODEPEND ..\..\wxbind\src\wx_object.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_menutool.obj : .AUTODEPEND ..\..\wxbind\src\menutool.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_event.obj : .AUTODEPEND ..\..\wxbind\src\event.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_gdi.obj : .AUTODEPEND ..\..\wxbind\src\gdi.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlprint.obj : .AUTODEPEND ..\..\wxbind\src\wxlprint.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_fl.obj : .AUTODEPEND ..\..\wxbind\src\fl.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_defsutil.obj : .AUTODEPEND ..\..\wxbind\src\defsutil.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_image.obj : .AUTODEPEND ..\..\wxbind\src\image.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_sizer.obj : .AUTODEPEND ..\..\wxbind\src\sizer.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wave.obj : .AUTODEPEND ..\..\wxbind\src\wave.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_socket.obj : .AUTODEPEND ..\..\wxbind\src\socket.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_event.obj : .AUTODEPEND ..\..\wxbind\src\wx_event.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_windows.obj : .AUTODEPEND ..\..\wxbind\src\windows.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlhtmlwin.obj : .AUTODEPEND ..\..\wxbind\src\wxlhtmlwin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_define.obj : .AUTODEPEND ..\..\wxbind\src\wx_define.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_appframe.obj : .AUTODEPEND ..\..\wxbind\src\appframe.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_regex.obj : .AUTODEPEND ..\..\wxbind\src\regex.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_builtin.obj : .AUTODEPEND ..\..\wxbind\src\wx_builtin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_controls.obj : .AUTODEPEND ..\..\wxbind\src\controls.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_class.obj : .AUTODEPEND ..\..\wxbind\src\wx_class.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_plot.obj : .AUTODEPEND ..\..\wxbind\src\plot.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_datetime.obj : .AUTODEPEND ..\..\wxbind\src\datetime.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_dialogs.obj : .AUTODEPEND ..\..\wxbind\src\dialogs.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_clipdrag.obj : .AUTODEPEND ..\..\wxbind\src\clipdrag.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_print.obj : .AUTODEPEND ..\..\wxbind\src\print.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_thread.obj : .AUTODEPEND ..\..\wxbind\src\thread.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_help.obj : .AUTODEPEND ..\..\wxbind\src\help.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $< --- NEW FILE: makefile.gcc --- # ========================================================================= # This makefile was generated by # Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= # ------------------------------------------------------------------------- # These are configurable options: # ------------------------------------------------------------------------- # C++ compiler CXX = g++ # Standard flags for C++ CXXFLAGS = # Standard preprocessor flags (common for CC and CXX) CPPFLAGS = # Standard linker flags LDFLAGS = # The directory where wxWidgets library is installed WX_DIR = $(WXWIN) # Use DLL build of wx library to use? [0,1] WX_SHARED = 0 # Compile Unicode build of wxWidgets? [0,1] WX_UNICODE = 0 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] WX_DEBUG = 1 # Version of the wx library to build against. WX_VERSION = 26 # The folder where user's custom wxluasetup.h is searched WXLUASETUP_DIR = ..\..\..\modules\wxbind\src # The folder where user's custom wxLuaBind library is sent WXLUABINDLIB_DIR = ..\..\..\lib # ------------------------------------------------------------------------- # Do not modify the rest of this file! # ------------------------------------------------------------------------- ### Variables: ### CPPDEPS = -MT$@ -MF$@.d -MD WXBINDCUSTOM_LIB_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) \ $(____WX_DEBUG_2) -I..\..\..\modules -I.\..\..\.. \ -I$(WX_DIR)\contrib\include -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_xml.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_geometry.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_data.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_html.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_grid.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_mdi.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_file.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_config.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_object.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_menutool.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_event.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_gdi.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlprint.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_fl.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_defsutil.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_image.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_sizer.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wave.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_socket.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_event.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_windows.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlhtmlwin.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_define.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_appframe.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_regex.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_builtin.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_controls.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_class.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_plot.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_datetime.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_dialogs.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_clipdrag.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_print.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_thread.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_help.o WXBINDCUSTOM_DLL_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) \ $(____WX_DEBUG_2) -I..\..\..\modules -I.\..\..\.. \ -I$(WX_DIR)\contrib\include -DWXBINDCUSTOM_MAKINGDLL -I$(WXLUASETUP_DIR) \ $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_xml.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_geometry.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_data.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_html.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_grid.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_mdi.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_file.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_config.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_object.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_menutool.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_event.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_gdi.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlprint.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_fl.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_defsutil.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_image.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_sizer.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wave.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_socket.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_event.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_windows.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlhtmlwin.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_define.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_appframe.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_regex.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_builtin.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_controls.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wx_class.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_plot.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_datetime.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_dialogs.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_clipdrag.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_print.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_thread.o \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_help.o ### Conditionally set variables: ### ifeq ($(WX_DEBUG),1) WX3RDPARTYLIBPOSTFIX = d endif ifeq ($(WX_SHARED),0) __wxbindcustom_lib___depname = \ $(WXLUABINDLIB_DIR)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.a endif ifeq ($(WX_SHARED),1) __wxbindcustom_dll___depname = $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll endif ifeq ($(WX_SHARED),0) __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_lib$(WXLIBPOSTFIX) endif ifeq ($(WX_SHARED),1) __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll$(WXLIBPOSTFIX) endif ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE endif ifeq ($(WX_DEBUG),1) __WXDEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(WX_SHARED),0) ____WX_SHARED = endif ifeq ($(WX_SHARED),1) ____WX_SHARED = -DWXUSINGDLL endif ifeq ($(WX_DEBUG),0) ____WX_DEBUG_1 = endif ifeq ($(WX_DEBUG),1) ____WX_DEBUG_1 = -W -Wall endif ifeq ($(WX_DEBUG),0) ____WX_DEBUG = -O2 endif ifeq ($(WX_DEBUG),1) ____WX_DEBUG = -O0 endif ifeq ($(WX_SHARED),0) __WXLIBPATH_FILENAMES = \lib\gcc_lib endif ifeq ($(WX_SHARED),1) __WXLIBPATH_FILENAMES = \lib\gcc_dll endif ifeq ($(WX_DEBUG),0) ____WX_DEBUG_2 = endif ifeq ($(WX_DEBUG),1) ____WX_DEBUG_2 = -g endif ifeq ($(WX_DEBUG),0) ifeq ($(WX_UNICODE),1) WXLIBPOSTFIX = u endif endif ifeq ($(WX_DEBUG),1) ifeq ($(WX_UNICODE),0) WXLIBPOSTFIX = d endif endif ifeq ($(WX_DEBUG),1) ifeq ($(WX_UNICODE),1) WXLIBPOSTFIX = ud endif endif all: mingw$(WXLIBPOSTFIX) mingw$(WXLIBPOSTFIX): -if not exist mingw$(WXLIBPOSTFIX) mkdir mingw$(WXLIBPOSTFIX) ### Targets: ### all: $(__wxbindcustom_lib___depname) $(__wxbindcustom_dll___depname) clean: -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o -if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d -if exist $(WXLUABINDLIB_DIR)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.a del $(WXLUABINDLIB_DIR)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.a -if exist $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll del $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll -if exist $(WXLUABINDLIB_DIR)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.a del $(WXLUABINDLIB_DIR)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.a ifeq ($(WX_SHARED),0) $(WXLUABINDLIB_DIR)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.a: $(WXBINDCUSTOM_LIB_OBJECTS) if exist $@ del $@ ar rcu $@ $(WXBINDCUSTOM_LIB_OBJECTS) ranlib $@ endif ifeq ($(WX_SHARED),1) $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) $(CXX) -shared -fPIC -o $@ $(WXBINDCUSTOM_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,$(WXLUABINDLIB_DIR)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.a -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.o: ../../wxbind/src/wxlua.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_xml.o: ../../wxbind/src/xml.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_geometry.o: ../../wxbind/src/geometry.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_data.o: ../../wxbind/src/data.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_html.o: ../../wxbind/src/html.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_grid.o: ../../wxbind/src/grid.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_mdi.o: ../../wxbind/src/mdi.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_file.o: ../../wxbind/src/file.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_config.o: ../../wxbind/src/config.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_object.o: ../../wxbind/src/wx_object.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_menutool.o: ../../wxbind/src/menutool.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_event.o: ../../wxbind/src/event.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_gdi.o: ../../wxbind/src/gdi.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlprint.o: ../../wxbind/src/wxlprint.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_fl.o: ../../wxbind/src/fl.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_defsutil.o: ../../wxbind/src/defsutil.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_image.o: ../../wxbind/src/image.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_sizer.o: ../../wxbind/src/sizer.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wave.o: ../../wxbind/src/wave.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_socket.o: ../../wxbind/src/socket.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_event.o: ../../wxbind/src/wx_event.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_windows.o: ../../wxbind/src/windows.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlhtmlwin.o: ../../wxbind/src/wxlhtmlwin.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_define.o: ../../wxbind/src/wx_define.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_appframe.o: ../../wxbind/src/appframe.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_regex.o: ../../wxbind/src/regex.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_builtin.o: ../../wxbind/src/wx_builtin.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_controls.o: ../../wxbind/src/controls.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wx_class.o: ../../wxbind/src/wx_class.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_plot.o: ../../wxbind/src/plot.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_datetime.o: ../../wxbind/src/datetime.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_dialogs.o: ../../wxbind/src/dialogs.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_clipdrag.o: ../../wxbind/src/clipdrag.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_print.o: ../../wxbind/src/print.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_thread.o: ../../wxbind/src/thread.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_help.o: ../../wxbind/src/help.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_LIB_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.o: ../../wxbind/src/wxlua.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_xml.o: ../../wxbind/src/xml.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_geometry.o: ../../wxbind/src/geometry.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_data.o: ../../wxbind/src/data.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_html.o: ../../wxbind/src/html.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_grid.o: ../../wxbind/src/grid.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $(CPPDEPS) $< mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_mdi.o: ../../wxbind/src/mdi.cpp $(CXX) -c -o $@ $(WXBINDCUSTOM_DLL_CXXFLAGS) $(CPPDEPS) $< mingw... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:37
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/build/autoconf Modified Files: configure.ac Log Message: Added infrastructure to build custom wxbind Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure.ac 29 Jan 2006 15:45:39 -0000 1.7 --- configure.ac 2 Feb 2006 23:02:28 -0000 1.8 *************** *** 102,105 **** --- 102,106 ---- AC_ADDMODULE([wxlua]) AC_ADDMODULE([wxbind]) + AC_ADDMODULE([wxbindstc]) AC_ADDMODULE([lua]) AC_SUBST([WXLUA_MODNAMES]) |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:37
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/bindings/wxstc Removed Files: wxluasetup.h.in Log Message: Added infrastructure to build custom wxbind --- wxluasetup.h.in DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:02:37
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549/bindings/wxwidgets Removed Files: wxluasetup.h.in Log Message: Added infrastructure to build custom wxbind --- wxluasetup.h.in DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-02-02 23:00:42
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32224/build Log Message: Directory /cvsroot/wxlua/wxLua/modules/wxbind/build added to the repository |
|
From: Francesco M. <fr...@us...> - 2006-02-02 21:44:58
|
Update of /cvsroot/wxlua/wxLua/modules/setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv563/setup Log Message: Directory /cvsroot/wxlua/wxLua/modules/setup added to the repository |
|
From: John L. <jr...@us...> - 2006-02-02 20:07:21
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19635/src Modified Files: internal.cpp Log Message: remove #include bindings/wxwidgets/wxluasetup.h.in Index: internal.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** internal.cpp 27 Jan 2006 21:57:12 -0000 1.26 --- internal.cpp 2 Feb 2006 20:07:13 -0000 1.27 *************** *** 34,38 **** #include "wx/datetime.h" - #include "../../../bindings/wxwidgets/wxluasetup.h.in" // get the base library setup parameters #include "wxlua/include/internal.h" #include "wxlua/include/wxlcallb.h" --- 34,37 ---- |
|
From: Francesco M. <fr...@us...> - 2006-02-02 20:03:54
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17952/bindings/wxwidgets Modified Files: wxluasetup.h.in Log Message: Added missing wxLUA_USE symbols to wxluasetup.h Index: wxluasetup.h.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxluasetup.h.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxluasetup.h.in 23 Jan 2006 04:38:29 -0000 1.1 --- wxluasetup.h.in 2 Feb 2006 20:03:43 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #define wxLUA_USE_wxConfig 1 #define wxLUA_USE_wxCursor 1 + #define wxLUA_USE_wxCriticalSection 1 + #define wxLUA_USE_wxCriticalSectionLocker 1 #define wxLUA_USE_wxDataObject 1 #define wxLUA_USE_wxDateSpan 1 *************** *** 97,101 **** #define wxLUA_USE_wxStatusBar 1 #define wxLUA_USE_wxStringList 1 ! #define wxLUA_USE_wxStyledTextCtrl 0 #define wxLUA_USE_wxSystemSettings 1 #define wxLUA_USE_wxTabCtrl 1 --- 99,103 ---- #define wxLUA_USE_wxStatusBar 1 #define wxLUA_USE_wxStringList 1 ! #define wxLUA_USE_wxStyledTextCtrl 1 #define wxLUA_USE_wxSystemSettings 1 #define wxLUA_USE_wxTabCtrl 1 |
|
From: Francesco M. <fr...@us...> - 2006-02-02 20:03:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17952/modules/wxbind/src Modified Files: wxluasetup.h Log Message: Added missing wxLUA_USE symbols to wxluasetup.h Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxluasetup.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxluasetup.h 27 Jan 2006 23:01:43 -0000 1.3 --- wxluasetup.h 2 Feb 2006 20:03:43 -0000 1.4 *************** *** 28,31 **** --- 28,33 ---- #define wxLUA_USE_wxConfig 1 #define wxLUA_USE_wxCursor 1 + #define wxLUA_USE_wxCriticalSection 1 + #define wxLUA_USE_wxCriticalSectionLocker 1 #define wxLUA_USE_wxDataObject 1 #define wxLUA_USE_wxDateSpan 1 |
|
From: Francesco M. <fr...@us...> - 2006-02-02 18:46:58
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11020/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules.dsw modules_mod_wxbind.dsp Log Message: updated bakefiles for new wxbindstc module Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** makefile.bcc 29 Jan 2006 15:45:40 -0000 1.21 --- makefile.bcc 2 Feb 2006 18:46:44 -0000 1.22 *************** *** 84,88 **** MOD_LUA_LIB_CFLAGS = -I$(BCCDIR)\include $(____WX_SHARED) $(____WX_DEBUG) \ ! $(____WX_DEBUG_8) -DWXLUA_CODE -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\mod_lua_lib_lundump.obj \ --- 84,88 ---- MOD_LUA_LIB_CFLAGS = -I$(BCCDIR)\include $(____WX_SHARED) $(____WX_DEBUG) \ ! $(____WX_DEBUG_9) -DWXLUA_CODE -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\mod_lua_lib_lundump.obj \ *************** *** 115,119 **** borland$(WXLIBPOSTFIX)\mod_lua_lib_liolib.obj MOD_LUA_CFLAGS = -I$(BCCDIR)\include $(____WX_SHARED) $(____WX_DEBUG) \ ! $(____WX_DEBUG_8) -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\mod_lua_lua.obj --- 115,119 ---- borland$(WXLIBPOSTFIX)\mod_lua_lib_liolib.obj MOD_LUA_CFLAGS = -I$(BCCDIR)\include $(____WX_SHARED) $(____WX_DEBUG) \ ! $(____WX_DEBUG_9) -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\mod_lua_lua.obj *************** *** 121,125 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_8) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ $(CXXFLAGS) --- 121,125 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 133,137 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_8) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ -DWXLUA_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) --- 133,137 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ -DWXLUA_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) *************** *** 145,149 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_8) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ $(CXXFLAGS) --- 145,149 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 159,163 **** borland$(WXLIBPOSTFIX)\wxbind_lib_config.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_wx_object.obj \ - borland$(WXLIBPOSTFIX)\wxbind_lib_stc.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_menutool.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_event.obj \ --- 159,162 ---- *************** *** 189,193 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_8) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ -DWXBIND_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) --- 188,192 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ -DWXBIND_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) *************** *** 203,207 **** borland$(WXLIBPOSTFIX)\wxbind_dll_config.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_wx_object.obj \ - borland$(WXLIBPOSTFIX)\wxbind_dll_stc.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_menutool.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_event.obj \ --- 202,205 ---- *************** *** 230,237 **** borland$(WXLIBPOSTFIX)\wxbind_dll_thread.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_help.obj WXLUADEBUG_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_8) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ $(CXXFLAGS) --- 228,261 ---- borland$(WXLIBPOSTFIX)\wxbind_dll_thread.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_help.obj + WXBINDSTC_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ + -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ + $(CXXFLAGS) + WXBINDSTC_LIB_OBJECTS = \ + borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_class.obj \ + borland$(WXLIBPOSTFIX)\wxbindstc_lib_stc.obj \ + borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_object.obj \ + borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_event.obj \ + borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_define.obj \ + borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_builtin.obj + WXBINDSTC_DLL_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ + -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ + -DWXBINDSTC_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) + WXBINDSTC_DLL_OBJECTS = \ + borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_class.obj \ + borland$(WXLIBPOSTFIX)\wxbindstc_dll_stc.obj \ + borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_object.obj \ + borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_event.obj \ + borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_define.obj \ + borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_builtin.obj WXLUADEBUG_LIB_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 243,247 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_8) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ -DWXLUADEBUG_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) --- 267,271 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ -DWXLUADEBUG_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) *************** *** 253,257 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_8) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ $(CXXFLAGS) --- 277,281 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 266,270 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_8) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ -DWXLUASOCKET_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) --- 290,294 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_9) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ -DWXLUASOCKET_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) *************** *** 309,312 **** --- 333,350 ---- !endif !if "$(WX_SHARED)" == "0" + __wxbindstc_lib___depname = \ + ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib + !endif + !if "$(WX_SHARED)" == "1" + __wxbindstc_dll___depname = \ + ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.dll + !endif + !if "$(WX_SHARED)" == "0" + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\bcc_lib$(WXLIBPOSTFIX) + !endif + !if "$(WX_SHARED)" == "1" + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\bcc_dll$(WXLIBPOSTFIX) + !endif + !if "$(WX_SHARED)" == "0" __wxluadebug_lib___depname = \ ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib *************** *** 317,324 **** !endif !if "$(WX_SHARED)" == "0" ! __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\bcc_lib$(WXLIBPOSTFIX) !endif !if "$(WX_SHARED)" == "1" ! __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\bcc_dll$(WXLIBPOSTFIX) !endif !if "$(WX_SHARED)" == "0" --- 355,362 ---- !endif !if "$(WX_SHARED)" == "0" ! __WXLUA_OUTPUT_FOLDER_FILENAMES_3 = lib\bcc_lib$(WXLIBPOSTFIX) !endif !if "$(WX_SHARED)" == "1" ! __WXLUA_OUTPUT_FOLDER_FILENAMES_3 = lib\bcc_dll$(WXLIBPOSTFIX) !endif !if "$(WX_SHARED)" == "0" *************** *** 331,338 **** !endif !if "$(WX_SHARED)" == "0" ! __WXLUA_OUTPUT_FOLDER_FILENAMES_3 = lib\bcc_lib$(WXLIBPOSTFIX) !endif !if "$(WX_SHARED)" == "1" ! __WXLUA_OUTPUT_FOLDER_FILENAMES_3 = lib\bcc_dll$(WXLIBPOSTFIX) !endif !if "$(WX_UNICODE)" == "1" --- 369,376 ---- !endif !if "$(WX_SHARED)" == "0" ! __WXLUA_OUTPUT_FOLDER_FILENAMES_4 = lib\bcc_lib$(WXLIBPOSTFIX) !endif !if "$(WX_SHARED)" == "1" ! __WXLUA_OUTPUT_FOLDER_FILENAMES_4 = lib\bcc_dll$(WXLIBPOSTFIX) !endif !if "$(WX_UNICODE)" == "1" *************** *** 361,368 **** !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_8 = -v- !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_8 = -v !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" --- 399,406 ---- !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_9 = -v- !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_9 = -v !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" *************** *** 383,387 **** ### Targets: ### ! all: ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: --- 421,425 ---- ### Targets: ### ! all: ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: *************** *** 412,415 **** --- 450,461 ---- -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ils -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib + -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib + -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.dll + -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.tds + -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.ilc del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.ilc + -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.ild del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.ild + -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.ilf + -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.ils + -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll *************** *** 436,440 **** ..\..\..\bin\lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____WX_DEBUG_8) @&&| c0x32.obj $(MOD_LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, | --- 482,486 ---- ..\..\..\bin\lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____WX_DEBUG_9) @&&| c0x32.obj $(MOD_LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, | *************** *** 450,454 **** !if "$(WX_SHARED)" == "1" ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_8) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | --- 496,500 ---- !if "$(WX_SHARED)" == "1" ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_9) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | *************** *** 466,470 **** !if "$(WX_SHARED)" == "1" ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_8) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) @&&| c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | --- 512,516 ---- !if "$(WX_SHARED)" == "1" ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_9) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) @&&| c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | *************** *** 473,476 **** --- 519,538 ---- !if "$(WX_SHARED)" == "0" + ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib: $(WXBINDSTC_LIB_OBJECTS) + if exist $@ del $@ + tlib /a /p4096 $@ @&&| + $(WXBINDSTC_LIB_OBJECTS) + | + !endif + + !if "$(WX_SHARED)" == "1" + ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbindstc_dll.dll: $(WXBINDSTC_DLL_OBJECTS) + ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_9) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) @&&| + c0d32.obj $(WXBINDSTC_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, + | + implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ + !endif + + !if "$(WX_SHARED)" == "0" ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ *************** *** 482,486 **** !if "$(WX_SHARED)" == "1" ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_8) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) @&&| c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | --- 544,548 ---- !if "$(WX_SHARED)" == "1" ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_9) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_3) @&&| c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | *************** *** 498,502 **** !if "$(WX_SHARED)" == "1" ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_8) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_3) @&&| c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | --- 560,564 ---- !if "$(WX_SHARED)" == "1" ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_9) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_4) @&&| c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | *************** *** 651,657 **** $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_lib_stc.obj: ..\..\wxbind\src\stc.cpp - $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_lib_menutool.obj: ..\..\wxbind\src\menutool.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** --- 713,716 ---- *************** *** 762,768 **** $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_dll_stc.obj: ..\..\wxbind\src\stc.cpp - $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_dll_menutool.obj: ..\..\wxbind\src\menutool.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** --- 821,824 ---- *************** *** 843,846 **** --- 899,938 ---- $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_class.obj: ..\..\wxbindstc\src\wxstc_class.cpp + $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbindstc_lib_stc.obj: ..\..\wxbindstc\src\stc.cpp + $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_object.obj: ..\..\wxbindstc\src\wxstc_object.cpp + $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_event.obj: ..\..\wxbindstc\src\wxstc_event.cpp + $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_define.obj: ..\..\wxbindstc\src\wxstc_define.cpp + $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_builtin.obj: ..\..\wxbindstc\src\wxstc_builtin.cpp + $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_class.obj: ..\..\wxbindstc\src\wxstc_class.cpp + $(CXX) -q -c -P -o$@ $(WXBINDSTC_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbindstc_dll_stc.obj: ..\..\wxbindstc\src\stc.cpp + $(CXX) -q -c -P -o$@ $(WXBINDSTC_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_object.obj: ..\..\wxbindstc\src\wxstc_object.cpp + $(CXX) -q -c -P -o$@ $(WXBINDSTC_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_event.obj: ..\..\wxbindstc\src\wxstc_event.cpp + $(CXX) -q -c -P -o$@ $(WXBINDSTC_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_define.obj: ..\..\wxbindstc\src\wxstc_define.cpp + $(CXX) -q -c -P -o$@ $(WXBINDSTC_DLL_CXXFLAGS) $** + + borland$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_builtin.obj: ..\..\wxbindstc\src\wxstc_builtin.cpp + $(CXX) -q -c -P -o$@ $(WXBINDSTC_DLL_CXXFLAGS) $** + borland$(WXLIBPOSTFIX)\wxluadebug_lib_wxldebug.obj: ..\..\wxluadebug\src\wxldebug.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** Index: modules.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules.dsw,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules.dsw 25 Jan 2006 18:35:58 -0000 1.3 --- modules.dsw 2 Feb 2006 18:46:44 -0000 1.4 *************** *** 54,57 **** --- 54,81 ---- ############################################################################### + Project: "wxbindstc_lib"=modules_wxbindstc_lib.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + + Project: "wxbindstc_dll"=modules_wxbindstc_dll.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "mod_wxluadebug"=modules_mod_wxluadebug.dsp - Package Owner=<4> Index: modules_mod_wxbind.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxbind.dsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** modules_mod_wxbind.dsp 29 Jan 2006 15:45:40 -0000 1.9 --- modules_mod_wxbind.dsp 2 Feb 2006 18:46:44 -0000 1.10 *************** *** 341,348 **** # Begin Source File - SOURCE=..\..\wxbind\src\stc.cpp - # End Source File - # Begin Source File - SOURCE=..\..\wxbind\src\thread.cpp # End Source File --- 341,344 ---- Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** makefile.wat 29 Jan 2006 15:45:40 -0000 1.18 --- makefile.wat 2 Feb 2006 18:46:44 -0000 1.19 *************** *** 107,110 **** --- 107,127 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\wat_dll$(WXLIBPOSTFIX) !endif + __wxbindstc_lib___depname = + !ifeq WX_SHARED 0 + __wxbindstc_lib___depname = & + ..\..\..\lib\wat_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib + !endif + __wxbindstc_dll___depname = + !ifeq WX_SHARED 1 + __wxbindstc_dll___depname = & + ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxbindstc_dll.dll + !endif + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = + !ifeq WX_SHARED 0 + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\wat_lib$(WXLIBPOSTFIX) + !endif + !ifeq WX_SHARED 1 + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\wat_dll$(WXLIBPOSTFIX) + !endif __wxluadebug_lib___depname = !ifeq WX_SHARED 0 *************** *** 117,126 **** ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll !endif ! __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = !ifeq WX_SHARED 0 ! __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\wat_lib$(WXLIBPOSTFIX) !endif !ifeq WX_SHARED 1 ! __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\wat_dll$(WXLIBPOSTFIX) !endif __wxluasocket_lib___depname = --- 134,143 ---- ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll !endif ! __WXLUA_OUTPUT_FOLDER_FILENAMES_3 = !ifeq WX_SHARED 0 ! __WXLUA_OUTPUT_FOLDER_FILENAMES_3 = lib\wat_lib$(WXLIBPOSTFIX) !endif !ifeq WX_SHARED 1 ! __WXLUA_OUTPUT_FOLDER_FILENAMES_3 = lib\wat_dll$(WXLIBPOSTFIX) !endif __wxluasocket_lib___depname = *************** *** 134,150 **** ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll !endif ! __WXLUA_OUTPUT_FOLDER_FILENAMES_3 = !ifeq WX_SHARED 0 ! __WXLUA_OUTPUT_FOLDER_FILENAMES_3 = lib\wat_lib$(WXLIBPOSTFIX) !endif !ifeq WX_SHARED 1 ! __WXLUA_OUTPUT_FOLDER_FILENAMES_3 = lib\wat_dll$(WXLIBPOSTFIX) !endif ! ____WX_DEBUG_15 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_15 = !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_15 = debug all !endif __WXUNICODE_DEFINE_p = --- 151,167 ---- ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll !endif ! __WXLUA_OUTPUT_FOLDER_FILENAMES_4 = !ifeq WX_SHARED 0 ! __WXLUA_OUTPUT_FOLDER_FILENAMES_4 = lib\wat_lib$(WXLIBPOSTFIX) !endif !ifeq WX_SHARED 1 ! __WXLUA_OUTPUT_FOLDER_FILENAMES_4 = lib\wat_dll$(WXLIBPOSTFIX) !endif ! ____WX_DEBUG_20 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_20 = !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_20 = debug all !endif __WXUNICODE_DEFINE_p = *************** *** 170,186 **** ____WX_DEBUG = -wx !endif ! ____WX_DEBUG_16 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_16 = -ot -ox !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_16 = -od !endif ! ____WX_DEBUG_17 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_17 = -d0 !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_17 = -d2 !endif __WXLIBPATH_FILENAMES = --- 187,203 ---- ____WX_DEBUG = -wx !endif ! ____WX_DEBUG_21 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_21 = -ot -ox !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_21 = -od !endif ! ____WX_DEBUG_22 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_22 = -d0 !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_22 = -d2 !endif __WXLIBPATH_FILENAMES = *************** *** 210,215 **** ### Variables: ### ! MOD_LUA_LIB_CFLAGS = $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_16) & ! $(____WX_DEBUG_17) -dWXLUA_CODE -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\mod_lua_lib_lundump.obj & --- 227,232 ---- ### Variables: ### ! MOD_LUA_LIB_CFLAGS = $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & ! $(____WX_DEBUG_22) -dWXLUA_CODE -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\mod_lua_lib_lundump.obj & *************** *** 241,252 **** watcom$(WXLIBPOSTFIX)\mod_lua_lib_lstrlib.obj & watcom$(WXLIBPOSTFIX)\mod_lua_lib_liolib.obj ! MOD_LUA_CFLAGS = $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_16) & ! $(____WX_DEBUG_17) -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\mod_lua_lua.obj WXLUA_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_16) & ! $(____WX_DEBUG_17) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = & --- 258,269 ---- watcom$(WXLIBPOSTFIX)\mod_lua_lib_lstrlib.obj & watcom$(WXLIBPOSTFIX)\mod_lua_lib_liolib.obj ! MOD_LUA_CFLAGS = $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & ! $(____WX_DEBUG_22) -i=..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\mod_lua_lua.obj WXLUA_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & ! $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = & *************** *** 258,263 **** WXLUA_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_16) & ! $(____WX_DEBUG_17) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include -dWXLUA_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & --- 275,280 ---- WXLUA_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & ! $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include -dWXLUA_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & *************** *** 269,274 **** WXBIND_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_16) & ! $(____WX_DEBUG_17) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXBIND_LIB_OBJECTS = & --- 286,291 ---- WXBIND_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & ! $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXBIND_LIB_OBJECTS = & *************** *** 283,287 **** watcom$(WXLIBPOSTFIX)\wxbind_lib_config.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_wx_object.obj & - watcom$(WXLIBPOSTFIX)\wxbind_lib_stc.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_menutool.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_event.obj & --- 300,303 ---- *************** *** 312,317 **** WXBIND_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_16) & ! $(____WX_DEBUG_17) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include -dWXBIND_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = & --- 328,333 ---- WXBIND_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & ! $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include -dWXBIND_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = & *************** *** 326,330 **** watcom$(WXLIBPOSTFIX)\wxbind_dll_config.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_wx_object.obj & - watcom$(WXLIBPOSTFIX)\wxbind_dll_stc.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_menutool.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_event.obj & --- 342,345 ---- *************** *** 353,360 **** watcom$(WXLIBPOSTFIX)\wxbind_dll_thread.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_help.obj WXLUADEBUG_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_16) & ! $(____WX_DEBUG_17) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = & --- 368,399 ---- watcom$(WXLIBPOSTFIX)\wxbind_dll_thread.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_help.obj + WXBINDSTC_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & + -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & + -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & + $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & + -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) + WXBINDSTC_LIB_OBJECTS = & + watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_class.obj & + watcom$(WXLIBPOSTFIX)\wxbindstc_lib_stc.obj & + watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_object.obj & + watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_event.obj & + watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_define.obj & + watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_builtin.obj + WXBINDSTC_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & + -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & + -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & + $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & + -i=$(WX_DIR)\contrib\include -dWXBINDSTC_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) + WXBINDSTC_DLL_OBJECTS = & + watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_class.obj & + watcom$(WXLIBPOSTFIX)\wxbindstc_dll_stc.obj & + watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_object.obj & + watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_event.obj & + watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_define.obj & + watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_builtin.obj WXLUADEBUG_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & ! $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_LIB_OBJECTS = & *************** *** 364,369 **** WXLUADEBUG_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_16) & ! $(____WX_DEBUG_17) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include -dWXLUADEBUG_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = & --- 403,408 ---- WXLUADEBUG_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & ! $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include -dWXLUADEBUG_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = & *************** *** 373,378 **** WXLUASOCKET_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_16) & ! $(____WX_DEBUG_17) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = & --- 412,417 ---- WXLUASOCKET_LIB_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & ! $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = & *************** *** 385,390 **** WXLUASOCKET_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_16) & ! $(____WX_DEBUG_17) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include -dWXLUASOCKET_MAKINGDLL $(CPPFLAGS) & $(CXXFLAGS) --- 424,429 ---- WXLUASOCKET_DLL_CXXFLAGS = -bd $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_21) & ! $(____WX_DEBUG_22) -i=..\..\..\modules -i=.\..\..\.. & -i=$(WX_DIR)\contrib\include -dWXLUASOCKET_MAKINGDLL $(CPPFLAGS) & $(CXXFLAGS) *************** *** 404,408 **** ### Targets: ### ! all : .SYMBOLIC ..\..\..\lib\wat_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean : .SYMBOLIC --- 443,447 ---- ### Targets: ### ! all : .SYMBOLIC ..\..\..\lib\wat_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean : .SYMBOLIC *************** *** 420,423 **** --- 459,465 ---- -if exist ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxbind_dll.dll del ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxbind_dll.dll -if exist ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib del ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib + -if exist ..\..\..\lib\wat_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib del ..\..\..\lib\wat_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib + -if exist ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxbindstc_dll.dll del ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxbindstc_dll.dll + -if exist ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib del ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib -if exist ..\..\..\lib\wat_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib del ..\..\..\lib\wat_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib -if exist ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll del ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll *************** *** 437,441 **** @%append watcom$(WXLIBPOSTFIX)\mod_lua.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\mod_lua.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\mod_lua.lbc $(LDFLAGS) $(____WX_DEBUG_15) @for %i in ($(MOD_LUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\mod_lua.lbc file %i @for %i in ( ..\..\..\lib\wat_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib) do @%append watcom$(WXLIBPOSTFIX)\mod_lua.lbc library %i --- 479,483 ---- @%append watcom$(WXLIBPOSTFIX)\mod_lua.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\mod_lua.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\mod_lua.lbc $(LDFLAGS) $(____WX_DEBUG_20) @for %i in ($(MOD_LUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\mod_lua.lbc file %i @for %i in ( ..\..\..\lib\wat_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib) do @%append watcom$(WXLIBPOSTFIX)\mod_lua.lbc library %i *************** *** 456,460 **** @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_15) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUA_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc library %i --- 498,502 ---- @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_20) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXLUA_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxlua_dll.lbc library %i *************** *** 478,482 **** @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_15) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) @for %i in ($(WXBIND_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc library %i --- 520,524 ---- @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_20) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) @for %i in ($(WXBIND_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxbind_dll.lbc library %i *************** *** 488,491 **** --- 530,555 ---- !ifeq WX_SHARED 0 + ..\..\..\lib\wat_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib : $(WXBINDSTC_LIB_OBJECTS) + @%create watcom$(WXLIBPOSTFIX)\wxbindstc_lib.lbc + @for %i in ($(WXBINDSTC_LIB_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbindstc_lib.lbc +%i + wlib -q -p4096 -n -b $^@ @watcom$(WXLIBPOSTFIX)\wxbindstc_lib.lbc + !endif + + !ifeq WX_SHARED 1 + ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxbindstc_dll.dll : $(WXBINDSTC_DLL_OBJECTS) + @%create watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc + @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc option quiet + @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc name $^@ + @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc option caseexact + @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_20) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) + @for %i in ($(WXBINDSTC_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc file %i + @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc library %i + @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc + @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc system nr_dll + wlink @watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc + wlib -q -n -b ..\..\..\lib\wat_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib +$^@ + !endif + + !ifeq WX_SHARED 0 ..\..\..\lib\wat_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib : $(WXLUADEBUG_LIB_OBJECTS) @%create watcom$(WXLIBPOSTFIX)\wxluadebug_lib.lbc *************** *** 500,504 **** @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_15) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) @for %i in ($(WXLUADEBUG_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc library %i --- 564,568 ---- @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_20) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_3) @for %i in ($(WXLUADEBUG_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxluadebug_dll.lbc library %i *************** *** 522,526 **** @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_15) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_3) @for %i in ($(WXLUASOCKET_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc library %i --- 586,590 ---- @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_20) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_4) @for %i in ($(WXLUASOCKET_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc file %i @for %i in ( wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\wxluasocket_dll.lbc library %i *************** *** 678,684 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_lib_stc.obj : .AUTODEPEND ..\..\wxbind\src\stc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_lib_menutool.obj : .AUTODEPEND ..\..\wxbind\src\menutool.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< --- 742,745 ---- *************** *** 789,795 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_dll_stc.obj : .AUTODEPEND ..\..\wxbind\src\stc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_dll_menutool.obj : .AUTODEPEND ..\..\wxbind\src\menutool.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< --- 850,853 ---- *************** *** 870,873 **** --- 928,967 ---- $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_class.obj : .AUTODEPEND ..\..\wxbindstc\src\wxstc_class.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_LIB_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbindstc_lib_stc.obj : .AUTODEPEND ..\..\wxbindstc\src\stc.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_LIB_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_object.obj : .AUTODEPEND ..\..\wxbindstc\src\wxstc_object.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_LIB_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_event.obj : .AUTODEPEND ..\..\wxbindstc\src\wxstc_event.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_LIB_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_define.obj : .AUTODEPEND ..\..\wxbindstc\src\wxstc_define.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_LIB_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbindstc_lib_wxstc_builtin.obj : .AUTODEPEND ..\..\wxbindstc\src\wxstc_builtin.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_LIB_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_class.obj : .AUTODEPEND ..\..\wxbindstc\src\wxstc_class.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_DLL_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbindstc_dll_stc.obj : .AUTODEPEND ..\..\wxbindstc\src\stc.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_DLL_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_object.obj : .AUTODEPEND ..\..\wxbindstc\src\wxstc_object.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_DLL_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_event.obj : .AUTODEPEND ..\..\wxbindstc\src\wxstc_event.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_DLL_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_define.obj : .AUTODEPEND ..\..\wxbindstc\src\wxstc_define.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_DLL_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\wxbindstc_dll_wxstc_builtin.obj : .AUTODEPEND ..\..\wxbindstc\src\wxstc_builtin.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXBINDSTC_DLL_CXXFLAGS) $< + watcom$(WXLIBPOSTFIX)\wxluadebug_lib_wxldebug.obj : .AUTODEPEND ..\..\wxluadebug\src\wxldebug.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUADEBUG_LIB_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** makefile.gcc 29 Jan 2006 15:45:40 -0000 1.20 --- makefile.gcc 2 Feb 2006 18:46:44 -0000 1.21 *************** *** 53,58 **** CPPDEPS = -MT$@ -MF$@.d -MD ! MOD_LUA_LIB_CFLAGS = $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_13) \ ! $(____WX_DEBUG_15) -DWXLUA_CODE -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_lundump.o \ --- 53,58 ---- CPPDEPS = -MT$@ -MF$@.d -MD ! MOD_LUA_LIB_CFLAGS = $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ ! $(____WX_DEBUG_20) -DWXLUA_CODE -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_lundump.o \ *************** *** 84,89 **** mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstrlib.o \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_liolib.o ! MOD_LUA_CFLAGS = $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_13) \ ! $(____WX_DEBUG_15) -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\mod_lua_lua.o --- 84,89 ---- mingw$(WXLIBPOSTFIX)\mod_lua_lib_lstrlib.o \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_liolib.o ! MOD_LUA_CFLAGS = $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_18) \ ! $(____WX_DEBUG_20) -I..\..\lua\include $(CPPFLAGS) $(CFLAGS) MOD_LUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\mod_lua_lua.o *************** *** 91,96 **** $(__WXDEBUG_DEFINE... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-02-02 18:46:58
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11020/apps/build/msw Modified Files: apps_app_wxlua.dsp apps_app_wxluaedit.dsp makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: updated bakefiles for new wxbindstc module Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** makefile.bcc 29 Jan 2006 15:45:39 -0000 1.17 --- makefile.bcc 2 Feb 2006 18:46:43 -0000 1.18 *************** *** 205,209 **** ..\..\..\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) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | !endif --- 205,209 ---- ..\..\..\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) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | !endif *************** *** 212,216 **** ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) -aa @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif --- 212,216 ---- ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) -aa @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif Index: apps_app_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** apps_app_wxlua.dsp 29 Jan 2006 15:45:39 -0000 1.8 --- apps_app_wxlua.dsp 2 Feb 2006 18:46:43 -0000 1.9 *************** *** 58,63 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_lua.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_lua.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release" --- 58,63 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_lua.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_lua.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release" *************** *** 83,88 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_lua.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_lua.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug" --- 83,88 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_lua.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_lua.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug" *************** *** 108,113 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_lua.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_lua.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release" --- 108,113 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_lua.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_lua.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release" *************** *** 133,138 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_wxbind.lib wxlua_msw26_lua.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_wxbind.lib wxlua_msw26_lua.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug" --- 133,138 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_lua.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_lua.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.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" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug" *************** *** 158,163 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_lua.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libud" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_lua.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libud" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Release" --- 158,163 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_lua.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libud" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_lua.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libud" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Release" *************** *** 183,188 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_lua.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libu" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_lua.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libu" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug" --- 183,188 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_lua.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libu" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_lua.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libu" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug" *************** *** 208,213 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_lua.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libd" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_lua.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libd" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Release" --- 208,213 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_lua.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libd" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_lua.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libd" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Release" *************** *** 233,238 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_wxbind.lib wxlua_msw26_lua.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_wxbind.lib wxlua_msw26_lua.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ENDIF --- 233,238 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_lua.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_lua.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.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" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ENDIF Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** makefile.wat 29 Jan 2006 15:45:39 -0000 1.17 --- makefile.wat 2 Feb 2006 18:46:43 -0000 1.18 *************** *** 208,212 **** @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) 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 --- 208,212 ---- @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) 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 *************** *** 221,225 **** @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc library %i @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res wlink @watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc --- 221,225 ---- @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc library %i @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res wlink @watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** makefile.gcc 29 Jan 2006 15:45:39 -0000 1.18 --- makefile.gcc 2 Feb 2006 18:46:43 -0000 1.19 *************** *** 177,186 **** ifeq ($(USE_WXLUAAPP),1) ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif ifeq ($(USE_WXLUAEDITAPP),1) ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o ! $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif --- 177,186 ---- ifeq ($(USE_WXLUAAPP),1) ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif ifeq ($(USE_WXLUAEDITAPP),1) ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o ! $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif Index: apps_app_wxluaedit.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxluaedit.dsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** apps_app_wxluaedit.dsp 29 Jan 2006 15:45:39 -0000 1.9 --- apps_app_wxluaedit.dsp 2 Feb 2006 18:46:43 -0000 1.10 *************** *** 58,63 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 DLL Unicode Release" --- 58,63 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 DLL Unicode Release" *************** *** 83,88 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 DLL Debug" --- 83,88 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 DLL Debug" *************** *** 108,113 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d_stedit.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d_stedit.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 DLL Release" --- 108,113 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_lua.lib wxmsw26d_stedit.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26d_wxluasocket.lib wxlua_msw26d_wxluadebug.lib wxlua_msw26d_wxlua.lib wxlua_msw26d_wxbindstc.lib wxlua_msw26d_wxbind.lib wxlua_msw26d_lua.lib wxmsw26d_stedit.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 DLL Release" *************** *** 133,138 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxmsw26_stedit.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_wxbind.lib wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxmsw26_stedit.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Unicode Debug" --- 133,138 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_lua.lib wxmsw26_stedit.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxlua_msw26_wxluasocket.lib wxlua_msw26_wxluadebug.lib wxlua_msw26_wxlua.lib wxlua_msw26_wxbindstc.lib wxlua_msw26_wxbind.lib wxlua_msw26_lua.lib wxmsw26_stedit.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Unicode Debug" *************** *** 158,163 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libud" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libud" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Unicode Release" --- 158,163 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libud" /subsystem:windows /debug ! # ADD LINK32 wxlua_msw26ud_wxluasocket.lib wxlua_msw26ud_wxluadebug.lib wxlua_msw26ud_wxlua.lib wxlua_msw26ud_wxbindstc.lib wxlua_msw26ud_wxbind.lib wxlua_msw26ud_lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libud" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Unicode Release" *************** *** 183,188 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libu" /subsystem:windows ! # ADD LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_libu" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug" --- 183,188 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxluasocket.lib wxlua_msw26u_wxluadebug.lib wxlua_msw26u_wxlua.lib wxlua_msw26u_wxbindstc.lib wxlua_msw26u_wxbind.lib wxlua_msw26u_lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.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.... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-02-02 18:46:57
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11020/build/bakefiles Modified Files: wxhacks.bkl wxluabase.bkl Log Message: updated bakefiles for new wxbindstc module Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxluabase.bkl 29 Jan 2006 15:45:40 -0000 1.9 --- wxluabase.bkl 2 Feb 2006 18:46:43 -0000 1.10 *************** *** 124,135 **** <define-tag name="__wxlua-req-libs-point" rules="exe,dll,module"/> ! <!-- our <wxlua-lib> tag accepts the following values: ! ! 'wxluasocket', 'wxluadebug', 'wxlua', 'wxbind', 'lua' ! ! as these are the modules built by this project. --> <define-tag name="wxlua-lib" rules="exe,dll,module"> ! <if cond="value not in [ 'wxluasocket', 'wxluadebug', 'wxlua', 'wxbind', 'lua' ]"> <error>Invalid wxlua-lib value !</error> </if> --- 124,132 ---- <define-tag name="__wxlua-req-libs-point" rules="exe,dll,module"/> ! <!-- the <wxlua-lib> tag accepts only those values which refer to a wxLua module name. ! Trying to use an invalid name will generate an error at bake-time. --> <define-tag name="wxlua-lib" rules="exe,dll,module"> ! <if cond="value not in [ 'wxluasocket', 'wxluadebug', 'wxlua', 'wxbindstc', 'wxbind', 'lua' ]"> <error>Invalid wxlua-lib value !</error> </if> *************** *** 142,145 **** --- 139,152 ---- </define-tag> + <!-- shortcut for including *all* wxLua libraries --> + <define-tag name="wxlua-alllibs" rules="exe,dll,module"> + <wxlua-lib>wxluasocket</wxlua-lib> + <wxlua-lib>wxluadebug</wxlua-lib> + <wxlua-lib>wxlua</wxlua-lib> + <wxlua-lib>wxbindstc</wxlua-lib> + <wxlua-lib>wxbind</wxlua-lib> + <wxlua-lib>lua</wxlua-lib> + </define-tag> + <!-- this tag includes the wxLua required libraries, it will be defined later in options.bkl --> *************** *** 172,176 **** <!-- a template for wxLua-based exe/dll targets --> <template id="wxlua" template="wx,wxlua-base"> ! <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path> <!-- same technique used by wx_win32.bkl: this is a placeholder --- 179,189 ---- <!-- a template for wxLua-based exe/dll targets --> <template id="wxlua" template="wx,wxlua-base"> ! <if cond="TARGETING_WIN32=='1'"> ! <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path> ! </if> ! <if cond="TARGETING_WIN32=='0'"> ! <lib-path>$(top_builddir)$(WXLUA_OUTPUT_FOLDER)</lib-path> ! </if> ! <!-- same technique used by wx_win32.bkl: this is a placeholder Index: wxhacks.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxhacks.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxhacks.bkl 28 Jan 2006 21:01:07 -0000 1.3 --- wxhacks.bkl 2 Feb 2006 18:46:43 -0000 1.4 *************** *** 113,116 **** --- 113,130 ---- + <!-- A simple tag which acts as shortcut for including in the list of libraries to link + *all* wxWidgets libraries. --> + <define-tag name="wx-alllibs" rules="exe,dll,module"> + <wx-lib>xrc</wx-lib> + <wx-lib>html</wx-lib> + <wx-lib>media</wx-lib> + <wx-lib>adv</wx-lib> + <wx-lib>net</wx-lib> + <wx-lib>xml</wx-lib> + <wx-lib>core</wx-lib> + <wx-lib>base</wx-lib> + </define-tag> + + <!-- A simple tag which helps you to define a library name using the same rules used by wxWidgets. Use the 'prefix' attribute to add your lib's prefix. |
|
From: Francesco M. <fr...@us...> - 2006-02-02 18:46:57
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11020/modules/build/bakefiles Modified Files: modules.bkl Log Message: updated bakefiles for new wxbindstc module Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** modules.bkl 29 Jan 2006 15:45:40 -0000 1.16 --- modules.bkl 2 Feb 2006 18:46:44 -0000 1.17 *************** *** 59,62 **** --- 59,65 ---- <set var="WXBIND_HDR">$(fileList('wxbind/include/*.h'))</set> + <set var="WXBINDSTC_SRC">$(fileList('wxbindstc/src/*.cpp'))</set> + <set var="WXBINDSTC_HDR">$(fileList('wxbindstc/include/*.h'))</set> + <set var="WXLUA_SRC">$(fileList('wxlua/src/*.cpp'))</set> <set var="WXLUA_HDR">$(fileList('wxlua/include/*.h'))</set> *************** *** 222,225 **** --- 225,237 ---- </wxlua_dll> + <!-- the wxBindSTC lib & dll --> + <wxlua_lib id="wxbindstc_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> + <module-name>WXBINDSTC</module-name> + </wxlua_lib> + <wxlua_dll id="wxbindstc_dll" template="wxlua" cond="WX_SHARED=='1'"> + <module-name>WXBINDSTC</module-name> + </wxlua_dll> + + <!-- FIXME: WXLUASETUP_DIR and WXLUABINDLIB_DIR --> |
|
From: Francesco M. <fr...@us...> - 2006-02-02 18:46:56
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11020/modules Modified Files: Makefile.in Log Message: updated bakefiles for new wxbindstc module Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.in 29 Jan 2006 15:45:40 -0000 1.19 --- Makefile.in 2 Feb 2006 18:46:43 -0000 1.20 *************** *** 111,115 **** wxbind_lib_config.o \ wxbind_lib_wx_object.o \ - wxbind_lib_stc.o \ wxbind_lib_menutool.o \ wxbind_lib_event.o \ --- 111,114 ---- *************** *** 151,155 **** wxbind_dll_config.o \ wxbind_dll_wx_object.o \ - wxbind_dll_stc.o \ wxbind_dll_menutool.o \ wxbind_dll_event.o \ --- 150,153 ---- *************** *** 178,181 **** --- 176,197 ---- wxbind_dll_thread.o \ wxbind_dll_help.o + WXBINDSTC_LIB_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ + $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) + WXBINDSTC_LIB_OBJECTS = \ + wxbindstc_lib_wxstc_class.o \ + wxbindstc_lib_stc.o \ + wxbindstc_lib_wxstc_object.o \ + wxbindstc_lib_wxstc_event.o \ + wxbindstc_lib_wxstc_define.o \ + wxbindstc_lib_wxstc_builtin.o + WXBINDSTC_DLL_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ + -DWXBINDSTC_MAKINGDLL $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) + WXBINDSTC_DLL_OBJECTS = \ + wxbindstc_dll_wxstc_class.o \ + wxbindstc_dll_stc.o \ + wxbindstc_dll_wxstc_object.o \ + wxbindstc_dll_wxstc_event.o \ + wxbindstc_dll_wxstc_define.o \ + wxbindstc_dll_wxstc_builtin.o WXLUADEBUG_LIB_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) *************** *** 227,231 **** @COND_WX_SHARED_0@ = uninstall_wxlua_lib_headers @COND_WX_SHARED_1@__wxlua_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx_4) @COND_WX_SHARED_1@__install_wxlua_dll___depname = install_wxlua_dll @COND_WX_SHARED_1@__uninstall_wxlua_dll___depname = uninstall_wxlua_dll --- 243,247 ---- @COND_WX_SHARED_0@ = uninstall_wxlua_lib_headers @COND_WX_SHARED_1@__wxlua_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx_6) @COND_WX_SHARED_1@__install_wxlua_dll___depname = install_wxlua_dll @COND_WX_SHARED_1@__uninstall_wxlua_dll___depname = uninstall_wxlua_dll *************** *** 236,244 **** @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)wxlua_dll$(__wx) @COND_USE_SOVERSOLARIS_1@__wxlua_dll___soname_flags \ ! @COND_USE_SOVERSOLARIS_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxlua_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd = (cd \ $(top_builddir)lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx_4) \ $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) --- 252,260 ---- @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)wxlua_dll$(__wx) @COND_USE_SOVERSOLARIS_1@__wxlua_dll___soname_flags \ ! @COND_USE_SOVERSOLARIS_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxlua_dll$(__wx_6) COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd = (cd \ $(top_builddir)lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx_6) \ $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) *************** *** 246,250 **** COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_inst_cmd = rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx_4) \ $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) --- 262,266 ---- COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_inst_cmd = rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx_6) \ $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) *************** *** 270,274 **** @COND_WX_SHARED_0@ = uninstall_wxbind_lib_headers @COND_WX_SHARED_1@__wxbind_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx_4) @COND_WX_SHARED_1@__install_wxbind_dll___depname = install_wxbind_dll @COND_WX_SHARED_1@__uninstall_wxbind_dll___depname = uninstall_wxbind_dll --- 286,290 ---- @COND_WX_SHARED_0@ = uninstall_wxbind_lib_headers @COND_WX_SHARED_1@__wxbind_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx_6) @COND_WX_SHARED_1@__install_wxbind_dll___depname = install_wxbind_dll @COND_WX_SHARED_1@__uninstall_wxbind_dll___depname = uninstall_wxbind_dll *************** *** 279,287 **** @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)wxbind_dll$(__wx) @COND_USE_SOVERSOLARIS_1@__wxbind_dll___soname_flags \ ! @COND_USE_SOVERSOLARIS_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxbind_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_cmd = (cd \ $(top_builddir)lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx_4) \ $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) --- 295,303 ---- @COND_USE_SOVERLINUX_1@ $(SONAME_FLAG)$(DLLPREFIX)wxbind_dll$(__wx) @COND_USE_SOVERSOLARIS_1@__wxbind_dll___soname_flags \ ! @COND_USE_SOVERSOLARIS_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxbind_dll$(__wx_6) COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_cmd = (cd \ $(top_builddir)lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx_6) \ $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) *************** *** 289,293 **** COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_inst_cmd = rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx_4) \ $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) --- 305,309 ---- COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_inst_cmd = rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx_6) \ $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) *************** *** 303,306 **** --- 319,370 ---- @COND_WX_SHARED_1@__uninstall_wxbind_dll_headers___depname \ @COND_WX_SHARED_1@ = uninstall_wxbind_dll_headers + COND_WX_SHARED_0___wxbindstc_lib___depname = \ + $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) + @COND_WX_SHARED_0@__wxbindstc_lib___depname = $(COND_WX_SHARED_0___wxbindstc_lib___depname) + @COND_WX_SHARED_0@__install_wxbindstc_lib___depname = install_wxbindstc_lib + @COND_WX_SHARED_0@__uninstall_wxbindstc_lib___depname = \ + @COND_WX_SHARED_0@ uninstall_wxbindstc_lib + @COND_WX_SHARED_0@__install_wxbindstc_lib_headers___depname \ + @COND_WX_SHARED_0@ = install_wxbindstc_lib_headers + @COND_WX_SHARED_0@__uninstall_wxbindstc_lib_headers___depname \ + @COND_WX_SHARED_0@ = uninstall_wxbindstc_lib_headers + @COND_WX_SHARED_1@__wxbindstc_dll___depname = \ + @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxbindstc_dll$(__wx_6) + @COND_WX_SHARED_1@__install_wxbindstc_dll___depname = install_wxbindstc_dll + @COND_WX_SHARED_1@__uninstall_wxbindstc_dll___depname = \ + @COND_WX_SHARED_1@ uninstall_wxbindstc_dll + @COND_PLATFORM_MACOSX_1@__wxbindstc_dll___macinstnamecmd \ + @COND_PLATFORM_MACOSX_1@ = -install_name \ + @COND_PLATFORM_MACOSX_1@ $(libdir)/$(DLLPREFIX)wxbindstc_dll$(__wx) + @COND_USE_SOVERLINUX_1@__wxbindstc_dll___soname_flags \ + @COND_USE_SOVERLINUX_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxbindstc_dll$(__wx) + @COND_USE_SOVERSOLARIS_1@__wxbindstc_dll___soname_flags \ + @COND_USE_SOVERSOLARIS_1@ = \ + @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxbindstc_dll$(__wx_6) + COND_USE_SOSYMLINKS_1___wxbindstc_dll___so_symlinks_cmd = (cd \ + $(top_builddir)lib/; rm -f \ + $(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ + $(DLLPREFIX)wxbindstc_dll$(__wx); $(LN_S) \ + $(DLLPREFIX)wxbindstc_dll$(__wx_6) $(DLLPREFIX)wxbindstc_dll$(__wx); \ + $(LN_S) $(DLLPREFIX)wxbindstc_dll$(__wx) \ + $(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) + @COND_USE_SOSYMLINKS_1@__wxbindstc_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxbindstc_dll___so_symlinks_cmd) + COND_USE_SOSYMLINKS_1___wxbindstc_dll___so_symlinks_inst_cmd = rm -f \ + $(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ + $(DLLPREFIX)wxbindstc_dll$(__wx); $(LN_S) \ + $(DLLPREFIX)wxbindstc_dll$(__wx_6) $(DLLPREFIX)wxbindstc_dll$(__wx); \ + $(LN_S) $(DLLPREFIX)wxbindstc_dll$(__wx) \ + $(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + @COND_USE_SOSYMLINKS_1@__wxbindstc_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___wxbindstc_dll___so_symlinks_inst_cmd) + COND_PLATFORM_OS2_1___wxbindstc_dll___importlib = -import \ + $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + @COND_PLATFORM_OS2_1@__wxbindstc_dll___importlib = $(COND_PLATFORM_OS2_1___wxbindstc_dll___importlib) + COND_WINDOWS_IMPLIB_1___wxbindstc_dll___importlib = \ + -Wl,--out-implib,$(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + @COND_WINDOWS_IMPLIB_1@__wxbindstc_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxbindstc_dll___importlib) + @COND_WX_SHARED_1@__install_wxbindstc_dll_headers___depname \ + @COND_WX_SHARED_1@ = install_wxbindstc_dll_headers + @COND_WX_SHARED_1@__uninstall_wxbindstc_dll_headers___depname \ + @COND_WX_SHARED_1@ = uninstall_wxbindstc_dll_headers COND_WX_SHARED_0___wxluadebug_lib___depname = \ $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) *************** *** 315,319 **** @COND_WX_SHARED_0@ = uninstall_wxluadebug_lib_headers @COND_WX_SHARED_1@__wxluadebug_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4) @COND_WX_SHARED_1@__install_wxluadebug_dll___depname = \ @COND_WX_SHARED_1@ install_wxluadebug_dll --- 379,383 ---- @COND_WX_SHARED_0@ = uninstall_wxluadebug_lib_headers @COND_WX_SHARED_1@__wxluadebug_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx_6) @COND_WX_SHARED_1@__install_wxluadebug_dll___depname = \ @COND_WX_SHARED_1@ install_wxluadebug_dll *************** *** 327,336 **** @COND_USE_SOVERSOLARIS_1@__wxluadebug_dll___soname_flags \ @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluadebug_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd = (cd \ $(top_builddir)lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluadebug_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxluadebug_dll$(__wx_4) $(DLLPREFIX)wxluadebug_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluadebug_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) --- 391,400 ---- @COND_USE_SOVERSOLARIS_1@__wxluadebug_dll___soname_flags \ @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluadebug_dll$(__wx_6) COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd = (cd \ $(top_builddir)lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluadebug_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxluadebug_dll$(__wx_6) $(DLLPREFIX)wxluadebug_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluadebug_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) *************** *** 339,343 **** $(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluadebug_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxluadebug_dll$(__wx_4) $(DLLPREFIX)wxluadebug_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluadebug_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) --- 403,407 ---- $(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluadebug_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxluadebug_dll$(__wx_6) $(DLLPREFIX)wxluadebug_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluadebug_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) *************** *** 365,369 **** @COND_WX_SHARED_0@ = uninstall_wxluasocket_lib_headers @COND_WX_SHARED_1@__wxluasocket_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4) @COND_WX_SHARED_1@__install_wxluasocket_dll___depname = \ @COND_WX_SHARED_1@ install_wxluasocket_dll --- 429,433 ---- @COND_WX_SHARED_0@ = uninstall_wxluasocket_lib_headers @COND_WX_SHARED_1@__wxluasocket_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx_6) @COND_WX_SHARED_1@__install_wxluasocket_dll___depname = \ @COND_WX_SHARED_1@ install_wxluasocket_dll *************** *** 377,386 **** @COND_USE_SOVERSOLARIS_1@__wxluasocket_dll___soname_flags \ @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluasocket_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd = (cd \ $(top_builddir)lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluasocket_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxluasocket_dll$(__wx_4) $(DLLPREFIX)wxluasocket_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluasocket_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) --- 441,450 ---- @COND_USE_SOVERSOLARIS_1@__wxluasocket_dll___soname_flags \ @COND_USE_SOVERSOLARIS_1@ = \ ! @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluasocket_dll$(__wx_6) COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd = (cd \ $(top_builddir)lib/; rm -f \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluasocket_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxluasocket_dll$(__wx_6) $(DLLPREFIX)wxluasocket_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluasocket_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) *************** *** 389,393 **** $(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluasocket_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxluasocket_dll$(__wx_4) $(DLLPREFIX)wxluasocket_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluasocket_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) --- 453,457 ---- $(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluasocket_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxluasocket_dll$(__wx_6) $(DLLPREFIX)wxluasocket_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluasocket_dll$(__wx) \ $(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) *************** *** 406,432 **** @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__wx = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__wx_4 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx_4 = .0.0.0.$(SO_SUFFIX) ! @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__wx_4 = -0.$(SO_SUFFIX) ! @COND_USE_SOVERSION_0@__wx_4 = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_1@__wx_5 = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 1 -current_version 1 ### Targets: ### ! all: $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(top_builddir)bin/lua$(EXEEXT) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) ! install: all install_mod_lua_lib install_mod_lua_lib_headers install_mod_lua $(__install_wxlua_lib___depname) $(__install_wxlua_lib_headers___depname) $(__install_wxlua_dll___depname) $(__install_wxlua_dll_headers___depname) $(__install_wxbind_lib___depname) $(__install_wxbind_lib_headers___depname) $(__install_wxbind_dll___depname) $(__install_wxbind_dll_headers___depname) $(__install_wxluadebug_lib___depname) $(__install_wxluadebug_lib_headers___depname) $(__install_wxluadebug_dll___depname) $(__install_wxluadebug_dll_headers___depname) $(__install_wxluasocket_lib___depname) $(__install_wxluasocket_lib_headers___depname) $(__install_wxluasocket_dll___depname) $(__install_wxluasocket_dll_headers___depname) ! uninstall: uninstall_mod_lua_lib uninstall_mod_lua_lib_headers uninstall_mod_lua $(__uninstall_wxlua_lib___depname) $(__uninstall_wxlua_lib_headers___depname) $(__uninstall_wxlua_dll___depname) $(__uninstall_wxlua_dll_headers___depname) $(__uninstall_wxbind_lib___depname) $(__uninstall_wxbind_lib_headers___depname) $(__uninstall_wxbind_dll___depname) $(__uninstall_wxbind_dll_headers___depname) $(__uninstall_wxluadebug_lib___depname) $(__uninstall_wxluadebug_lib_headers___depname) $(__uninstall_wxluadebug_dll___depname) $(__uninstall_wxluadebug_dll_headers___depname) $(__uninstall_wxluasocket_lib___depname) $(__uninstall_wxluasocket_lib_headers___depname) $(__uninstall_wxluasocket_dll___depname) $(__uninstall_wxluasocket_dll_headers___depname) install-strip: install $(STRIP) $(DESTDIR)$(bindir)/lua$(EXEEXT) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_dll$(__wx_4) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxbind_dll$(__wx_4) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxluadebug_dll$(__wx_4) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxluasocket_dll$(__wx_4) clean: --- 470,497 ---- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx = .0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__wx = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__wx_6 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.0.0 ! @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__wx_6 = .0.0.0.$(SO_SUFFIX) ! @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__wx_6 = -0.$(SO_SUFFIX) ! @COND_USE_SOVERSION_0@__wx_6 = .$(SO_SUFFIX) ! @COND_PLATFORM_MACOSX_1@__wx_7 = \ @COND_PLATFORM_MACOSX_1@ -compatibility_version 1 -current_version 1 ### Targets: ### ! all: $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(top_builddir)bin/lua$(EXEEXT) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxbindstc_lib___depname) $(__wxbindstc_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) ! install: all install_mod_lua_lib install_mod_lua_lib_headers install_mod_lua $(__install_wxlua_lib___depname) $(__install_wxlua_lib_headers___depname) $(__install_wxlua_dll___depname) $(__install_wxlua_dll_headers___depname) $(__install_wxbind_lib___depname) $(__install_wxbind_lib_headers___depname) $(__install_wxbind_dll___depname) $(__install_wxbind_dll_headers___depname) $(__install_wxbindstc_lib___depname) $(__install_wxbindstc_lib_headers___depname) $(__install_wxbindstc_dll___depname) $(__install_wxbindstc_dll_headers___depname) $(__install_wxluadebug_lib___depname) $(__install_wxluadebug_lib_headers___depname) $(__install_wxluadebug_dll___depname) $(__install_wxluadebug_dll_headers___depname) $(__install_wxluasocket_lib___depname) $(__install_wxluasocket_lib_headers___depname) $(__install_wxluasocket_dll___depname) $(__install_wxluasocket_dll_headers___depname) ! uninstall: uninstall_mod_lua_lib uninstall_mod_lua_lib_headers uninstall_mod_lua $(__uninstall_wxlua_lib___depname) $(__uninstall_wxlua_lib_headers___depname) $(__uninstall_wxlua_dll___depname) $(__uninstall_wxlua_dll_headers___depname) $(__uninstall_wxbind_lib___depname) $(__uninstall_wxbind_lib_headers___depname) $(__uninstall_wxbind_dll___depname) $(__uninstall_wxbind_dll_headers___depname) $(__uninstall_wxbindstc_lib___depname) $(__uninstall_wxbindstc_lib_headers___depname) $(__uninstall_wxbindstc_dll___depname) $(__uninstall_wxbindstc_dll_headers___depname) $(__uninstall_wxluadebug_lib___depname) $(__uninstall_wxluadebug_lib_headers___depname) $(__uninstall_wxluadebug_dll___depname) $(__uninstall_wxluadebug_dll_headers___depname) $(__uninstall_wxluasocket_lib___depname) $(__uninstall_wxluasocket_lib_headers___depname) $(__uninstall_wxluasocket_dll___depname) $(__uninstall_wxluasocket_dll_headers___depname) install-strip: install $(STRIP) $(DESTDIR)$(bindir)/lua$(EXEEXT) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_dll$(__wx_6) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxbind_dll$(__wx_6) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxbindstc_dll$(__wx_6) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxluadebug_dll$(__wx_6) ! $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)wxluasocket_dll$(__wx_6) clean: *************** *** 436,452 **** rm -f $(top_builddir)bin/lua$(EXEEXT) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx_4) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx_4) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx) --- 501,521 ---- rm -f $(top_builddir)bin/lua$(EXEEXT) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx_6) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx_6) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx) + rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) + rm -f $(top_builddir)lib/$(DLLPREFIX)wxbindstc_dll$(__wx_6) + rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxbindstc_dll$(__wx) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx_6) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx_6) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx) *************** *** 519,524 **** @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx_4): $(WXLUA_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___macinstnamecmd) $(__wxlua_dll___soname_flags) $(__wx_5) -L$(top_srcdir)/lib $(__wxlua_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxlua_dll___so_symlinks_cmd) --- 588,593 ---- @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx_6): $(WXLUA_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___macinstnamecmd) $(__wxlua_dll___soname_flags) $(__wx_7) -L$(top_builddir)lib $(__wxlua_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxlua_dll___so_symlinks_cmd) *************** *** 527,536 **** @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx_4) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxlua_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxlua_dll: @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_dll$(__wx_4) @COND_WX_SHARED_1@install_wxlua_dll_headers: --- 596,605 ---- @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx_6) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxlua_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxlua_dll: @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_dll$(__wx_6) @COND_WX_SHARED_1@install_wxlua_dll_headers: *************** *** 574,579 **** @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx_4): $(WXBIND_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) $(__wxbind_dll___macinstnamecmd) $(__wxbind_dll___soname_flags) $(__wx_5) -L$(top_srcdir)/lib $(__wxbind_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxbind_dll___so_symlinks_cmd) --- 643,648 ---- @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx_6): $(WXBIND_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) $(__wxbind_dll___macinstnamecmd) $(__wxbind_dll___soname_flags) $(__wx_7) -L$(top_builddir)lib $(__wxbind_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxbind_dll___so_symlinks_cmd) *************** *** 582,591 **** @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx_4) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbind_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxbind_dll: @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxbind_dll$(__wx_4) @COND_WX_SHARED_1@install_wxbind_dll_headers: --- 651,660 ---- @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx_6) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbind_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxbind_dll: @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxbind_dll$(__wx_6) @COND_WX_SHARED_1@install_wxbind_dll_headers: *************** *** 603,606 **** --- 672,730 ---- @COND_WX_SHARED_1@ done + @COND_WX_SHARED_0@$(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT): $(WXBINDSTC_LIB_OBJECTS) + @COND_WX_SHARED_0@ rm -f $@ + @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXBINDSTC_LIB_OBJECTS) + @COND_WX_SHARED_0@ $(RANLIB) $@ + + @COND_WX_SHARED_0@install_wxbindstc_lib: + @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(DESTDIR)$(libdir) + + @COND_WX_SHARED_0@uninstall_wxbindstc_lib: + @COND_WX_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) + + @COND_WX_SHARED_0@install_wxbindstc_lib_headers: + @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir) + @COND_WX_SHARED_0@ for f in wxbindstc/include/wxbind.h; do \ + @COND_WX_SHARED_0@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ + @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + @COND_WX_SHARED_0@ fi; \ + @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_srcdir)/modules/$$f $(DESTDIR)$(includedir)/$$f; \ + @COND_WX_SHARED_0@ done + + @COND_WX_SHARED_0@uninstall_wxbindstc_lib_headers: + @COND_WX_SHARED_0@ for f in wxbindstc/include/wxbind.h; do \ + @COND_WX_SHARED_0@ rm -f $(DESTDIR)$(includedir)/$$f; \ + @COND_WX_SHARED_0@ done + + @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxbindstc_dll$(__wx_6): $(WXBINDSTC_DLL_OBJECTS) + @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) $(__wxbindstc_dll___macinstnamecmd) $(__wxbindstc_dll___soname_flags) $(__wx_7) -L$(top_builddir)lib $(__wxbindstc_dll___importlib) $(WX_LIBS) + @COND_WX_SHARED_1@ + @COND_WX_SHARED_1@ $(__wxbindstc_dll___so_symlinks_cmd) + + @COND_WX_SHARED_1@install_wxbindstc_dll: + @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) + @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) + @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxbindstc_dll$(__wx_6) $(DESTDIR)$(libdir) + @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbindstc_dll___so_symlinks_inst_cmd)) + + @COND_WX_SHARED_1@uninstall_wxbindstc_dll: + @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) + @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxbindstc_dll$(__wx_6) + + @COND_WX_SHARED_1@install_wxbindstc_dll_headers: + @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) + @COND_WX_SHARED_1@ for f in wxbindstc/include/wxbind.h; do \ + @COND_WX_SHARED_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ + @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + @COND_WX_SHARED_1@ fi; \ + @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_srcdir)/modules/$$f $(DESTDIR)$(includedir)/$$f; \ + @COND_WX_SHARED_1@ done + + @COND_WX_SHARED_1@uninstall_wxbindstc_dll_headers: + @COND_WX_SHARED_1@ for f in wxbindstc/include/wxbind.h; do \ + @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ + @COND_WX_SHARED_1@ done + @COND_WX_SHARED_0@$(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT): $(WXLUADEBUG_LIB_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ *************** *** 629,634 **** @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4): $(WXLUADEBUG_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) $(__wxluadebug_dll___macinstnamecmd) $(__wxluadebug_dll___soname_flags) $(__wx_5) -L$(top_srcdir)/lib $(__wxluadebug_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxluadebug_dll___so_symlinks_cmd) --- 753,758 ---- @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx_6): $(WXLUADEBUG_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) $(__wxluadebug_dll___macinstnamecmd) $(__wxluadebug_dll___soname_flags) $(__wx_7) -L$(top_builddir)lib $(__wxluadebug_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxluadebug_dll___so_symlinks_cmd) *************** *** 637,646 **** @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxluadebug_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxluadebug_dll: @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxluadebug_dll$(__wx_4) @COND_WX_SHARED_1@install_wxluadebug_dll_headers: --- 761,770 ---- @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx_6) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxluadebug_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxluadebug_dll: @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxluadebug_dll$(__wx_6) @COND_WX_SHARED_1@install_wxluadebug_dll_headers: *************** *** 684,689 **** @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4): $(WXLUASOCKET_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___macinstnamecmd) $(__wxluasocket_dll___soname_flags) $(__wx_5) -L$(top_srcdir)/lib $(__wxluasocket_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxluasocket_dll___so_symlinks_cmd) --- 808,813 ---- @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx_6): $(WXLUASOCKET_DLL_OBJECTS) ! @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___macinstnamecmd) $(__wxluasocket_dll___soname_flags) $(__wx_7) -L$(top_builddir)lib $(__wxluasocket_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ @COND_WX_SHARED_1@ $(__wxluasocket_dll___so_symlinks_cmd) *************** *** 692,701 **** @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxluasocket_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxluasocket_dll: @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxluasocket_dll$(__wx_4) @COND_WX_SHARED_1@install_wxluasocket_dll_headers: --- 816,825 ---- @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx_6) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxluasocket_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxluasocket_dll: @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxluasocket_dll$(__wx_6) @COND_WX_SHARED_1@install_wxluasocket_dll_headers: *************** *** 860,866 **** $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/wx_object.cpp - wxbind_lib_stc.o: $(top_srcdir)/modules/wxbind/src/stc.cpp - $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/stc.cpp - wxbind_lib_menutool.o: $(top_srcdir)/modules/wxbind/src/menutool.cpp $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/menutool.cpp --- 984,987 ---- *************** *** 971,977 **** $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/wx_object.cpp - wxbind_dll_stc.o: $(top_srcdir)/modules/wxbind/src/stc.cpp - $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/stc.cpp - wxbind_dll_menutool.o: $(top_srcdir)/modules/wxbind/src/menutool.cpp $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/menutool.cpp --- 1092,1095 ---- *************** *** 1052,1055 **** --- 1170,1209 ---- $(CXXC) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/help.cpp + wxbindstc_lib_wxstc_class.o: $(top_srcdir)/modules/wxbindstc/src/wxstc_class.cpp + $(CXXC) -c -o $@ $(WXBINDSTC_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbindstc/src/wxstc_class.cpp + + wxbindstc_lib_stc.o: $(top_srcdir)/modules/wxbindstc/src/stc.cpp + $(CXXC) -c -o $@ $(WXBINDSTC_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbindstc/src/stc.cpp + + wxbindstc_lib_wxstc_object.o: $(top_srcdir)/modules/wxbindstc/src/wxstc_object.cpp + $(CXXC) -c -o $@ $(WXBINDSTC_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbindstc/src/wxstc_object.cpp + + wxbindstc_lib_wxstc_event.o: $(top_srcdir)/modules/wxbindstc/src/wxstc_event.cpp + $(CXXC) -c -o $@ $(WXBINDSTC_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbindstc/src/wxstc_event.cpp + + wxbindstc_lib_wxstc_define.o: $(top_srcdir)/modules/wxbindstc/src/wxstc_define.cpp + $(CXXC) -c -o $@ $(WXBINDSTC_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbindstc/src/wxstc_define.cpp + + wxbindstc_lib_wxstc_builtin.o: $(top_srcdir)/modules/wxbindstc/src/wxstc_builtin.cpp + $(CXXC) -c -o $@ $(WXBINDSTC_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbindstc/src/wxstc_builtin.cpp + + wxbindstc_dll_wxstc_class.o: $(top_srcdir)/modules/wxbindstc/src/wxstc_class.cpp + $(CXXC) -c -o $@ $(WXBINDSTC_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbindstc/src/wxstc_class.cpp + + wxbindstc_dll_stc.o: $(top_srcdir)/modules/wxbindstc/src/stc.cpp + $(CXXC) -c -o $@ $(WXBINDSTC_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbindstc/src/stc.cpp + + wxbindstc_dll_wxstc_object.o: $(top_srcdir)/modules/wxbindstc/src/wxstc_object.cpp + $(CXXC) -c -o $@ $(WXBINDSTC_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbindstc/src/wxstc_object.cpp + + wxbindstc_dll_wxstc_event.o: $(top_srcdir)/modules/wxbindstc/src/wxstc_event.cpp + $(CXXC) -c -o $@ $(WXBINDSTC_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbindstc/src/wxstc_event.cpp + + wxbindstc_dll_wxstc_define.o: $(top_srcdir)/modules/wxbindstc/src/wxstc_define.cpp + $(CXXC) -c -o $@ $(WXBINDSTC_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbindstc/src/wxstc_define.cpp + + wxbindstc_dll_wxstc_builtin.o: $(top_srcdir)/modules/wxbindstc/src/wxstc_builtin.cpp + $(CXXC) -c -o $@ $(WXBINDSTC_DLL_CXXFLAGS) $(top_srcdir)/modules/wxbindstc/src/wxstc_builtin.cpp + wxluadebug_lib_wxldebug.o: $(top_srcdir)/modules/wxluadebug/src/wxldebug.cpp $(CXXC) -c -o $@ $(WXLUADEBUG_LIB_CXXFLAGS) $(top_srcdir)/modules/wxluadebug/src/wxldebug.cpp *************** *** 1110,1112 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_mod_lua_lib uninstall_mod_lua_lib install_mod_lua_lib_headers uninstall_mod_lua_lib_headers install_mod_lua uninstall_mod_lua install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers --- 1264,1266 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_mod_lua_lib uninstall_mod_lua_lib install_mod_lua_lib_headers uninstall_mod_lua_lib_headers install_mod_lua uninstall_mod_lua install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers |
|
From: Francesco M. <fr...@us...> - 2006-02-02 18:46:55
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11020/apps Modified Files: Makefile.in Log Message: updated bakefiles for new wxbindstc module Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.in 29 Jan 2006 15:45:39 -0000 1.18 --- Makefile.in 2 Feb 2006 18:46:43 -0000 1.19 *************** *** 99,103 **** @COND_USE_WXLUAAPP_1@$(top_builddir)bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXLUAAPP_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUAAPP_1@ @COND_USE_WXLUAAPP_1@ $(__app_wxlua___mac_setfilecmd) --- 99,103 ---- @COND_USE_WXLUAAPP_1@$(top_builddir)bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXLUAAPP_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUAAPP_1@ @COND_USE_WXLUAAPP_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 112,116 **** @COND_USE_WXLUAEDITAPP_1@$(top_builddir)bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUAEDITAPP_1@ @COND_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 112,116 ---- @COND_USE_WXLUAEDITAPP_1@$(top_builddir)bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUAEDITAPP_1@ @COND_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) |
|
From: Francesco M. <fr...@us...> - 2006-02-02 18:46:55
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11020/apps/build/bakefiles Modified Files: apps.bkl Log Message: updated bakefiles for new wxbindstc module Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** apps.bkl 28 Jan 2006 21:01:07 -0000 1.18 --- apps.bkl 2 Feb 2006 18:46:43 -0000 1.19 *************** *** 77,95 **** <win32-res>wxlua/src/wxlua.rc</win32-res> ! <!-- Libraries must be put in this EXACT order ! --> ! <wxlua-lib>wxluasocket</wxlua-lib> ! <wxlua-lib>wxluadebug</wxlua-lib> ! <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>wxbind</wxlua-lib> ! <wxlua-lib>lua</wxlua-lib> ! ! <wx-lib>xrc</wx-lib> ! <wx-lib>html</wx-lib> ! <wx-lib>media</wx-lib> ! <wx-lib>adv</wx-lib> ! <wx-lib>net</wx-lib> ! <wx-lib>xml</wx-lib> ! <wx-lib>core</wx-lib> ! <wx-lib>base</wx-lib> </exe> --- 77,82 ---- <win32-res>wxlua/src/wxlua.rc</win32-res> ! <wxlua-alllibs/> ! <wx-alllibs/> </exe> *************** *** 120,141 **** <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> - <!-- Libraries must be put in the reverse order they'll be loaded --> - <wxlua-lib>wxluasocket</wxlua-lib> - <wxlua-lib>wxluadebug</wxlua-lib> - <wxlua-lib>wxbind</wxlua-lib> - <wxlua-lib>wxlua</wxlua-lib> - <wxlua-lib>lua</wxlua-lib> <wx-lib>stedit</wx-lib> <!-- Library for wxCode's wxstedit --> <wx-lib>stc</wx-lib> ! ! <wx-lib>xrc</wx-lib> ! <wx-lib>html</wx-lib> ! <wx-lib>media</wx-lib> ! <wx-lib>adv</wx-lib> ! <wx-lib>net</wx-lib> ! <wx-lib>xml</wx-lib> ! <wx-lib>core</wx-lib> ! <wx-lib>base</wx-lib> </exe> --- 107,115 ---- <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> + <wxlua-alllibs/> <wx-lib>stedit</wx-lib> <!-- Library for wxCode's wxstedit --> <wx-lib>stc</wx-lib> ! <wx-alllibs/> </exe> |
|
From: John L. <jr...@us...> - 2006-02-02 17:05:51
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28688/wxLua/bindings/wxwidgets Modified Files: override.hpp Log Message: add the overrides to the wxstc module Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** override.hpp 30 Dec 2005 04:35:59 -0000 1.7 --- override.hpp 2 Feb 2006 17:05:41 -0000 1.8 *************** *** 736,756 **** %end - %override wxStyledTextEvent_SetDragResult - // void SetDragResult(wxDragResult val) - static int LUACALL wxStyledTextEvent_SetDragResult(lua_State *L) - { - wxLuaState wxlState(L); - // wxDragResult val - wxDragResult val = (wxDragResult)(int)lua_tonumber(L, 2); - // get this - wxStyledTextEvent *self = (wxStyledTextEvent *)wxlState.getuserdatatype(1, s_wxluatag_wxStyledTextEvent); - // call SetDragResult - self->SetDragResult(val); - // return the number of parameters - return 0; - } - %end - - %override wxGrid_GetRowLabelAlignment // void GetRowLabelAlignment( int *horz, int *vert ) --- 736,739 ---- *************** *** 833,911 **** %end - %override wxStyledTextCtrl_GetCurLine - // wxString GetCurLine(int* linePos=NULL) - static int LUACALL wxStyledTextCtrl_GetCurLine(lua_State *L) - { - wxLuaState wxlState(L); - wxString returns; - int linePos; - // get this - wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxlState.getuserdatatype(1, s_wxluatag_wxStyledTextCtrl); - // call GetCurLine - returns = self->GetCurLine(&linePos); - // push the result string - lua_pushstring(L, wx2lua(returns)); - lua_pushnumber(L, linePos); - // return the number of parameters - return 2; - } - %end - - %override wxStyledTextCtrl_GetSelection - // void GetSelection(int* startPos, int* endPos) - static int LUACALL wxStyledTextCtrl_GetSelection(lua_State *L) - { - wxLuaState wxlState(L); - int endPos; - int startPos; - // get this - wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxlState.getuserdatatype(1, s_wxluatag_wxStyledTextCtrl); - // call GetSelection - self->GetSelection(&startPos, &endPos); - // push results - lua_pushnumber(L, startPos); - lua_pushnumber(L, endPos); - // return the number of parameters - return 2; - } - %end - - %override wxStyledTextCtrl_SetStyleBytes - // void SetStyleBytes(int length, const wxString &styleBytes) - static int LUACALL wxStyledTextCtrl_SetStyleBytes(lua_State *L) - { - wxLuaState wxlState(L); - // const wxString &styleBytes - wxCharBuffer styleBytes(lua_tostring(L, 3)); - // int length - int length = (int)lua_tonumber(L, 2); - // get this - wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxlState.getuserdatatype(1, s_wxluatag_wxStyledTextCtrl); - // call SetStyleBytes - self->SetStyleBytes(length, styleBytes.data()); - // push result - lua_pushstring(L, styleBytes); - // return the number of parameters - return 1; - } - %end - - %override wxStyledTextEvent_GetDragResult - // wxDragResult GetDragResult() - static int LUACALL wxStyledTextEvent_GetDragResult(lua_State *L) - { - wxLuaState wxlState(L); - wxDragResult returns; - // get this - wxStyledTextEvent *self = (wxStyledTextEvent *)wxlState.getuserdatatype(1, s_wxluatag_wxStyledTextEvent); - // call GetDragResult - returns = self->GetDragResult(); - // push the result datatype - lua_pushnumber(L, (long) returns); - // return the number of parameters - return 1; - } - %end - %override wxFrame_SetStatusWidths // virtual void SetStatusWidths(int n, int *widths) --- 816,819 ---- |
