Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2008-01-16 19:54:56
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** makefile.vc 16 Jan 2008 16:46:10 -0000 1.76 --- makefile.vc 16 Jan 2008 19:54:22 -0000 1.77 *************** *** 76,79 **** --- 76,118 ---- THREADING = multi + # Do the wxLua bindings for the wxAdv lib need to be compiled ? [0,1] + USE_WXBINDADV = 1 + + # Do the wxLua bindings for the wxAUI lib need to be compiled ? [0,1] + USE_WXBINDAUI = 1 + + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + USE_WXBINDBASE = 1 + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + USE_WXBINDCORE = 1 + + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] + USE_WXBINDGL = 1 + + # Do the wxLua bindings for the wxHTML lib need to be compiled ? [0,1] + USE_WXBINDHTML = 1 + + # Do the wxLua bindings for the wxMedia lib need to be compiled ? [0,1] + USE_WXBINDMEDIA = 1 + + # Do the wxLua bindings for the wxNet lib need to be compiled ? [0,1] + USE_WXBINDNET = 1 + + # Do the wxLua bindings for the wxRichText lib need to be compiled ? [0,1] + USE_WXBINDRICHTEXT = 0 + + # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] + USE_WXBINDSTC = 1 + + # Do the wxLua bindings for wxXML need to be compiled ? [0,1] + USE_WXBINDXML = 1 + + # Do the wxLua bindings for wxXRC need to be compiled ? [0,1] + USE_WXBINDXRC = 1 + + # Does the wxLua debug support need to be compiled ? [0,1] + USE_WXLUADEBUG = 1 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 91,100 **** USE_WXLUAFREEZEAPP = 1 - # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] - USE_WXBINDSTC = 1 - - # Does the wxLua debug support need to be compiled ? [0,1] - USE_WXLUADEBUG = 1 - --- 130,133 ---- *************** *** 109,114 **** /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\lua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_CONSOLE $(CPPFLAGS) \ ! $(CFLAGS) APP_LUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj --- 142,153 ---- /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\lua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_CONSOLE \ ! $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj *************** *** 117,122 **** /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\luac.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_CONSOLE $(CPPFLAGS) \ ! $(CFLAGS) APP_LUAC_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ --- 156,167 ---- /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\luac.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_CONSOLE \ ! $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ *************** *** 126,131 **** /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxlua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_WINDOWS /GR /EHsc \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ --- 171,182 ---- /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxlua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_WINDOWS /GR \ ! /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ *************** *** 136,140 **** /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluaedit.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_WINDOWS \ /I$(WXSTEDIT_DIR)\include /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) \ $(CXXFLAGS) --- 187,197 ---- /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluaedit.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_WINDOWS \ /I$(WXSTEDIT_DIR)\include /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 147,151 **** /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluacan.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_WINDOWS \ /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ --- 204,214 ---- /I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /I$(WX_DIR)\include $(____app) \ $(____app_19) $(______app) /Fd..\..\..\bin\vc_$(____app_27)\wxluacan.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ ! /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ ! /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ ! /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ ! /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ ! /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ ! /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC /D_WINDOWS \ /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ *************** *** 161,165 **** $(____app_19) $(______app) \ /Fd..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb /I..\..\..\modules \ ! /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj \ --- 224,234 ---- $(____app_19) $(______app) \ /Fd..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb /I..\..\..\modules \ ! /I.\..\..\.. /I$(LUA_INCLUDE_DIR) /DDEF_wxLUA_USEBINDING_WXADV \ ! /DDEF_wxLUA_USEBINDING_WXAUI /DDEF_wxLUA_USEBINDING_WXBASE \ ! /DDEF_wxLUA_USEBINDING_WXCORE /DDEF_wxLUA_USEBINDING_WXGL \ ! /DDEF_wxLUA_USEBINDING_WXHTML /DDEF_wxLUA_USEBINDING_WXMEDIA \ ! /DDEF_wxLUA_USEBINDING_WXNET /DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! /DDEF_wxLUA_USEBINDING_WXSTC /DDEF_wxLUA_USEBINDING_WXXML \ ! /DDEF_wxLUA_USEBINDING_WXXRC /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj \ *************** *** 571,575 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d _WINDOWS ..\..\wxlua\src\wxlua.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 640,644 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d DEF_wxLUA_USEBINDING_WXADV /d DEF_wxLUA_USEBINDING_WXAUI /d DEF_wxLUA_USEBINDING_WXBASE /d DEF_wxLUA_USEBINDING_WXCORE /d DEF_wxLUA_USEBINDING_WXGL /d DEF_wxLUA_USEBINDING_WXHTML /d DEF_wxLUA_USEBINDING_WXMEDIA /d DEF_wxLUA_USEBINDING_WXNET /d DEF_wxLUA_USEBINDING_WXRICHTEXT /d DEF_wxLUA_USEBINDING_WXSTC /d DEF_wxLUA_USEBINDING_WXXML /d DEF_wxLUA_USEBINDING_WXXRC /d _WINDOWS ..\..\wxlua\src\wxlua.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 580,584 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include ..\..\wxluaedit\src\wxluaedit.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp --- 649,653 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d DEF_wxLUA_USEBINDING_WXADV /d DEF_wxLUA_USEBINDING_WXAUI /d DEF_wxLUA_USEBINDING_WXBASE /d DEF_wxLUA_USEBINDING_WXCORE /d DEF_wxLUA_USEBINDING_WXGL /d DEF_wxLUA_USEBINDING_WXHTML /d DEF_wxLUA_USEBINDING_WXMEDIA /d DEF_wxLUA_USEBINDING_WXNET /d DEF_wxLUA_USEBINDING_WXRICHTEXT /d DEF_wxLUA_USEBINDING_WXSTC /d DEF_wxLUA_USEBINDING_WXXML /d DEF_wxLUA_USEBINDING_WXXRC /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include ..\..\wxluaedit\src\wxluaedit.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp *************** *** 598,602 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d _WINDOWS /i ..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 667,671 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d DEF_wxLUA_USEBINDING_WXADV /d DEF_wxLUA_USEBINDING_WXAUI /d DEF_wxLUA_USEBINDING_WXBASE /d DEF_wxLUA_USEBINDING_WXCORE /d DEF_wxLUA_USEBINDING_WXGL /d DEF_wxLUA_USEBINDING_WXHTML /d DEF_wxLUA_USEBINDING_WXMEDIA /d DEF_wxLUA_USEBINDING_WXNET /d DEF_wxLUA_USEBINDING_WXRICHTEXT /d DEF_wxLUA_USEBINDING_WXSTC /d DEF_wxLUA_USEBINDING_WXXML /d DEF_wxLUA_USEBINDING_WXXRC /d _WINDOWS /i ..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 604,607 **** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d _WINDOWS ..\..\wxluafreeze\src\wxluafreeze.rc --- 673,676 ---- vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_INCLUDE_DIR) /d DEF_wxLUA_USEBINDING_WXADV /d DEF_wxLUA_USEBINDING_WXAUI /d DEF_wxLUA_USEBINDING_WXBASE /d DEF_wxLUA_USEBINDING_WXCORE /d DEF_wxLUA_USEBINDING_WXGL /d DEF_wxLUA_USEBINDING_WXHTML /d DEF_wxLUA_USEBINDING_WXMEDIA /d DEF_wxLUA_USEBINDING_WXNET /d DEF_wxLUA_USEBINDING_WXRICHTEXT /d DEF_wxLUA_USEBINDING_WXSTC /d DEF_wxLUA_USEBINDING_WXXML /d DEF_wxLUA_USEBINDING_WXXRC /d _WINDOWS ..\..\wxluafreeze\src\wxluafreeze.rc Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** makefile.bcc 16 Jan 2008 16:46:10 -0000 1.76 --- makefile.bcc 16 Jan 2008 19:54:21 -0000 1.77 *************** *** 115,118 **** --- 115,183 ---- !endif + # Do the wxLua bindings for the wxAdv lib need to be compiled ? [0,1] + !ifndef USE_WXBINDADV + USE_WXBINDADV = 1 + !endif + + # Do the wxLua bindings for the wxAUI lib need to be compiled ? [0,1] + !ifndef USE_WXBINDAUI + USE_WXBINDAUI = 1 + !endif + + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + !ifndef USE_WXBINDBASE + USE_WXBINDBASE = 1 + !endif + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + !ifndef USE_WXBINDCORE + USE_WXBINDCORE = 1 + !endif + + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] + !ifndef USE_WXBINDGL + USE_WXBINDGL = 1 + !endif + + # Do the wxLua bindings for the wxHTML lib need to be compiled ? [0,1] + !ifndef USE_WXBINDHTML + USE_WXBINDHTML = 1 + !endif + + # Do the wxLua bindings for the wxMedia lib need to be compiled ? [0,1] + !ifndef USE_WXBINDMEDIA + USE_WXBINDMEDIA = 1 + !endif + + # Do the wxLua bindings for the wxNet lib need to be compiled ? [0,1] + !ifndef USE_WXBINDNET + USE_WXBINDNET = 1 + !endif + + # Do the wxLua bindings for the wxRichText lib need to be compiled ? [0,1] + !ifndef USE_WXBINDRICHTEXT + USE_WXBINDRICHTEXT = 0 + !endif + + # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] + !ifndef USE_WXBINDSTC + USE_WXBINDSTC = 1 + !endif + + # Do the wxLua bindings for wxXML need to be compiled ? [0,1] + !ifndef USE_WXBINDXML + USE_WXBINDXML = 1 + !endif + + # Do the wxLua bindings for wxXRC need to be compiled ? [0,1] + !ifndef USE_WXBINDXRC + USE_WXBINDXRC = 1 + !endif + + # Does the wxLua debug support need to be compiled ? [0,1] + !ifndef USE_WXLUADEBUG + USE_WXLUADEBUG = 1 + !endif + # Compile the wxLua app ? [0,1] !ifndef USE_WXLUAAPP *************** *** 140,153 **** !endif - # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] - !ifndef USE_WXBINDSTC - USE_WXBINDSTC = 1 - !endif - - # Does the wxLua debug support need to be compiled ? [0,1] - !ifndef USE_WXLUADEBUG - USE_WXLUADEBUG = 1 - !endif - --- 205,208 ---- *************** *** 162,166 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj --- 217,227 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.obj *************** *** 169,173 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ --- 230,240 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.obj \ *************** *** 177,181 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ --- 244,254 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ *************** *** 185,190 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj \ --- 258,269 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WXSTEDIT_DIR)\include \ ! -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj \ *************** *** 194,198 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ --- 273,283 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ *************** *** 206,210 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj --- 291,301 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING_4) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj *************** *** 591,595 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) ..\..\wxlua\src\wxlua.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 682,686 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC ..\..\wxlua\src\wxlua.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 600,604 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include ..\..\wxluaedit\src\wxluaedit.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp --- 691,695 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include ..\..\wxluaedit\src\wxluaedit.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp *************** *** 618,622 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -i..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 709,713 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC -i..\..\..\modules\wxbind\setup ..\..\wxluacan\src\cansim.rc bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 624,627 **** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) ..\..\wxluafreeze\src\wxluafreeze.rc --- 715,718 ---- bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC ..\..\wxluafreeze\src\wxluafreeze.rc Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** makefile.wat 16 Jan 2008 16:46:11 -0000 1.77 --- makefile.wat 16 Jan 2008 19:54:22 -0000 1.78 *************** *** 76,79 **** --- 76,118 ---- THREADING = multi + # Do the wxLua bindings for the wxAdv lib need to be compiled ? [0,1] + USE_WXBINDADV = 1 + + # Do the wxLua bindings for the wxAUI lib need to be compiled ? [0,1] + USE_WXBINDAUI = 1 + + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + USE_WXBINDBASE = 1 + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + USE_WXBINDCORE = 1 + + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] + USE_WXBINDGL = 1 + + # Do the wxLua bindings for the wxHTML lib need to be compiled ? [0,1] + USE_WXBINDHTML = 1 + + # Do the wxLua bindings for the wxMedia lib need to be compiled ? [0,1] + USE_WXBINDMEDIA = 1 + + # Do the wxLua bindings for the wxNet lib need to be compiled ? [0,1] + USE_WXBINDNET = 1 + + # Do the wxLua bindings for the wxRichText lib need to be compiled ? [0,1] + USE_WXBINDRICHTEXT = 0 + + # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] + USE_WXBINDSTC = 1 + + # Do the wxLua bindings for wxXML need to be compiled ? [0,1] + USE_WXBINDXML = 1 + + # Do the wxLua bindings for wxXRC need to be compiled ? [0,1] + USE_WXBINDXRC = 1 + + # Does the wxLua debug support need to be compiled ? [0,1] + USE_WXLUADEBUG = 1 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 91,100 **** USE_WXLUAFREEZEAPP = 1 - # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] - USE_WXBINDSTC = 1 - - # Does the wxLua debug support need to be compiled ? [0,1] - USE_WXLUADEBUG = 1 - --- 130,133 ---- *************** *** 552,556 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $(CPPFLAGS) & $(CFLAGS) APP_LUA_OBJECTS = & --- 585,595 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) & $(CFLAGS) APP_LUA_OBJECTS = & *************** *** 560,564 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $(CPPFLAGS) & $(CFLAGS) APP_LUAC_OBJECTS = & --- 599,609 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) & $(CFLAGS) APP_LUAC_OBJECTS = & *************** *** 569,573 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $(CPPFLAGS) & $(CXXFLAGS) APP_WXLUA_OBJECTS = & --- 614,624 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) & $(CXXFLAGS) APP_WXLUA_OBJECTS = & *************** *** 579,582 **** --- 630,639 ---- $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & + -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & + -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & + -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & + -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & + -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & + -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC & -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $(CPPFLAGS) & $(CXXFLAGS) *************** *** 589,592 **** --- 646,655 ---- $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & + -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & + -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & + -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & + -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & + -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & + -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC & -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & *************** *** 600,604 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $(CPPFLAGS) & $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & --- 663,673 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include & $(____app) $(____app_16) $(__RUNTIME_LIBS) $(__THREADING) & ! -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) & ! -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI & ! -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE & ! -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML & ! -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET & ! -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC & ! -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) & $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & *************** *** 765,769 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj : .AUTODEPEND ..\..\wxluaedit\src\wxledit.cpp --- 834,838 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.obj : .AUTODEPEND ..\..\wxluaedit\src\wxledit.cpp *************** *** 774,778 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res : .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp --- 843,847 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res : .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp *************** *** 792,796 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res : .AUTODEPEND ..\..\wxluacan\src\cansim.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=..\..\..\modules\wxbind\setup $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.cpp --- 861,865 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res : .AUTODEPEND ..\..\wxluacan\src\cansim.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC -i=..\..\..\modules\wxbind\setup $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 798,801 **** watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) $< --- 867,870 ---- watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.rc ! wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML -dDEF_wxLUA_USEBINDING_WXXRC $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** makefile.gcc 16 Jan 2008 16:46:10 -0000 1.76 --- makefile.gcc 16 Jan 2008 19:54:21 -0000 1.77 *************** *** 64,67 **** --- 64,106 ---- THREADING := multi + # Do the wxLua bindings for the wxAdv lib need to be compiled ? [0,1] + USE_WXBINDADV := 1 + + # Do the wxLua bindings for the wxAUI lib need to be compiled ? [0,1] + USE_WXBINDAUI := 1 + + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + USE_WXBINDBASE := 1 + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + USE_WXBINDCORE := 1 + + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] + USE_WXBINDGL := 1 + + # Do the wxLua bindings for the wxHTML lib need to be compiled ? [0,1] + USE_WXBINDHTML := 1 + + # Do the wxLua bindings for the wxMedia lib need to be compiled ? [0,1] + USE_WXBINDMEDIA := 1 + + # Do the wxLua bindings for the wxNet lib need to be compiled ? [0,1] + USE_WXBINDNET := 1 + + # Do the wxLua bindings for the wxRichText lib need to be compiled ? [0,1] + USE_WXBINDRICHTEXT := 0 + + # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] + USE_WXBINDSTC := 1 + + # Do the wxLua bindings for wxXML need to be compiled ? [0,1] + USE_WXBINDXML := 1 + + # Do the wxLua bindings for wxXRC need to be compiled ? [0,1] + USE_WXBINDXRC := 1 + + # Does the wxLua debug support need to be compiled ? [0,1] + USE_WXLUADEBUG := 1 + # Compile the wxLua app ? [0,1] USE_WXLUAAPP := 1 *************** *** 79,88 **** USE_WXLUAFREEZEAPP := 1 - # Do the wxLua bindings for wxSTC need to be compiled ? [0,1] - USE_WXBINDSTC := 1 - - # Does the wxLua debug support need to be compiled ? [0,1] - USE_WXLUADEBUG := 1 - --- 118,121 ---- *************** *** 98,102 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.o --- 131,141 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua_lua.o *************** *** 105,109 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.o \ --- 144,154 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac_luac.o \ *************** *** 113,117 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \ --- 158,168 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \ *************** *** 122,127 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.o \ --- 173,184 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WXSTEDIT_DIR)\include \ ! -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.o \ *************** *** 132,136 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ --- 189,199 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ *************** *** 145,149 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o \ --- 208,218 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(____app) \ $(____app_21) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o \ *************** *** 652,656 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp --- 721,725 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --define DEF_wxLUA_USEBINDING_WXADV --define DEF_wxLUA_USEBINDING_WXAUI --define DEF_wxLUA_USEBINDING_WXBASE --define DEF_wxLUA_USEBINDING_WXCORE --define DEF_wxLUA_USEBINDING_WXGL --define DEF_wxLUA_USEBINDING_WXHTML --define DEF_wxLUA_USEBINDING_WXMEDIA --define DEF_wxLUA_USEBINDING_WXNET --define DEF_wxLUA_USEBINDING_WXRICHTEXT --define DEF_wxLUA_USEBINDING_WXSTC --define DEF_wxLUA_USEBINDING_WXXML --define DEF_wxLUA_USEBINDING_WXXRC gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp *************** *** 661,665 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --include-dir $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp --- 730,734 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --define DEF_wxLUA_USEBINDING_WXADV --define DEF_wxLUA_USEBINDING_WXAUI --define DEF_wxLUA_USEBINDING_WXBASE --define DEF_wxLUA_USEBINDING_WXCORE --define DEF_wxLUA_USEBINDING_WXGL --define DEF_wxLUA_USEBINDING_WXHTML --define DEF_wxLUA_USEBINDING_WXMEDIA --define DEF_wxLUA_USEBINDING_WXNET --define DEF_wxLUA_USEBINDING_WXRICHTEXT --define DEF_wxLUA_USEBINDING_WXSTC --define DEF_wxLUA_USEBINDING_WXXML --define DEF_wxLUA_USEBINDING_WXXRC --include-dir $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp *************** *** 679,683 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o: ../../wxluacan/src/cansim.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --include-dir ../../../modules/wxbind/setup gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o: ../../wxluafreeze/src/wxluafreeze.cpp --- 748,752 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o: ../../wxluacan/src/cansim.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --define DEF_wxLUA_USEBINDING_WXADV --define DEF_wxLUA_USEBINDING_WXAUI --define DEF_wxLUA_USEBINDING_WXBASE --define DEF_wxLUA_USEBINDING_WXCORE --define DEF_wxLUA_USEBINDING_WXGL --define DEF_wxLUA_USEBINDING_WXHTML --define DEF_wxLUA_USEBINDING_WXMEDIA --define DEF_wxLUA_USEBINDING_WXNET --define DEF_wxLUA_USEBINDING_WXRICHTEXT --define DEF_wxLUA_USEBINDING_WXSTC --define DEF_wxLUA_USEBINDING_WXXML --define DEF_wxLUA_USEBINDING_WXXRC --include-dir ../../../modules/wxbind/setup gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o: ../../wxluafreeze/src/wxluafreeze.cpp *************** *** 685,689 **** gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o: ../../wxluafreeze/src/wxluafreeze.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) .PHONY: all clean --- 754,758 ---- gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o: ../../wxluafreeze/src/wxluafreeze.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_INCLUDE_DIR) --define DEF_wxLUA_USEBINDING_WXADV --define DEF_wxLUA_USEBINDING_WXAUI --define DEF_wxLUA_USEBINDING_WXBASE --define DEF_wxLUA_USEBINDING_WXCORE --define DEF_wxLUA_USEBINDING_WXGL --define DEF_wxLUA_USEBINDING_WXHTML --define DEF_wxLUA_USEBINDING_WXMEDIA --define DEF_wxLUA_USEBINDING_WXNET --define DEF_wxLUA_USEBINDING_WXRICHTEXT --define DEF_wxLUA_USEBINDING_WXSTC --define DEF_wxLUA_USEBINDING_WXXML --define DEF_wxLUA_USEBINDING_WXXRC .PHONY: all clean |
Update of /cvsroot/wxlua/wxLua/apps/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/apps/build/msvc8 Modified Files: apps_app_lua.vcproj apps_app_luac.vcproj apps_app_wxlua.vcproj apps_app_wxluacan.vcproj apps_app_wxluaedit.vcproj apps_app_wxluafreeze.vcproj Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: apps_app_luac.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_luac.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** apps_app_luac.vcproj 15 Jan 2008 18:37:26 -0000 1.3 --- apps_app_luac.vcproj 16 Jan 2008 19:54:20 -0000 1.4 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 73,77 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" /> <Tool --- 73,77 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" /> <Tool *************** *** 148,152 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 148,152 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_CONSOLE" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" /> <Tool *************** *** 240,244 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 240,244 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 258,262 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;_CONSOLE" /> <Tool --- 258,262 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" /> <Tool *************** *** 332,336 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 332,336 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 350,354 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;_CONSOLE" /> <Tool --- 350,354 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE" /> <Tool *************** *** 425,429 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 425,429 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 443,447 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" /> <Tool --- 443,447 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" /> <Tool *************** *** 519,523 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 519,523 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 537,541 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" /> <Tool --- 537,541 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" /> <Tool *************** *** 612,616 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 612,616 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 630,634 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" /> <Tool --- 630,634 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" /> <Tool *************** *** 705,709 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 705,709 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 723,727 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_CONSOLE;_DEBUG" /> <Tool --- 723,727 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_CONSOLE;_DEBUG" /> <Tool Index: apps_app_wxluacan.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxluacan.vcproj,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** apps_app_wxluacan.vcproj 16 Jan 2008 16:46:09 -0000 1.10 --- apps_app_wxluacan.vcproj 16 Jan 2008 19:54:20 -0000 1.11 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 73,77 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS" /> <Tool --- 73,77 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 148,152 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 148,152 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 241,245 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 241,245 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 259,263 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS" /> <Tool --- 259,263 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 334,338 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 334,338 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 352,356 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS" /> <Tool --- 352,356 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 426,430 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 426,430 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 444,448 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS" /> <Tool --- 444,448 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 518,522 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 518,522 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 536,540 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS" /> <Tool --- 536,540 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 610,614 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 610,614 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 628,632 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXMSW__;_WINDOWS" /> <Tool --- 628,632 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 702,706 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 702,706 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 720,724 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXMSW__;_WINDOWS" /> <Tool --- 720,724 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 795,799 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 795,799 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 813,817 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" /> <Tool --- 813,817 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool *************** *** 889,893 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 889,893 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 907,911 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" /> <Tool --- 907,911 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool *************** *** 983,987 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 983,987 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1001,1005 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" /> <Tool --- 1001,1005 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool *************** *** 1077,1081 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1077,1081 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1095,1099 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" /> <Tool --- 1095,1099 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool *************** *** 1170,1174 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1170,1174 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1188,1192 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" /> <Tool --- 1188,1192 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool *************** *** 1263,1267 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1263,1267 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1281,1285 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" /> <Tool --- 1281,1285 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="WXUSINGDLL;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool *************** *** 1356,1360 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1356,1360 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1374,1378 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" /> <Tool --- 1374,1378 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool *************** *** 1449,1453 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1449,1453 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1467,1471 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" /> <Tool --- 1467,1471 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswd;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include;..\..\..\modules\wxbind\setup" ! PreprocessorDefinitions="__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool Index: apps_app_wxlua.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxlua.vcproj,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** apps_app_wxlua.vcproj 16 Jan 2008 16:46:09 -0000 1.10 --- apps_app_wxlua.vcproj 16 Jan 2008 19:54:20 -0000 1.11 *************** *** 55,59 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 55,59 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 73,77 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS" /> <Tool --- 73,77 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 148,152 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 148,152 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 166,170 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;_WINDOWS" /> <Tool --- 166,170 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 241,245 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 241,245 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 259,263 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS" /> <Tool --- 259,263 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 334,338 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 334,338 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 352,356 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;_WINDOWS" /> <Tool --- 352,356 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 426,430 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 426,430 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 444,448 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS" /> <Tool --- 444,448 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 518,522 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 518,522 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 536,540 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;_WINDOWS" /> <Tool --- 536,540 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 610,614 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 610,614 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 628,632 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;_WINDOWS" /> <Tool --- 628,632 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 702,706 **** AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" --- 702,706 ---- AdditionalOptions="" RuntimeLibrary="2" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" BasicRuntimeChecks="0" DebugInformationFormat="0" *************** *** 720,724 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;_WINDOWS" /> <Tool --- 720,724 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\msw;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS" /> <Tool *************** *** 795,799 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 795,799 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 813,817 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" /> <Tool --- 813,817 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool *************** *** 889,893 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 889,893 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 907,911 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" /> <Tool --- 907,911 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_dll\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="WXUSINGDLL;_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool *************** *** 983,987 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 983,987 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1001,1005 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" /> <Tool --- 1001,1005 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" /> <Tool *************** *** 1077,1081 **** AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" --- 1077,1081 ---- AdditionalOptions="" RuntimeLibrary="3" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF_wxLUA_USEBINDING_WXCORE;DEF_wxLUA_USEBINDING_WXGL;DEF_wxLUA_USEBINDING_WXHTML;DEF_wxLUA_USEBINDING_WXMEDIA;DEF_wxLUA_USEBINDING_WXNET;DEF_wxLUA_USEBINDING_WXRICHTEXT;DEF_wxLUA_USEBINDING_WXSTC;DEF_wxLUA_USEBINDING_WXXML;DEF_wxLUA_USEBINDING_WXXRC;_WINDOWS;_DEBUG" BasicRuntimeChecks="3" DebugInformationFormat="3" *************** *** 1095,1099 **** Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_WINDOWS;_DEBUG" /> <Tool --- 1095,1099 ---- Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\..\modules;.\..\..\..;..\..\..\modules\lua\include" ! PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;DEF_wxLUA_USEBINDING_WXADV;DEF_wxLUA_USEBINDING_WXAUI;DEF_wxLUA_USEBINDING_WXBASE;DEF... [truncated message content] |
Update of /cvsroot/wxlua/wxLua/apps/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/apps/build/msvc6 Modified Files: apps_app_lua.dsp apps_app_luac.dsp apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: apps_app_luac.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_luac.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** apps_app_luac.dsp 15 Jan 2008 18:37:26 -0000 1.3 --- apps_app_luac.dsp 16 Jan 2008 19:54:18 -0000 1.4 *************** *** 47,54 **** # PROP Intermediate_Dir "vcmswu\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 47,54 ---- # PROP Intermediate_Dir "vcmswu\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 70,77 **** # PROP Intermediate_Dir "vcmswu\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 70,77 ---- # PROP Intermediate_Dir "vcmswu\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 93,100 **** # PROP Intermediate_Dir "vcmsw\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 93,100 ---- # PROP Intermediate_Dir "vcmsw\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 116,123 **** # PROP Intermediate_Dir "vcmsw\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 116,123 ---- # PROP Intermediate_Dir "vcmsw\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 139,146 **** # PROP Intermediate_Dir "vcmswud\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 139,146 ---- # PROP Intermediate_Dir "vcmswud\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 162,169 **** # PROP Intermediate_Dir "vcmswud\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 162,169 ---- # PROP Intermediate_Dir "vcmswud\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 185,192 **** # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 185,192 ---- # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 208,215 **** # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 208,215 ---- # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo Index: apps_app_lua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_lua.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** apps_app_lua.dsp 15 Jan 2008 18:37:26 -0000 1.6 --- apps_app_lua.dsp 16 Jan 2008 19:54:18 -0000 1.7 *************** *** 55,62 **** # PROP Intermediate_Dir "vcmswu_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 55,62 ---- # PROP Intermediate_Dir "vcmswu_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 78,85 **** # PROP Intermediate_Dir "vcmswu_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 78,85 ---- # PROP Intermediate_Dir "vcmswu_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 101,108 **** # PROP Intermediate_Dir "vcmswu\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 101,108 ---- # PROP Intermediate_Dir "vcmswu\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 124,131 **** # PROP Intermediate_Dir "vcmswu\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 124,131 ---- # PROP Intermediate_Dir "vcmswu\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 147,154 **** # PROP Intermediate_Dir "vcmsw_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 147,154 ---- # PROP Intermediate_Dir "vcmsw_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 170,177 **** # PROP Intermediate_Dir "vcmsw_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 170,177 ---- # PROP Intermediate_Dir "vcmsw_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 193,200 **** # PROP Intermediate_Dir "vcmsw\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 193,200 ---- # PROP Intermediate_Dir "vcmsw\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 216,223 **** # PROP Intermediate_Dir "vcmsw\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 216,223 ---- # PROP Intermediate_Dir "vcmsw\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "DEF_wxLUA_USEBINDING_WXADV" /D "DEF_wxLUA_USEBINDING_WXAUI" /D "DEF_wxLUA_USEBINDING_WXBASE" /D "DEF_wxLUA_USEBINDING_WXCORE" /D "DEF_wxLUA_USEBINDING_WXGL" /D "DEF_wxLUA_USEBINDING_WXHTML" /D "DEF_wxLUA_USEBINDING_WXMEDIA" /D "DEF_wxLUA_USEBINDING_WXNET" /D "DEF_wxLUA_USEBINDING_WXRICHTEXT" /D "DEF_wxLUA_USEBINDING_WXSTC" /D "DEF_wxLUA_USEBINDING_WXXML" /D "DEF_wxLUA_USEBINDING_WXXRC" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "DEF_wxLUA_USEBINDING_WXADV" /d "DEF_wxLUA_USEBINDING_WXAUI" /d "DEF_wxLUA_USEBINDING_WXBASE" /d "DEF_wxLUA_USEBINDING_WXCORE" /d "DEF_wxLUA_USEBINDING_WXGL" /d "DEF_wxLUA_USEBINDING_WXHTML" /d "DEF_wxLUA_USEBINDING_WXMEDIA" /d "DEF_wxLUA_USEBINDING_WXNET" /d "DEF_wxLUA_USEBINDING_WXRICHTEXT" /d "DEF_wxLUA_USEBINDING_WXSTC" /d "DEF_wxLUA_USEBINDING_WXXML" /d "DEF_wxLUA_USEBINDING_WXXRC" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 239,246 **** # PROP Intermediate_Dir "vcmswud_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-16 19:54:51
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/apps/build/bakefiles Modified Files: apps.bkl Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** apps.bkl 15 Jan 2008 20:19:55 -0000 1.60 --- apps.bkl 16 Jan 2008 19:54:17 -0000 1.61 *************** *** 44,51 **** <!-- apps-specific options --> ! <include file="options.bkl"/> <!-- module-specific options --> ! <include file="../../../modules/build/bakefiles/options.bkl"/> <!-- a small template which avoid repeating the same tags for all wxLua apps --> --- 44,51 ---- <!-- apps-specific options --> ! <include file="options.bkl" once="1"/> <!-- module-specific options --> ! <include file="../../../modules/build/bakefiles/options.bkl" once="1"/> <!-- a small template which avoid repeating the same tags for all wxLua apps --> |
|
From: John L. <jr...@us...> - 2008-01-16 19:54:50
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/apps Modified Files: Makefile.in Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** Makefile.in 15 Jan 2008 20:19:55 -0000 1.69 --- Makefile.in 16 Jan 2008 19:54:16 -0000 1.70 *************** *** 41,48 **** LUA_INCLUDE_DIR = @LUA_INCLUDE_DIR@ LUA_LIB_DIR = @LUA_LIB_DIR@ - WXLUA_LIBS = @WXLUA_LIBS@ - RPATH_FLAGS = @RPATH_FLAGS@ LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ ### Variables: ### --- 41,48 ---- LUA_INCLUDE_DIR = @LUA_INCLUDE_DIR@ LUA_LIB_DIR = @LUA_LIB_DIR@ LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ + WXLUA_LIBS = @WXLUA_LIBS@ + RPATH_FLAGS = @RPATH_FLAGS@ ### Variables: ### |
|
From: John L. <jr...@us...> - 2008-01-16 19:54:39
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21831/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Link together the bakefile/makefile USE_WXBINDXXX to the C macro wxLUA_USEBINDING_XXX so that if you specify that binding to not be built -DwxLUA_USEBINDING_XXX=0 so it won't be initialized in the apps and you don't get a linking error from the missing symbol. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** makefile.vc 16 Jan 2008 16:46:15 -0000 1.78 --- makefile.vc 16 Jan 2008 19:54:31 -0000 1.79 *************** *** 82,85 **** --- 82,91 ---- USE_WXBINDAUI = 1 + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + USE_WXBINDBASE = 1 + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + USE_WXBINDCORE = 1 + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] USE_WXBINDGL = 1 *************** *** 212,215 **** --- 218,227 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXLUA /GR /EHsc /Yu"wx/wxprec.h" \ /Fp"vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_dll.pch" \ *************** *** 244,247 **** --- 256,265 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDADV /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 274,277 **** --- 292,301 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDAUI /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 307,310 **** --- 331,340 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDBASE /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 357,360 **** --- 387,396 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDCORE /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 403,406 **** --- 439,448 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDGL /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 433,436 **** --- 475,484 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDHTML /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 463,466 **** --- 511,520 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDMEDIA /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 492,495 **** --- 546,555 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDNET /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 521,524 **** --- 581,590 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindrichtext.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDRICHTEXT /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 550,553 **** --- 616,625 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDSTC /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 579,582 **** --- 651,660 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDXML /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 608,611 **** --- 686,695 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXBINDXRC /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 637,640 **** --- 721,730 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXLUADEBUG /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 669,672 **** --- 759,768 ---- /Fd..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /I$(WX_DIR)\contrib\include /DWXMAKINGDLL_WXLUASOCKET /GR /EHsc \ /Yu"wx/wxprec.h" \ *************** *** 685,688 **** --- 781,790 ---- $(VAR_196) $(VAR_198) /Fd..\..\..\lib\vc_$(VAR_202)\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_INCLUDE_DIR) \ + /DDEF_wxLUA_USEBINDING_WXADV /DDEF_wxLUA_USEBINDING_WXAUI \ + /DDEF_wxLUA_USEBINDING_WXBASE /DDEF_wxLUA_USEBINDING_WXCORE \ + /DDEF_wxLUA_USEBINDING_WXGL /DDEF_wxLUA_USEBINDING_WXHTML \ + /DDEF_wxLUA_USEBINDING_WXMEDIA /DDEF_wxLUA_USEBINDING_WXNET \ + /DDEF_wxLUA_USEBINDING_WXRICHTEXT /DDEF_wxLUA_USEBINDING_WXSTC \ + /DDEF_wxLUA_USEBINDING_WXXML /DDEF_wxLUA_USEBINDING_WXXRC \ /DWXMAKINGDLL_LUAMODULE /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** makefile.bcc 16 Jan 2008 16:46:14 -0000 1.79 --- makefile.bcc 16 Jan 2008 19:54:29 -0000 1.80 *************** *** 125,128 **** --- 125,138 ---- !endif + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + !ifndef USE_WXBINDBASE + USE_WXBINDBASE = 1 + !endif + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + !ifndef USE_WXBINDCORE + USE_WXBINDCORE = 1 + !endif + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] !ifndef USE_WXBINDGL *************** *** 271,275 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 281,292 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxlua_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 299,303 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDADV \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindadv_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 316,327 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDADV \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindadv_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 324,328 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDAUI \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindaui_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 348,359 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDAUI \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindaui_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 352,356 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDBASE \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindbase_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 383,394 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDBASE \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindbase_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 397,401 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDCORE \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindcore_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 435,446 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDCORE \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindcore_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 438,442 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDGL \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindgl_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 483,494 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDGL \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindgl_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 463,467 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDHTML \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindhtml_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 515,526 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDHTML \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindhtml_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 488,492 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDMEDIA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindmedia_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 547,558 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDMEDIA \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindmedia_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 512,516 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDNET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindnet_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 578,589 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDNET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindnet_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 536,540 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include \ -DWXMAKINGDLL_WXBINDRICHTEXT \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindrichtext_dll.csm \ --- 609,619 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ -DWXMAKINGDLL_WXBINDRICHTEXT \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindrichtext_dll.csm \ *************** *** 561,565 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindstc_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 640,651 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDSTC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindstc_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 585,589 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDXML \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindxml_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 671,682 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDXML \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindxml_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 609,613 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDXRC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindxrc_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 702,713 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDXRC \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxbindxrc_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 633,637 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluadebug_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 733,744 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUADEBUG \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluadebug_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 660,664 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluasocket_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) --- 767,778 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUASOCKET \ -H=bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxprec_wxluasocket_dll.csm \ -Hu $(CPPFLAGS) $(CXXFLAGS) *************** *** 674,678 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_luamodule.obj --- 788,799 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) \ ! $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\mod_luamodule_luamodule.obj Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** makefile.wat 16 Jan 2008 16:46:15 -0000 1.78 --- makefile.wat 16 Jan 2008 19:54:32 -0000 1.79 *************** *** 82,85 **** --- 82,91 ---- USE_WXBINDAUI = 1 + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + USE_WXBINDBASE = 1 + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + USE_WXBINDCORE = 1 + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] USE_WXBINDGL = 1 *************** *** 858,862 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUA /fh $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & --- 864,874 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUA /fh $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & *************** *** 882,886 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDADV /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDADV_DLL_OBJECTS = & --- 894,904 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDADV /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDADV_DLL_OBJECTS = & *************** *** 903,907 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDAUI /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDAUI_DLL_OBJECTS = & --- 921,931 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDAUI /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDAUI_DLL_OBJECTS = & *************** *** 927,931 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDBASE /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDBASE_DLL_OBJECTS = & --- 951,961 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDBASE /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDBASE_DLL_OBJECTS = & *************** *** 968,972 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDCORE /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDCORE_DLL_OBJECTS = & --- 998,1008 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDCORE /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDCORE_DLL_OBJECTS = & *************** *** 1005,1009 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDGL /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDGL_DLL_OBJECTS = & --- 1041,1051 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDGL /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDGL_DLL_OBJECTS = & *************** *** 1026,1030 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDHTML /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDHTML_DLL_OBJECTS = & --- 1068,1078 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDHTML /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDHTML_DLL_OBJECTS = & *************** *** 1047,1051 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDMEDIA /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDMEDIA_DLL_OBJECTS = & --- 1095,1105 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDMEDIA /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDMEDIA_DLL_OBJECTS = & *************** *** 1067,1071 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDNET /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDNET_DLL_OBJECTS = & --- 1121,1131 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDNET /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDNET_DLL_OBJECTS = & *************** *** 1087,1091 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDRICHTEXT /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDRICHTEXT_DLL_OBJECTS = & --- 1147,1157 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDRICHTEXT /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDRICHTEXT_DLL_OBJECTS = & *************** *** 1107,1111 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDSTC /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = & --- 1173,1183 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDSTC /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = & *************** *** 1127,1131 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDXML /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDXML_DLL_OBJECTS = & --- 1199,1209 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDXML /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDXML_DLL_OBJECTS = & *************** *** 1147,1151 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDXRC /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDXRC_DLL_OBJECTS = & --- 1225,1235 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXBINDXRC /fh $(CPPFLAGS) $(CXXFLAGS) WXBINDXRC_DLL_OBJECTS = & *************** *** 1167,1171 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUADEBUG /fh $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = & --- 1251,1261 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUADEBUG /fh $(CPPFLAGS) $(CXXFLAGS) WXLUADEBUG_DLL_OBJECTS = & *************** *** 1190,1194 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUASOCKET /fh $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = & --- 1280,1290 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -i=$(WX_DIR)\contrib\include & -dWXMAKINGDLL_WXLUASOCKET /fh $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = & *************** *** 1203,1207 **** -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dWXMAKINGDLL_LUAMODULE $(CPPFLAGS) & $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = & --- 1299,1309 ---- -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(VAR) & $(VAR_136) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_INCLUDE_DIR) -dDEF_wxLUA_USEBINDING_WXADV & ! -dDEF_wxLUA_USEBINDING_WXAUI -dDEF_wxLUA_USEBINDING_WXBASE & ! -dDEF_wxLUA_USEBINDING_WXCORE -dDEF_wxLUA_USEBINDING_WXGL & ! -dDEF_wxLUA_USEBINDING_WXHTML -dDEF_wxLUA_USEBINDING_WXMEDIA & ! -dDEF_wxLUA_USEBINDING_WXNET -dDEF_wxLUA_USEBINDING_WXRICHTEXT & ! -dDEF_wxLUA_USEBINDING_WXSTC -dDEF_wxLUA_USEBINDING_WXXML & ! -dDEF_wxLUA_USEBINDING_WXXRC -dWXMAKINGDLL_LUAMODULE $(CPPFLAGS) & $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** makefile.gcc 16 Jan 2008 16:46:14 -0000 1.78 --- makefile.gcc 16 Jan 2008 19:54:31 -0000 1.79 *************** *** 76,79 **** --- 76,85 ---- USE_WXBINDAUI := 1 + # Do the wxLua bindings for the wxBase lib need to be compiled ? [0,1] + USE_WXBINDBASE := 1 + + # Do the wxLua bindings for the wxCore lib need to be compiled ? [0,1] + USE_WXBINDCORE := 1 + # Do the wxLua bindings for the wxGL lib need to be compiled ? [0,1] USE_WXBINDGL := 1 *************** *** 196,201 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.o \ --- 202,213 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.o \ *************** *** 219,224 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDADV \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDADV_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindadv_dll_wxadv_adv.o \ --- 231,242 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDADV $(CPPFLAGS) $(CXXFLAGS) WXBINDADV_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindadv_dll_wxadv_adv.o \ *************** *** 239,244 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDAUI \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDAUI_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_wxaui_aui.o \ --- 257,268 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDAUI $(CPPFLAGS) $(CXXFLAGS) WXBINDAUI_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_wxaui_aui.o \ *************** *** 262,267 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDBASE \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDBASE_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindbase_dll_wxbase_base.o \ --- 286,297 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDBASE $(CPPFLAGS) $(CXXFLAGS) WXBINDBASE_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindbase_dll_wxbase_base.o \ *************** *** 302,307 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDCORE \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCORE_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_appframe.o \ --- 332,343 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDCORE $(CPPFLAGS) $(CXXFLAGS) WXBINDCORE_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_wxcore_appframe.o \ *************** *** 338,343 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDGL \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDGL_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindgl_dll_wxgl_bind.o \ --- 374,385 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDGL $(CPPFLAGS) $(CXXFLAGS) WXBINDGL_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindgl_dll_wxgl_bind.o \ *************** *** 358,363 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDHTML \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDHTML_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.o \ --- 400,411 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDHTML $(CPPFLAGS) $(CXXFLAGS) WXBINDHTML_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_wxhtml_bind.o \ *************** *** 378,383 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDMEDIA \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDMEDIA_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindmedia_dll_wxmedia_bind.o \ --- 426,437 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDMEDIA $(CPPFLAGS) $(CXXFLAGS) WXBINDMEDIA_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindmedia_dll_wxmedia_bind.o \ *************** *** 397,402 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDNET \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDNET_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindnet_dll_wxnet_bind.o \ --- 451,462 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDNET $(CPPFLAGS) $(CXXFLAGS) WXBINDNET_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindnet_dll_wxnet_bind.o \ *************** *** 416,420 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include \ -DWXMAKINGDLL_WXBINDRICHTEXT $(CPPFLAGS) $(CXXFLAGS) WXBINDRICHTEXT_DLL_OBJECTS = \ --- 476,486 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ -DWXMAKINGDLL_WXBINDRICHTEXT $(CPPFLAGS) $(CXXFLAGS) WXBINDRICHTEXT_DLL_OBJECTS = \ *************** *** 435,440 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_wxstc_bind.o \ --- 501,512 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(VAR_138) $(__THREADING) -I..\..\..\modules -I.\..\..\.. \ ! -I$(LUA_INCLUDE_DIR) -DDEF_wxLUA_USEBINDING_WXADV \ ! -DDEF_wxLUA_USEBINDING_WXAUI -DDEF_wxLUA_USEBINDING_WXBASE \ ! -DDEF_wxLUA_USEBINDING_WXCORE -DDEF_wxLUA_USEBINDING_WXGL \ ! -DDEF_wxLUA_USEBINDING_WXHTML -DDEF_wxLUA_USEBINDING_WXMEDIA \ ! -DDEF_wxLUA_USEBINDING_WXNET -DDEF_wxLUA_USEBINDING_WXRICHTEXT \ ! -DDEF_wxLUA_USEBINDING_WXSTC -DDEF_wxLUA_USEBINDING_WXXML \ ! -DDEF_wxLUA_USEBINDING_WXXRC -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXBINDSTC $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_wxstc_bind.o \ *************** *** 454,459 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include $(VAR) \ $(V... [truncated message content] |
Update of /cvsroot/wxlua/wxLua/modules/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27081/wxLua/modules/build/msvc6 Modified Files: modules_mod_luamodule.dsp modules_mod_wxbindadv.dsp modules_mod_wxbindaui.dsp modules_mod_wxbindbase.dsp modules_mod_wxbindcore.dsp modules_mod_wxbindgl.dsp modules_mod_wxbindhtml.dsp modules_mod_wxbindmedia.dsp modules_mod_wxbindnet.dsp modules_mod_wxbindrichtext.dsp modules_mod_wxbindstc.dsp modules_mod_wxbindxml.dsp modules_mod_wxbindxrc.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: The wxWidgets GL library is not part of the monolithic build, treat it as a contrib. Index: modules_mod_wxbindgl.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindgl.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxbindgl.dsp 15 Jan 2008 00:08:21 -0000 1.4 --- modules_mod_wxbindgl.dsp 16 Jan 2008 16:46:12 -0000 1.5 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.pdb" ! # ADD LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.pdb" !ELSEIF "$(CFG)" == "mod_wxbindgl - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.pdb" ! # ADD LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.pdb" !ELSEIF "$(CFG)" == "mod_wxbindgl - Win32 Release Unicode DLL Multilib" *************** *** 162,167 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.pdb" ! # ADD LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.pdb" !ELSEIF "$(CFG)" == "mod_wxbindgl - Win32 Release DLL Multilib" --- 162,167 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.pdb" ! # ADD LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.pdb" !ELSEIF "$(CFG)" == "mod_wxbindgl - Win32 Release DLL Multilib" *************** *** 258,263 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.pdb" ! # ADD LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.pdb" !ELSEIF "$(CFG)" == "mod_wxbindgl - Win32 Debug Unicode DLL Multilib" --- 258,263 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.pdb" ! # ADD LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.pdb" !ELSEIF "$(CFG)" == "mod_wxbindgl - Win32 Debug Unicode DLL Multilib" *************** *** 354,359 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.pdb" ! # ADD LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.pdb" !ELSEIF "$(CFG)" == "mod_wxbindgl - Win32 Debug DLL Multilib" --- 354,359 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.pdb" ! # ADD LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.pdb" !ELSEIF "$(CFG)" == "mod_wxbindgl - Win32 Debug DLL Multilib" Index: modules_mod_wxbindxrc.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindxrc.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxbindxrc.dsp 15 Jan 2008 00:08:21 -0000 1.4 --- modules_mod_wxbindxrc.dsp 16 Jan 2008 16:46:12 -0000 1.5 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.pdb" ! # ADD LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.pdb" !ELSEIF "$(CFG)" == "mod_wxbindxrc - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.pdb" ! # ADD LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.pdb" !ELSEIF "$(CFG)" == "mod_wxbindxrc - Win32 Release Unicode DLL Multilib" *************** *** 162,167 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.pdb" ! # ADD LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.pdb" !ELSEIF "$(CFG)" == "mod_wxbindxrc - Win32 Release DLL Multilib" --- 162,167 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.pdb" ! # ADD LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.pdb" !ELSEIF "$(CFG)" == "mod_wxbindxrc - Win32 Release DLL Multilib" *************** *** 258,263 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.pdb" ! # ADD LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.pdb" !ELSEIF "$(CFG)" == "mod_wxbindxrc - Win32 Debug Unicode DLL Multilib" --- 258,263 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.pdb" ! # ADD LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.pdb" !ELSEIF "$(CFG)" == "mod_wxbindxrc - Win32 Debug Unicode DLL Multilib" *************** *** 354,359 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.pdb" ! # ADD LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.pdb" !ELSEIF "$(CFG)" == "mod_wxbindxrc - Win32 Debug DLL Multilib" --- 354,359 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.pdb" ! # ADD LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.pdb" !ELSEIF "$(CFG)" == "mod_wxbindxrc - Win32 Debug DLL Multilib" Index: modules_mod_wxbindadv.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindadv.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxbindadv.dsp 15 Jan 2008 00:08:20 -0000 1.4 --- modules_mod_wxbindadv.dsp 16 Jan 2008 16:46:11 -0000 1.5 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.pdb" ! # ADD LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.pdb" !ELSEIF "$(CFG)" == "mod_wxbindadv - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.pdb" ! # ADD LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.pdb" !ELSEIF "$(CFG)" == "mod_wxbindadv - Win32 Release Unicode DLL Multilib" *************** *** 162,167 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.pdb" ! # ADD LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.pdb" !ELSEIF "$(CFG)" == "mod_wxbindadv - Win32 Release DLL Multilib" --- 162,167 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.pdb" ! # ADD LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.pdb" !ELSEIF "$(CFG)" == "mod_wxbindadv - Win32 Release DLL Multilib" *************** *** 258,263 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.pdb" ! # ADD LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.pdb" !ELSEIF "$(CFG)" == "mod_wxbindadv - Win32 Debug Unicode DLL Multilib" --- 258,263 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.pdb" ! # ADD LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.pdb" !ELSEIF "$(CFG)" == "mod_wxbindadv - Win32 Debug Unicode DLL Multilib" *************** *** 354,359 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.pdb" ! # ADD LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.pdb" !ELSEIF "$(CFG)" == "mod_wxbindadv - Win32 Debug DLL Multilib" --- 354,359 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.pdb" ! # ADD LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.pdb" !ELSEIF "$(CFG)" == "mod_wxbindadv - Win32 Debug DLL Multilib" Index: modules_mod_wxbindbase.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindbase.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules_mod_wxbindbase.dsp 15 Jan 2008 00:08:20 -0000 1.5 --- modules_mod_wxbindbase.dsp 16 Jan 2008 16:46:12 -0000 1.6 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.pdb" ! # ADD LINK32 wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.pdb" !ELSEIF "$(CFG)" == "mod_wxbindbase - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.pdb" ! # ADD LINK32 wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.pdb" !ELSEIF "$(CFG)" == "mod_wxbindbase - Win32 Release Unicode DLL Multilib" *************** *** 162,167 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.pdb" ! # ADD LINK32 wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.pdb" !ELSEIF "$(CFG)" == "mod_wxbindbase - Win32 Release DLL Multilib" --- 162,167 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.pdb" ! # ADD LINK32 wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.pdb" !ELSEIF "$(CFG)" == "mod_wxbindbase - Win32 Release DLL Multilib" *************** *** 258,263 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.pdb" ! # ADD LINK32 wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.pdb" !ELSEIF "$(CFG)" == "mod_wxbindbase - Win32 Debug Unicode DLL Multilib" --- 258,263 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.pdb" ! # ADD LINK32 wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.pdb" !ELSEIF "$(CFG)" == "mod_wxbindbase - Win32 Debug Unicode DLL Multilib" *************** *** 354,359 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.pdb" ! # ADD LINK32 wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.pdb" !ELSEIF "$(CFG)" == "mod_wxbindbase - Win32 Debug DLL Multilib" --- 354,359 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.pdb" ! # ADD LINK32 wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.pdb" !ELSEIF "$(CFG)" == "mod_wxbindbase - Win32 Debug DLL Multilib" Index: modules_mod_wxbindnet.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxbindnet.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxbindnet.dsp 15 Jan 2008 00:08:21 -0000 1.4 --- modules_mod_wxbindnet.dsp 16 Jan 2008 16:46:12 -0000 1.5 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.pdb" ! # ADD LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.pdb" !ELSEIF "$(CFG)" == "mod_wxbindnet - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.pdb" ! # ADD LINK32 wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.pdb" !ELSEIF "$(CFG)" == "mod_wxbindnet - Win32 Release Unicode DLL Multilib" *************** *** 162,167 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.pdb" ! # ADD LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.pdb" !ELSEIF "$(CFG)" == "mod_wxbindnet - Win32 Release DLL Multilib" --- 162,167 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.pdb" ! # ADD LINK32 wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.lib" /pdb:"..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.pdb" !ELSEIF "$(CFG)" == "mod_wxbindnet - Win32 Release DLL Multilib" *************** *** 258,263 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.pdb" ! # ADD LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.pdb" !ELSEIF "$(CFG)" == "mod_wxbindnet - Win32 Debug Unicode DLL Multilib" --- 258,263 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.pdb" ! # ADD LINK32 wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.pdb" !ELSEIF "$(CFG)" == "mod_wxbindnet - Win32 Debug Unicode DLL Multilib" *************** *** 354,359 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindnet.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindnet.pdb" ! # ADD LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindnet.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindnet.pdb" !ELSEIF "$(CFG)" == "mod_wxbindnet - Win32 Debug DLL Multilib" --- 354,359 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindnet.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /implib:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindnet.lib" /debug /pdb:"..\..\..\lib\vc_dll\wxlua_msw28d_wxbindnet.pdb" ! # ADD LINK32 wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-16 16:46:46
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles/presets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27081/wxLua/build/bakefiles/presets Modified Files: wx_win32.bkl Log Message: The wxWidgets GL library is not part of the monolithic build, treat it as a contrib. Index: wx_win32.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/presets/wx_win32.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wx_win32.bkl 4 May 2007 20:22:25 -0000 1.2 --- wx_win32.bkl 16 Jan 2008 16:46:11 -0000 1.3 *************** *** 149,158 **** <define-wxlib-name>qa</define-wxlib-name> <define-wxlib-name>dbgrid</define-wxlib-name> - <define-wxlib-name>gl</define-wxlib-name> <define-wxlib-name>aui</define-wxlib-name> <define-wxlib-name>richtext</define-wxlib-name> ! ! --- 149,158 ---- <define-wxlib-name>qa</define-wxlib-name> <define-wxlib-name>dbgrid</define-wxlib-name> <define-wxlib-name>aui</define-wxlib-name> <define-wxlib-name>richtext</define-wxlib-name> ! <!-- The GL lib is not part of the monolithic build in 2.8, treat it as a contrib ! <define-wxlib-name>gl</define-wxlib-name> ! --> *************** *** 188,192 **** <if cond="value=='html'"><sys-lib>$(WXLIB_HTML_NAME)</sys-lib></if> <if cond="value=='adv'"><sys-lib>$(WXLIB_ADV_NAME)</sys-lib></if> - <if cond="value=='gl'"><sys-lib>$(WXLIB_GL_NAME)</sys-lib></if> <if cond="value=='dbgrid'"><sys-lib>$(WXLIB_DBGRID_NAME)</sys-lib></if> <if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if> --- 188,191 ---- *************** *** 194,197 **** --- 193,201 ---- <if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if> + <!-- The GL lib isn't part of the monolithic build in 2.8, treat it as a contrib --> + <if cond="value=='gl'"> + <sys-lib>wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib> + </if> + <!-- wx-lib can be used also to link against contrib libraries (which always have the same name, regardless of WX_MONOLITHIC value) --> |
|
From: John L. <jr...@us...> - 2008-01-16 16:46:46
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27081/wxLua/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: The wxWidgets GL library is not part of the monolithic build, treat it as a contrib. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** makefile.vc 15 Jan 2008 18:37:26 -0000 1.75 --- makefile.vc 16 Jan 2008 16:46:10 -0000 1.76 *************** *** 56,59 **** --- 56,62 ---- WX_DIR = $(WXWIN) + # Should wxLua use the system-wide Lua library ? [0,1] + USE_SYSTEM_LUA = 0 + # The path to the Lua library includes LUA_INCLUDE_DIR = ..\..\..\modules\lua\include *************** *** 174,177 **** --- 177,183 ---- _BUILDDIR_SHARED_SUFFIX = _dll !endif + !if "$(USE_SYSTEM_LUA)" == "0" + __app_lua___depname = ..\..\..\bin\vc_$(____app_27)\lua.exe + !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_11 = D *************** *** 180,184 **** __RUNTIME_LIBS_11 = $(__THREADING) !endif ! !if "$(SHARED)" == "0" __app_luac___depname = ..\..\..\bin\vc_$(____app_27)\luac.exe !endif --- 186,190 ---- __RUNTIME_LIBS_11 = $(__THREADING) !endif ! !if "$(SHARED)" == "0" && "$(USE_SYSTEM_LUA)" == "0" __app_luac___depname = ..\..\..\bin\vc_$(____app_27)\luac.exe !endif *************** *** 322,337 **** !endif !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib - !endif - !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "0" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib - !endif - !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" && "$(WX_MONOLITHIC)" == "0" __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)d_aui.lib !endif --- 328,331 ---- *************** *** 464,468 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\vc_$(____app_27)\lua.exe $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 458,462 ---- ### Targets: ### ! all: test_for_selected_wxbuild $(__app_lua___depname) $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 501,513 **** exit 1 ..\..\..\bin\vc_$(____app_27)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /pdb:"..\..\..\bin\vc_$(____app_27)\lua.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:CONSOLE @<< $(APP_LUA_OBJECTS) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib lua5.1.lib << make_dir_app_lua: if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) ! !if "$(SHARED)" == "0" ..\..\..\bin\vc_$(____app_27)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /pdb:"..\..\..\bin\vc_$(____app_27)\luac.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:CONSOLE @<< --- 495,509 ---- exit 1 + !if "$(USE_SYSTEM_LUA)" == "0" ..\..\..\bin\vc_$(____app_27)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /pdb:"..\..\..\bin\vc_$(____app_27)\lua.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:CONSOLE @<< $(APP_LUA_OBJECTS) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib lua5.1.lib << + !endif make_dir_app_lua: if not exist ..\..\..\bin\vc_$(____app_27) mkdir ..\..\..\bin\vc_$(____app_27) ! !if "$(SHARED)" == "0" && "$(USE_SYSTEM_LUA)" == "0" ..\..\..\bin\vc_$(____app_27)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /pdb:"..\..\..\bin\vc_$(____app_27)\luac.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:CONSOLE @<< *************** *** 522,526 **** ..\..\..\bin\vc_$(____app_27)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /pdb:"..\..\..\bin\vc_$(____app_27)\wxlua.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif --- 518,522 ---- ..\..\..\bin\vc_$(____app_27)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /pdb:"..\..\..\bin\vc_$(____app_27)\wxlua.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif *************** *** 532,536 **** ..\..\..\bin\vc_$(____app_27)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /pdb:"..\..\..\bin\vc_$(____app_27)\wxluaedit.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)$(WXLIBPATH) @<< ! $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif --- 528,532 ---- ..\..\..\bin\vc_$(____app_27)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /pdb:"..\..\..\bin\vc_$(____app_27)\wxluaedit.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)$(WXLIBPATH) @<< ! $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif *************** *** 542,546 **** ..\..\..\bin\vc_$(____app_27)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /pdb:"..\..\..\bin\vc_$(____app_27)\wxluacan.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif --- 538,542 ---- ..\..\..\bin\vc_$(____app_27)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /pdb:"..\..\..\bin\vc_$(____app_27)\wxluacan.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif *************** *** 552,556 **** ..\..\..\bin\vc_$(____app_27)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /pdb:"..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif --- 548,552 ---- ..\..\..\bin\vc_$(____app_27)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(____app_20) /pdb:"..\..\..\bin\vc_$(____app_27)\wxluafreeze.pdb" /LIBPATH:..\..\..\lib\vc_$(____app_22) /LIBPATH:$(LUA_LIB_DIR) /SUBSYSTEM:WINDOWS @<< ! $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** makefile.bcc 15 Jan 2008 18:37:26 -0000 1.75 --- makefile.bcc 16 Jan 2008 16:46:10 -0000 1.76 *************** *** 85,88 **** --- 85,93 ---- !endif + # Should wxLua use the system-wide Lua library ? [0,1] + !ifndef USE_SYSTEM_LUA + USE_SYSTEM_LUA = 0 + !endif + # The path to the Lua library includes !ifndef LUA_INCLUDE_DIR *************** *** 216,220 **** _BUILDDIR_SHARED_SUFFIX = _dll !endif ! !if "$(SHARED)" == "0" __app_luac___depname = ..\..\..\bin\bcc_$(____app_23)\luac.exe !endif --- 221,228 ---- _BUILDDIR_SHARED_SUFFIX = _dll !endif ! !if "$(USE_SYSTEM_LUA)" == "0" ! __app_lua___depname = ..\..\..\bin\bcc_$(____app_23)\lua.exe ! !endif ! !if "$(SHARED)" == "0" && "$(USE_SYSTEM_LUA)" == "0" __app_luac___depname = ..\..\..\bin\bcc_$(____app_23)\luac.exe !endif *************** *** 316,331 **** !endif !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib - !endif - !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "0" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib - !endif - !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" && "$(WX_MONOLITHIC)" == "0" __WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)d_aui.lib !endif --- 324,327 ---- *************** *** 464,468 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\bcc_$(____app_23)\lua.exe $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 460,464 ---- ### Targets: ### ! all: test_for_selected_wxbuild $(__app_lua___depname) $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 519,531 **** exit 1 ..\..\..\bin\bcc_$(____app_23)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_LIB_DIR) -ap @&&| c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, | make_dir_app_lua: if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) ! !if "$(SHARED)" == "0" ..\..\..\bin\bcc_$(____app_23)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_LIB_DIR) -ap @&&| --- 515,529 ---- exit 1 + !if "$(USE_SYSTEM_LUA)" == "0" ..\..\..\bin\bcc_$(____app_23)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_LIB_DIR) -ap @&&| c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, | + !endif make_dir_app_lua: if not exist ..\..\..\bin\bcc_$(____app_23) mkdir ..\..\..\bin\bcc_$(____app_23) ! !if "$(SHARED)" == "0" && "$(USE_SYSTEM_LUA)" == "0" ..\..\..\bin\bcc_$(____app_23)\luac.exe: make_dir_app_luac $(APP_LUAC_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_LIB_DIR) -ap @&&| *************** *** 540,544 **** ..\..\..\bin\bcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_LIB_DIR) -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)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif --- 538,542 ---- ..\..\..\bin\bcc_$(____app_23)\wxlua.exe: make_dir_app_wxlua $(APP_WXLUA_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_LIB_DIR) -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)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif *************** *** 550,554 **** ..\..\..\bin\bcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_LIB_DIR) -aa -L$(WXSTEDIT_DIR)$(WXLIBPATH) @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif --- 548,552 ---- ..\..\..\bin\bcc_$(____app_23)\wxluaedit.exe: make_dir_app_wxluaedit $(APP_WXLUAEDIT_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_LIB_DIR) -aa -L$(WXSTEDIT_DIR)$(WXLIBPATH) @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif *************** *** 560,564 **** ..\..\..\bin\bcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_LIB_DIR) -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif --- 558,562 ---- ..\..\..\bin\bcc_$(____app_23)\wxluacan.exe: make_dir_app_wxluacan $(APP_WXLUACAN_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_LIB_DIR) -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif *************** *** 570,574 **** ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_LIB_DIR) -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif --- 568,572 ---- ..\..\..\bin\bcc_$(____app_23)\wxluafreeze.exe: make_dir_app_wxluafreeze $(APP_WXLUAFREEZE_OBJECTS) bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(____app_21) -L..\..\..\lib\bcc_$(____app_17) -L$(LUA_LIB_DIR) -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_6).lib,, bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** makefile.wat 15 Jan 2008 18:37:27 -0000 1.76 --- makefile.wat 16 Jan 2008 16:46:11 -0000 1.77 *************** *** 56,59 **** --- 56,62 ---- WX_DIR = $(%WXWIN) + # Should wxLua use the system-wide Lua library ? [0,1] + USE_SYSTEM_LUA = 0 + # The path to the Lua library includes LUA_INCLUDE_DIR = ..\..\..\modules\lua\include *************** *** 128,135 **** --- 131,144 ---- _BUILDDIR_SHARED_SUFFIX = _dll !endif + __app_lua___depname = + !ifeq USE_SYSTEM_LUA 0 + __app_lua___depname = ..\..\..\bin\wat_$(____app_23)\lua.exe + !endif __app_luac___depname = !ifeq SHARED 0 + !ifeq USE_SYSTEM_LUA 0 __app_luac___depname = ..\..\..\bin\wat_$(____app_23)\luac.exe !endif + !endif __app_wxlua___depname = !ifeq USE_WXBINDSTC 1 *************** *** 254,286 **** !endif !endif - __WXLIB_GL_NAME_p = - !ifeq BUILD debug - !ifeq UNICODE 0 - !ifeq WX_MONOLITHIC 0 - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib - !endif - !endif - !endif - !ifeq BUILD debug - !ifeq UNICODE 1 - !ifeq WX_MONOLITHIC 0 - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib - !endif - !endif - !endif - !ifeq BUILD release - !ifeq UNICODE 0 - !ifeq WX_MONOLITHIC 0 - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib - !endif - !endif - !endif - !ifeq BUILD release - !ifeq UNICODE 1 - !ifeq WX_MONOLITHIC 0 - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib - !endif - !endif - !endif __WXLIB_AUI_NAME_p = !ifeq BUILD debug --- 263,266 ---- *************** *** 632,636 **** ### Targets: ### ! all : .SYMBOLIC test_for_selected_wxbuild ..\..\..\bin\wat_$(____app_23)\lua.exe $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC --- 612,616 ---- ### Targets: ### ! all : .SYMBOLIC test_for_selected_wxbuild $(__app_lua___depname) $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean : .SYMBOLIC *************** *** 659,662 **** --- 639,643 ---- exit 1 + !ifeq USE_SYSTEM_LUA 0 ..\..\..\bin\wat_$(____app_23)\lua.exe : make_dir_app_lua $(APP_LUA_OBJECTS) @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua.lbc *************** *** 670,673 **** --- 651,655 ---- @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua.lbc option stack=%i wlink @watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_lua.lbc + !endif make_dir_app_lua : *************** *** 675,678 **** --- 657,661 ---- !ifeq SHARED 0 + !ifeq USE_SYSTEM_LUA 0 ..\..\..\bin\wat_$(____app_23)\luac.exe : make_dir_app_luac $(APP_LUAC_OBJECTS) @%create watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc *************** *** 687,690 **** --- 670,674 ---- wlink @watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_luac.lbc !endif + !endif make_dir_app_luac : *************** *** 701,705 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_LIB_DIR) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option stack=%i --- 685,689 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_LIB_DIR) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua.lbc option stack=%i *************** *** 721,725 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_LIB_DIR) system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)$(WXLIBPATH) @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option stack=%i --- 705,709 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_LIB_DIR) system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)$(WXLIBPATH) @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib wxcode_msw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluaedit.lbc option stack=%i *************** *** 739,743 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_LIB_DIR) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option stack=%i --- 723,727 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_LIB_DIR) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan.lbc option stack=%i *************** *** 756,760 **** @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_LIB_DIR) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAFREEZE_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option stack=%i --- 740,744 ---- @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc $(LDFLAGS) libpath $(WX_DIR)$(WXLIBPATH) $(____app_17) libpath ..\..\..\lib\wat_$(____app_18) libpath $(LUA_LIB_DIR) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAFREEZE_OBJECTS)) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc library %i @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option resource=watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res @for %i in () do @%append watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluafreeze.lbc option stack=%i Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** makefile.gcc 15 Jan 2008 18:37:26 -0000 1.75 --- makefile.gcc 16 Jan 2008 16:46:10 -0000 1.76 *************** *** 50,53 **** --- 50,56 ---- WX_DIR := $(WXWIN) + # Should wxLua use the system-wide Lua library ? [0,1] + USE_SYSTEM_LUA := 0 + # The path to the Lua library includes LUA_INCLUDE_DIR := ..\..\..\modules\lua\include *************** *** 158,164 **** --- 161,172 ---- _BUILDDIR_SHARED_SUFFIX = _dll endif + ifeq ($(USE_SYSTEM_LUA),0) + __app_lua___depname = ..\..\..\bin\gcc_$(____app_23)\lua.exe + endif ifeq ($(SHARED),0) + ifeq ($(USE_SYSTEM_LUA),0) __app_luac___depname = ..\..\..\bin\gcc_$(____app_23)\luac.exe endif + endif ifeq ($(USE_WXBINDSTC),1) ifeq ($(USE_WXLUAAPP),1) *************** *** 289,320 **** ifeq ($(UNICODE),0) ifeq ($(WX_MONOLITHIC),0) - __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)d_gl - endif - endif - endif - ifeq ($(BUILD),debug) - ifeq ($(UNICODE),1) - ifeq ($(WX_MONOLITHIC),0) - __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)ud_gl - endif - endif - endif - ifeq ($(BUILD),release) - ifeq ($(UNICODE),0) - ifeq ($(WX_MONOLITHIC),0) - __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)_gl - endif - endif - endif - ifeq ($(BUILD),release) - ifeq ($(UNICODE),1) - ifeq ($(WX_MONOLITHIC),0) - __WXLIB_GL_NAME_p = -lwxmsw$(WX_VERSION)u_gl - endif - endif - endif - ifeq ($(BUILD),debug) - ifeq ($(UNICODE),0) - ifeq ($(WX_MONOLITHIC),0) __WXLIB_AUI_NAME_p = -lwxmsw$(WX_VERSION)d_aui endif --- 297,300 ---- *************** *** 576,580 **** ### Targets: ### ! all: test_for_selected_wxbuild ..\..\..\bin\gcc_$(____app_23)\lua.exe $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: --- 556,560 ---- ### Targets: ### ! all: test_for_selected_wxbuild $(__app_lua___depname) $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) clean: *************** *** 600,605 **** --- 580,587 ---- exit 1 + ifeq ($(USE_SYSTEM_LUA),0) ..\..\..\bin\gcc_$(____app_23)\lua.exe: make_dir_app_lua $(APP_LUA_OBJECTS) $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____app_21) $(__THREADING) -L..\..\..\lib\gcc_$(____app_17) -L$(LUA_LIB_DIR) -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 -l... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-16 16:46:44
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27081/wxLua/apps/build/msvc8 Modified Files: apps_app_wxlua.vcproj apps_app_wxluacan.vcproj apps_app_wxluaedit.vcproj apps_app_wxluafreeze.vcproj Log Message: The wxWidgets GL library is not part of the monolithic build, treat it as a contrib. Index: apps_app_wxluafreeze.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxluafreeze.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** apps_app_wxluafreeze.vcproj 15 Jan 2008 00:08:17 -0000 1.9 --- apps_app_wxluafreeze.vcproj 16 Jan 2008 16:46:10 -0000 1.10 *************** *** 80,84 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" --- 80,84 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" *************** *** 266,270 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" --- 266,270 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" *************** *** 451,455 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" --- 451,455 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" *************** *** 635,639 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" --- 635,639 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" *************** *** 820,824 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" --- 820,824 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" *************** *** 1008,1012 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" --- 1008,1012 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" *************** *** 1195,1199 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" --- 1195,1199 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluafreeze.exe" *************** *** 1381,1385 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" --- 1381,1385 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluafreeze.exe" Index: apps_app_wxlua.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxlua.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** apps_app_wxlua.vcproj 15 Jan 2008 00:08:17 -0000 1.9 --- apps_app_wxlua.vcproj 16 Jan 2008 16:46:09 -0000 1.10 *************** *** 80,84 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" --- 80,84 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" *************** *** 266,270 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" --- 266,270 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" *************** *** 451,455 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" --- 451,455 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" *************** *** 635,639 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" --- 635,639 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" *************** *** 820,824 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" --- 820,824 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" *************** *** 1008,1012 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" --- 1008,1012 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" *************** *** 1195,1199 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" --- 1195,1199 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxlua.exe" *************** *** 1381,1385 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" --- 1381,1385 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxlua.exe" Index: apps_app_wxluacan.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxluacan.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** apps_app_wxluacan.vcproj 15 Jan 2008 00:08:17 -0000 1.9 --- apps_app_wxluacan.vcproj 16 Jan 2008 16:46:09 -0000 1.10 *************** *** 80,84 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluacan.exe" --- 80,84 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluacan.exe" *************** *** 266,270 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluacan.exe" --- 266,270 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluacan.exe" *************** *** 451,455 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluacan.exe" --- 451,455 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluacan.exe" *************** *** 635,639 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluacan.exe" --- 635,639 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluacan.exe" *************** *** 820,824 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluacan.exe" --- 820,824 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluacan.exe" *************** *** 1008,1012 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluacan.exe" --- 1008,1012 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluacan.exe" *************** *** 1195,1199 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluacan.exe" --- 1195,1199 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluacan.exe" *************** *** 1381,1385 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluacan.exe" --- 1381,1385 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluacan.exe" Index: apps_app_wxluaedit.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc8/apps_app_wxluaedit.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** apps_app_wxluaedit.vcproj 15 Jan 2008 00:08:17 -0000 1.9 --- apps_app_wxluaedit.vcproj 16 Jan 2008 16:46:10 -0000 1.10 *************** *** 80,84 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluaedit.exe" --- 80,84 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluaedit.exe" *************** *** 266,270 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluaedit.exe" --- 266,270 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluaedit.exe" *************** *** 451,455 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluaedit.exe" --- 451,455 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluaedit.exe" *************** *** 635,639 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluaedit.exe" --- 635,639 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluaedit.exe" *************** *** 820,824 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluaedit.exe" --- 820,824 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluaedit.exe" *************** *** 1008,1012 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluaedit.exe" --- 1008,1012 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluaedit.exe" *************** *** 1195,1199 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluaedit.exe" --- 1195,1199 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_dll\wxluaedit.exe" *************** *** 1381,1385 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluaedit.exe" --- 1381,1385 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\bin\vc_lib\wxluaedit.exe" |
|
From: John L. <jr...@us...> - 2008-01-16 16:46:44
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27081/wxLua/apps/build/msvc6 Modified Files: apps_app_wxlua.dsp apps_app_wxluacan.dsp apps_app_wxluaedit.dsp apps_app_wxluafreeze.dsp Log Message: The wxWidgets GL library is not part of the monolithic build, treat it as a contrib. Index: apps_app_wxluaedit.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluaedit.dsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** apps_app_wxluaedit.dsp 15 Jan 2008 00:08:16 -0000 1.9 --- apps_app_wxluaedit.dsp 16 Jan 2008 16:46:08 -0000 1.10 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode DLL Multilib" *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxcode_msw28u_stedit.lib wxmsw28u_stc.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Unicode Multilib" *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release DLL Multilib" *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxcode_msw28_stedit.lib wxmsw28_stc.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release Multilib" *************** *** 266,271 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Multilib" --- 266,271 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode DLL Multilib" *************** *** 316,321 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Multilib" --- 316,321 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxcode_msw28ud_stedit.lib wxmsw28ud_stc.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Unicode Multilib" *************** *** 366,371 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug DLL Multilib" --- 366,371 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_dll" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug DLL Multilib" *************** *** 416,421 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Multilib" --- 416,421 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxcode_msw28d_stedit.lib wxmsw28d_stc.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluaedit.pdb" /libpath:"$(WXSTEDIT)\lib\vc_lib" !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug Multilib" Index: apps_app_wxluacan.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_wxluacan.dsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** apps_app_wxluacan.dsp 15 Jan 2008 00:08:16 -0000 1.9 --- apps_app_wxluacan.dsp 16 Jan 2008 16:46:08 -0000 1.10 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode DLL Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode DLL Multilib" *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Unicode Multilib" *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release DLL Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release DLL Multilib" *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Release Multilib" *************** *** 266,271 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug Unicode DLL Multilib" --- 266,271 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug Unicode DLL Multilib" *************** *** 316,321 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug Unicode Multilib" --- 316,321 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_lib\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_lib\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug Unicode Multilib" *************** *** 366,371 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug DLL Multilib" --- 366,371 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" ! # ADD LINK32 wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\vc_dll\wxluacan.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /libpath:"..\..\..\modules\lua\lib" /subsystem:windows /debug /pdb:"..\..\..\bin\vc_dll\wxluacan.pdb" !ELSEIF "$(CFG)" == "app_wxluacan - Win32 Debug DLL Multilib" *************** *** 416,421 **** # ADD BSC32 /nologo L... [truncated message content] |
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27081/wxLua/modules/build/msvc8 Modified Files: modules_mod_luamodule.vcproj modules_mod_wxbindadv.vcproj modules_mod_wxbindaui.vcproj modules_mod_wxbindbase.vcproj modules_mod_wxbindcore.vcproj modules_mod_wxbindgl.vcproj modules_mod_wxbindhtml.vcproj modules_mod_wxbindmedia.vcproj modules_mod_wxbindnet.vcproj modules_mod_wxbindrichtext.vcproj modules_mod_wxbindstc.vcproj modules_mod_wxbindxml.vcproj modules_mod_wxbindxrc.vcproj modules_mod_wxlua.vcproj modules_mod_wxluadebug.vcproj modules_mod_wxluasocket.vcproj Log Message: The wxWidgets GL library is not part of the monolithic build, treat it as a contrib. Index: modules_mod_wxbindgl.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindgl.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxbindgl.vcproj 15 Jan 2008 00:08:23 -0000 1.4 --- modules_mod_wxbindgl.vcproj 16 Jan 2008 16:46:13 -0000 1.5 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindgl.dll" *************** *** 426,430 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.dll" --- 426,430 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindgl.dll" *************** *** 767,771 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.dll" --- 767,771 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindgl.dll" *************** *** 1112,1116 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.dll" --- 1112,1116 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindgl.dll" Index: modules_mod_wxbindnet.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindnet.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxbindnet.vcproj 15 Jan 2008 00:08:24 -0000 1.4 --- modules_mod_wxbindnet.vcproj 16 Jan 2008 16:46:13 -0000 1.5 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindnet.dll" *************** *** 426,430 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.dll" --- 426,430 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindnet.dll" *************** *** 767,771 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.dll" --- 767,771 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindnet.dll" *************** *** 1112,1116 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindnet.dll" --- 1112,1116 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindnet.dll" Index: modules_mod_wxluadebug.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxluadebug.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** modules_mod_wxluadebug.vcproj 15 Jan 2008 00:08:24 -0000 1.7 --- modules_mod_wxluadebug.vcproj 16 Jan 2008 16:46:14 -0000 1.8 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluadebug.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluadebug.dll" *************** *** 426,430 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluadebug.dll" --- 426,430 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluadebug.dll" *************** *** 767,771 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluadebug.dll" --- 767,771 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluadebug.dll" *************** *** 1112,1116 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluadebug.dll" --- 1112,1116 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluadebug.dll" Index: modules_mod_wxbindrichtext.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindrichtext.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxbindrichtext.vcproj 15 Jan 2008 00:08:24 -0000 1.4 --- modules_mod_wxbindrichtext.vcproj 16 Jan 2008 16:46:13 -0000 1.5 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindrichtext.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindrichtext.dll" *************** *** 426,430 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindrichtext.dll" --- 426,430 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindrichtext.dll" *************** *** 767,771 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindrichtext.dll" --- 767,771 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindrichtext.dll" *************** *** 1112,1116 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindrichtext.dll" --- 1112,1116 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindrichtext.dll" Index: modules_mod_wxlua.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxlua.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** modules_mod_wxlua.vcproj 15 Jan 2008 00:08:24 -0000 1.7 --- modules_mod_wxlua.vcproj 16 Jan 2008 16:46:14 -0000 1.8 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxlua.dll" *************** *** 426,430 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" --- 426,430 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxlua.dll" *************** *** 767,771 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" --- 767,771 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxlua.dll" *************** *** 1112,1116 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" --- 1112,1116 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxlua.dll" Index: modules_mod_wxbindcore.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindcore.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules_mod_wxbindcore.vcproj 15 Jan 2008 00:08:23 -0000 1.5 --- modules_mod_wxbindcore.vcproj 16 Jan 2008 16:46:13 -0000 1.6 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindcore.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindcore.dll" *************** *** 426,430 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindcore.dll" --- 426,430 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindcore.dll" *************** *** 767,771 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindcore.dll" --- 767,771 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindcore.dll" *************** *** 1112,1116 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindcore.dll" --- 1112,1116 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindcore.dll" Index: modules_mod_wxbindxrc.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindxrc.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxbindxrc.vcproj 15 Jan 2008 00:08:24 -0000 1.4 --- modules_mod_wxbindxrc.vcproj 16 Jan 2008 16:46:13 -0000 1.5 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxrc.dll" *************** *** 426,430 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.dll" --- 426,430 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindxrc.dll" *************** *** 767,771 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.dll" --- 767,771 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindxrc.dll" *************** *** 1112,1116 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.dll" --- 1112,1116 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindxrc.dll" Index: modules_mod_wxbindmedia.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindmedia.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxbindmedia.vcproj 15 Jan 2008 00:08:23 -0000 1.4 --- modules_mod_wxbindmedia.vcproj 16 Jan 2008 16:46:13 -0000 1.5 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindmedia.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindmedia.dll" *************** *** 426,430 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindmedia.dll" --- 426,430 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindmedia.dll" *************** *** 767,771 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindmedia.dll" --- 767,771 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindmedia.dll" *************** *** 1112,1116 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindmedia.dll" --- 1112,1116 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindmedia.dll" Index: modules_mod_wxluasocket.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxluasocket.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** modules_mod_wxluasocket.vcproj 15 Jan 2008 00:08:24 -0000 1.7 --- modules_mod_wxluasocket.vcproj 16 Jan 2008 16:46:14 -0000 1.8 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxluasocket.dll" *************** *** 426,430 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.dll" --- 426,430 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxluadebug.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxluasocket.dll" *************** *** 767,771 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.dll" --- 767,771 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxluasocket.dll" *************** *** 1112,1116 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.dll" --- 1112,1116 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxluasocket.dll" Index: modules_mod_luamodule.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_luamodule.vcproj,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** modules_mod_luamodule.vcproj 15 Jan 2008 00:08:22 -0000 1.7 --- modules_mod_luamodule.vcproj 16 Jan 2008 16:46:12 -0000 1.8 *************** *** 80,84 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" --- 80,84 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindstc.lib wxlua_msw28u_wxbindaui.lib wxlua_msw28u_wxbindxrc.lib wxlua_msw28u_wxbindnet.lib wxlua_msw28u_wxbindmedia.lib wxlua_msw28u_wxbindhtml.lib wxlua_msw28u_wxbindgl.lib wxlua_msw28u_wxbindadv.lib wxlua_msw28u_wxbindxml.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxluasocket.lib wxlua_msw28u_wxluadebug.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u_gl.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" *************** *** 251,255 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" --- 251,255 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindstc.lib wxlua_msw28_wxbindaui.lib wxlua_msw28_wxbindxrc.lib wxlua_msw28_wxbindnet.lib wxlua_msw28_wxbindmedia.lib wxlua_msw28_wxbindhtml.lib wxlua_msw28_wxbindgl.lib wxlua_msw28_wxbindadv.lib wxlua_msw28_wxbindxml.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxbindbase.lib wxlua_msw28_wxluasocket.lib wxlua_msw28_wxluadebug.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28_gl.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" *************** *** 422,426 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" --- 422,426 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindstc.lib wxlua_msw28ud_wxbindaui.lib wxlua_msw28ud_wxbindxrc.lib wxlua_msw28ud_wxbindnet.lib wxlua_msw28ud_wxbindmedia.lib wxlua_msw28ud_wxbindhtml.lib wxlua_msw28ud_wxbindgl.lib wxlua_msw28ud_wxbindadv.lib wxlua_msw28ud_wxbindxml.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxluasocket.lib wxlua_msw28ud_wxluadebug.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud_gl.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" *************** *** 595,599 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" --- 595,599 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindstc.lib wxlua_msw28d_wxbindaui.lib wxlua_msw28d_wxbindxrc.lib wxlua_msw28d_wxbindnet.lib wxlua_msw28d_wxbindmedia.lib wxlua_msw28d_wxbindhtml.lib wxlua_msw28d_wxbindgl.lib wxlua_msw28d_wxbindadv.lib wxlua_msw28d_wxbindxml.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxluasocket.lib wxlua_msw28d_wxluadebug.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d_gl.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wx.dll" Index: modules_mod_wxbindbase.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindbase.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** modules_mod_wxbindbase.vcproj 15 Jan 2008 00:08:23 -0000 1.5 --- modules_mod_wxbindbase.vcproj 16 Jan 2008 16:46:13 -0000 1.6 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindbase.dll" *************** *** 426,430 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.dll" --- 426,430 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindbase.dll" *************** *** 767,771 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.dll" --- 767,771 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindbase.dll" *************** *** 1112,1116 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.dll" --- 1112,1116 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindbase.dll" Index: modules_mod_wxbindadv.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindadv.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxbindadv.vcproj 15 Jan 2008 00:08:22 -0000 1.4 --- modules_mod_wxbindadv.vcproj 16 Jan 2008 16:46:12 -0000 1.5 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxbindcore.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindadv.dll" *************** *** 426,430 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.dll" --- 426,430 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28_wxbindbase.lib wxlua_msw28_wxbindcore.lib wxlua_msw28_wxlua.lib lua5.1.lib wxmsw28.lib wxmsw28_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28_wxbindadv.dll" *************** *** 767,771 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.dll" --- 767,771 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28ud_wxbindbase.lib wxlua_msw28ud_wxbindcore.lib wxlua_msw28ud_wxlua.lib lua5.1.lib wxmsw28ud.lib wxmsw28ud_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28ud_wxbindadv.dll" *************** *** 1112,1116 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.dll" --- 1112,1116 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28d_wxbindbase.lib wxlua_msw28d_wxbindcore.lib wxlua_msw28d_wxlua.lib lua5.1.lib wxmsw28d.lib wxmsw28d_gl.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28d_wxbindadv.dll" Index: modules_mod_wxbindxml.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxbindxml.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** modules_mod_wxbindxml.vcproj 15 Jan 2008 00:08:24 -0000 1.4 --- modules_mod_wxbindxml.vcproj 16 Jan 2008 16:46:13 -0000 1.5 *************** *** 83,87 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxml.dll" --- 83,87 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="wxlua_msw28u_wxbindbase.lib wxlua_msw28u_wxlua.lib lua5.1.lib wxmsw28u.lib wxmsw28u_gl.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib" AdditionalOptions="" OutputFile="..\..\..\lib\vc_dll\wxlua_msw28u_wxbindxml.dll" *************** *** 426,430 **** <Tool Name="VCLinkerTool" ! Addit... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-16 16:46:22
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27081/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: The wxWidgets GL library is not part of the monolithic build, treat it as a contrib. Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** makefile.vc 15 Jan 2008 18:37:28 -0000 1.77 --- makefile.vc 16 Jan 2008 16:46:15 -0000 1.78 *************** *** 1163,1178 **** !endif !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib - !endif - !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "0" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib - !endif - !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" && "$(WX_MONOLITHIC)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif --- 1163,1166 ---- *************** *** 1385,1389 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.obj make_dir_wxlua_dll $(WXLUA_DLL_OBJECTS) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXLUA_DLL_OBJECTS) lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib << !endif --- 1373,1377 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.obj make_dir_wxlua_dll $(WXLUA_DLL_OBJECTS) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXLUA_DLL_OBJECTS) lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib << !endif *************** *** 1406,1410 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindadv_dll_dummy.obj make_dir_wxbindadv_dll $(WXBINDADV_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDADV_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib << !endif --- 1394,1398 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindadv_dll_dummy.obj make_dir_wxbindadv_dll $(WXBINDADV_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDADV_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib << !endif *************** *** 1427,1431 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_dummy.obj make_dir_wxbindaui_dll $(WXBINDAUI_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDAUI_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) $(__WXLIB_AUI_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib << !endif --- 1415,1419 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_dummy.obj make_dir_wxbindaui_dll $(WXBINDAUI_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDAUI_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) $(__WXLIB_AUI_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib << !endif *************** *** 1448,1452 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindbase_dll_dummy.obj make_dir_wxbindbase_dll $(WXBINDBASE_DLL_OBJECTS) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDBASE_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib << !endif --- 1436,1440 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindbase_dll_dummy.obj make_dir_wxbindbase_dll $(WXBINDBASE_DLL_OBJECTS) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDBASE_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib << !endif *************** *** 1469,1473 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj make_dir_wxbindcore_dll $(WXBINDCORE_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDCORE_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib << !endif --- 1457,1461 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj make_dir_wxbindcore_dll $(WXBINDCORE_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDCORE_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib << !endif *************** *** 1490,1494 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindgl_dll_dummy.obj make_dir_wxbindgl_dll $(WXBINDGL_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDGL_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib << !endif --- 1478,1482 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindgl_dll_dummy.obj make_dir_wxbindgl_dll $(WXBINDGL_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDGL_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib << !endif *************** *** 1511,1515 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj make_dir_wxbindhtml_dll $(WXBINDHTML_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDHTML_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib << !endif --- 1499,1503 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindhtml_dll_dummy.obj make_dir_wxbindhtml_dll $(WXBINDHTML_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDHTML_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib << !endif *************** *** 1532,1536 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindmedia_dll_dummy.obj make_dir_wxbindmedia_dll $(WXBINDMEDIA_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxbindnet_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDMEDIA_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib << !endif --- 1520,1524 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindmedia_dll_dummy.obj make_dir_wxbindmedia_dll $(WXBINDMEDIA_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxbindnet_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDMEDIA_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib << !endif *************** *** 1553,1557 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindnet_dll_dummy.obj make_dir_wxbindnet_dll $(WXBINDNET_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDNET_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib << !endif --- 1541,1545 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindnet_dll_dummy.obj make_dir_wxbindnet_dll $(WXBINDNET_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDNET_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib << !endif *************** *** 1574,1578 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindrichtext.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindrichtext_dll_dummy.obj make_dir_wxbindrichtext_dll $(WXBINDRICHTEXT_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindrichtext.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDRICHTEXT_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) $(__WXLIB_RICHTEXT_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindrichtext.lib << !endif --- 1562,1566 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindrichtext.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindrichtext_dll_dummy.obj make_dir_wxbindrichtext_dll $(WXBINDRICHTEXT_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindrichtext.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDRICHTEXT_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) $(__WXLIB_RICHTEXT_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindrichtext.lib << !endif *************** *** 1595,1599 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_dummy.obj make_dir_wxbindstc_dll $(WXBINDSTC_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDSTC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib << !endif --- 1583,1587 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_dummy.obj make_dir_wxbindstc_dll $(WXBINDSTC_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDSTC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib << !endif *************** *** 1616,1620 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindxml_dll_dummy.obj make_dir_wxbindxml_dll $(WXBINDXML_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDXML_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib << !endif --- 1604,1608 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindxml_dll_dummy.obj make_dir_wxbindxml_dll $(WXBINDXML_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDXML_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib << !endif *************** *** 1637,1641 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindxrc_dll_dummy.obj make_dir_wxbindxrc_dll $(WXBINDXRC_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDXRC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib << !endif --- 1625,1629 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindxrc_dll_dummy.obj make_dir_wxbindxrc_dll $(WXBINDXRC_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXBINDXRC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib << !endif *************** *** 1658,1662 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_dummy.obj make_dir_wxluadebug_dll $(WXLUADEBUG_DLL_OBJECTS) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXLUADEBUG_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib << !endif --- 1646,1650 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_dummy.obj make_dir_wxluadebug_dll $(WXLUADEBUG_DLL_OBJECTS) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXLUADEBUG_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib << !endif *************** *** 1679,1683 **** ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj make_dir_wxluasocket_dll $(WXLUASOCKET_DLL_OBJECTS) $(__wxluadebug_dll___depname) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXLUASOCKET_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib << !endif --- 1667,1671 ---- ..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj make_dir_wxluasocket_dll $(WXLUASOCKET_DLL_OBJECTS) $(__wxluadebug_dll___depname) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_202) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(WXLUASOCKET_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_$(VAR_195)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib << !endif *************** *** 1689,1693 **** ..\..\..\lib\vc_$(VAR_202)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_202)\wx.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_195) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif --- 1677,1681 ---- ..\..\..\lib\vc_$(VAR_202)\wx.dll: make_dir_mod_luamodule $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(WXLIBPATH) $(VAR_197) /pdb:"..\..\..\lib\vc_$(VAR_202)\wx.pdb" /LIBPATH:..\..\..\lib\vc_$(VAR_195) /LIBPATH:$(LUA_LIB_DIR) @<< ! $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxrc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindnet.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindmedia.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindhtml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindgl.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindxml.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_AUI_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** makefile.bcc 15 Jan 2008 18:37:28 -0000 1.78 --- makefile.bcc 16 Jan 2008 16:46:14 -0000 1.79 *************** *** 960,975 **** !endif !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)d_gl.lib - !endif - !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)ud_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "0" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)_gl.lib - !endif - !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" && "$(WX_MONOLITHIC)" == "0" - __WXLIB_GL_NAME_p = wxmsw$(WX_VERSION)u_gl.lib - !endif - !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" && "$(WX_MONOLITHIC)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib !endif --- 960,963 ---- *************** *** 1240,1244 **** ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.obj make_dir_wxlua_dll $(WXLUA_DLL_OBJECTS) $(__lua_dll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_16)$(__RUNTIME_LIBS_15).lib,, | implib -f ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ --- 1228,1232 ---- ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.obj make_dir_wxlua_dll $(WXLUA_DLL_OBJECTS) $(__lua_dll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_16)$(__RUNTIME_LIBS_15).lib,, | implib -f ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ *************** *** 1262,1266 **** ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindadv_dll_dummy.obj make_dir_wxbindadv_dll $(WXBINDADV_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| ! c0d32.obj $(WXBINDADV_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_16)$(__RUNTIME_LIBS_15).lib,, | implib -f ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv $@ --- 1250,1254 ---- ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindadv_dll_dummy.obj make_dir_wxbindadv_dll $(WXBINDADV_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| ! c0d32.obj $(WXBINDADV_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_16)$(__RUNTIME_LIBS_15).lib,, | implib -f ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindadv $@ *************** *** 1284,1288 **** ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_dummy.obj make_dir_wxbindaui_dll $(WXBINDAUI_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| ! c0d32.obj $(WXBINDAUI_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) $(__WXLIB_AUI_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_16)$(__RUNTIME_LIBS_15).lib,, | implib -f ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui $@ --- 1272,1276 ---- ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindaui_dll_dummy.obj make_dir_wxbindaui_dll $(WXBINDAUI_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxbindcore_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| ! c0d32.obj $(WXBINDAUI_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) $(__WXLIB_AUI_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_16)$(__RUNTIME_LIBS_15).lib,, | implib -f ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindaui $@ *************** *** 1306,1310 **** ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindbase_dll_dummy.obj make_dir_wxbindbase_dll $(WXBINDBASE_DLL_OBJECTS) $(__wxlua_dll___depname) $(__lua_dll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| ! c0d32.obj $(WXBINDBASE_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_16)$(__RUNTIME_LIBS_15).lib,, | implib -f ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase $@ --- 1294,1298 ---- ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindbase_dll_dummy.obj make_dir_wxbindbase_dll $(WXBINDBASE_DLL_OBJECTS) $(__wxlua_dll___depname) $(__lua_dll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| ! c0d32.obj $(WXBINDBASE_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_gl.lib $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_16)$(__RUNTIME_LIBS_15).lib,, | implib -f ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase $@ *************** *** 1328,1332 **** ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj make_dir_wxbindcore_dll $(WXBINDCORE_DLL_OBJECTS) $(__wxbindbase_dll___depname) $(__wxlua_dll___depname) $(__lua_dll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(WXLIBPATH) $(VAR_138) -L..\..\..\lib\bcc_$(VAR_140) -L$(LUA_LIB_DIR) @&&| ! c0d32.obj $(WXBINDCORE_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindbase.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_GL_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_16)$(__RUNTIME_LIBS_15).lib,, | implib -f ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore $@ --- 1316,1320 ---- ..\..\..\lib\bcc_$(VAR_134)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcore.dll: bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindcore_dll_dummy.obj make_dir_wxbindcore_dll $(WXBINDCORE_DLL_OBJECTS) $(... [truncated message content] |
|
From: John L. <jr...@us...> - 2008-01-16 05:57:38
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22833/src Modified Files: cansim.h Log Message: OSX can't have menu items with an id of 0 Index: cansim.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/cansim.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** cansim.h 14 Aug 2007 13:42:13 -0000 1.6 --- cansim.h 16 Jan 2008 05:57:33 -0000 1.7 *************** *** 30,34 **** enum { ! MenuOption_First, Scale_StretchHoriz = MenuOption_First, Scale_ShrinkHoriz, --- 30,34 ---- enum { ! MenuOption_First = 1, Scale_StretchHoriz = MenuOption_First, Scale_ShrinkHoriz, |
|
From: Francesco M. <fr...@us...> - 2008-01-15 20:19:59
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2609 Modified Files: configure Log Message: don't build lua interpreter and lua compiler if using system lua Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** configure 15 Jan 2008 19:45:27 -0000 1.76 --- configure 15 Jan 2008 20:19:55 -0000 1.77 *************** *** 811,814 **** --- 811,815 ---- COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 + COND_USE_SYSTEM_LUA_0 COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1 COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1 *************** *** 1934,1937 **** --- 1935,1943 ---- + # same as UTILS_BOOLOPT_SUMMARY but takes 2 bool options + + + + *************** *** 13406,13409 **** --- 13412,13420 ---- fi + COND_USE_SYSTEM_LUA_0="#" + if test "x$USE_SYSTEM_LUA" = "x0" ; then + COND_USE_SYSTEM_LUA_0="" + fi + COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1="#" if test "x$USE_WXBINDSTC" = "x1" -a "x$USE_WXLUAAPP" = "x1" -a "x$USE_WXLUADEBUG" = "x1" ; then *************** *** 14385,14388 **** --- 14396,14400 ---- COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim + COND_USE_SYSTEM_LUA_0!$COND_USE_SYSTEM_LUA_0$ac_delim COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1!$COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1$ac_delim COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1!$COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1$ac_delim *************** *** 14394,14398 **** _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then break elif $ac_last_try; then --- 14406,14410 ---- _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then break elif $ac_last_try; then *************** *** 14774,14777 **** --- 14786,14807 ---- echo + if [ "x$USE_SYSTEM_LUA" = "x0" ]; then + echo " - Lua interpreter: yes" + elif [ "x$USE_SYSTEM_LUA" = "x1" ]; then + echo " - Lua interpreter: no" + else + echo "USE_SYSTEM_LUA is $USE_SYSTEM_LUA" + fi + + + if [ "x$SHARED" = "x0" -a "x$USE_SYSTEM_LUA" = "x0" ]; then + echo " - Lua compiler: yes" + elif [ "x$SHARED" = "x1" -o "x$USE_SYSTEM_LUA" = "x1" ]; then + echo " - Lua compiler: no" + else + echo "SHARED is $SHARED; USE_SYSTEM_LUA is $USE_SYSTEM_LUA" + fi + + if [ "x$USE_WXLUAAPP" = "x1" -a "x$USE_WXBINDSTC" = "x1" -a "x$USE_WXLUADEBUG" = "x1" ]; then echo " - wxLua application: yes" |
|
From: Francesco M. <fr...@us...> - 2008-01-15 20:19:59
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2609/apps Modified Files: Makefile.in Log Message: don't build lua interpreter and lua compiler if using system lua Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** Makefile.in 15 Jan 2008 18:37:26 -0000 1.68 --- Makefile.in 15 Jan 2008 20:19:55 -0000 1.69 *************** *** 97,109 **** @COND_BUILD_DEBUG_UNICODE_0@WXLIBPOSTFIX = d @COND_BUILD_RELEASE_UNICODE_1@WXLIBPOSTFIX = u @COND_PLATFORM_MAC_0@__app_lua___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/lua$(EXEEXT) ! @COND_SHARED_0@__app_luac___depname = ../bin/luac$(EXEEXT) @COND_PLATFORM_MAC_0@__app_luac___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__app_luac___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/luac$(EXEEXT) ! @COND_SHARED_0@__install_app_luac___depname = install_app_luac ! @COND_SHARED_0@__uninstall_app_luac___depname = uninstall_app_luac @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ --- 97,114 ---- @COND_BUILD_DEBUG_UNICODE_0@WXLIBPOSTFIX = d @COND_BUILD_RELEASE_UNICODE_1@WXLIBPOSTFIX = u + @COND_USE_SYSTEM_LUA_0@__app_lua___depname = ../bin/lua$(EXEEXT) @COND_PLATFORM_MAC_0@__app_lua___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/lua$(EXEEXT) ! @COND_USE_SYSTEM_LUA_0@__install_app_lua___depname = install_app_lua ! @COND_USE_SYSTEM_LUA_0@__uninstall_app_lua___depname = uninstall_app_lua ! @COND_SHARED_0_USE_SYSTEM_LUA_0@__app_luac___depname = ../bin/luac$(EXEEXT) @COND_PLATFORM_MAC_0@__app_luac___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__app_luac___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/luac$(EXEEXT) ! @COND_SHARED_0_USE_SYSTEM_LUA_0@__install_app_luac___depname \ ! @COND_SHARED_0_USE_SYSTEM_LUA_0@ = install_app_luac ! @COND_SHARED_0_USE_SYSTEM_LUA_0@__uninstall_app_luac___depname \ ! @COND_SHARED_0_USE_SYSTEM_LUA_0@ = uninstall_app_luac @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ *************** *** 198,206 **** ### Targets: ### ! all: ../bin/lua$(EXEEXT) $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxlua_bundle___depname) $(__app_wxluaedit___depname) $(__app_wxluaedit_bundle___depname) $(__app_wxluacan___depname) $(__app_wxluacan_bundle___depname) $(__app_wxluafreeze___depname) $(__app_wxluafreeze_bundle___depname) ! install: all install_app_lua $(__install_app_luac___depname) $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua $(__uninstall_app_luac___depname) $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install --- 203,211 ---- ### Targets: ### ! all: $(__app_lua___depname) $(__app_luac___depname) $(__app_wxlua___depname) $(__app_wxlua_bundle___depname) $(__app_wxluaedit___depname) $(__app_wxluaedit_bundle___depname) $(__app_wxluacan___depname) $(__app_wxluacan_bundle___depname) $(__app_wxluafreeze___depname) $(__app_wxluafreeze_bundle___depname) ! install: all $(__install_app_lua___depname) $(__install_app_luac___depname) $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: $(__uninstall_app_lua___depname) $(__uninstall_app_luac___depname) $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install *************** *** 229,255 **** rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! ../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm ! ! $(__app_lua___mac_setfilecmd) ! install_app_lua: ! $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) ../bin/lua$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_lua: ! rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) ! @COND_SHARED_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! @COND_SHARED_0@ $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm ! @COND_SHARED_0@ ! @COND_SHARED_0@ $(__app_luac___mac_setfilecmd) ! @COND_SHARED_0@install_app_luac: ! @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_SHARED_0@ $(INSTALL_PROGRAM) ../bin/luac$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_SHARED_0@uninstall_app_luac: ! @COND_SHARED_0@ rm -f $(DESTDIR)$(bindir)/luac$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) --- 234,260 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_USE_SYSTEM_LUA_0@../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! @COND_USE_SYSTEM_LUA_0@ $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm ! @COND_USE_SYSTEM_LUA_0@ ! @COND_USE_SYSTEM_LUA_0@ $(__app_lua___mac_setfilecmd) ! @COND_USE_SYSTEM_LUA_0@install_app_lua: ! @COND_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_SYSTEM_LUA_0@ $(INSTALL_PROGRAM) ../bin/lua$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_SYSTEM_LUA_0@uninstall_app_lua: ! @COND_USE_SYSTEM_LUA_0@ rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) ! @COND_SHARED_0_USE_SYSTEM_LUA_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm ! @COND_SHARED_0_USE_SYSTEM_LUA_0@ ! @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(__app_luac___mac_setfilecmd) ! @COND_SHARED_0_USE_SYSTEM_LUA_0@install_app_luac: ! @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(INSTALL_PROGRAM) ../bin/luac$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_SHARED_0_USE_SYSTEM_LUA_0@uninstall_app_luac: ! @COND_SHARED_0_USE_SYSTEM_LUA_0@ rm -f $(DESTDIR)$(bindir)/luac$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) |
|
From: Francesco M. <fr...@us...> - 2008-01-15 20:19:59
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2609/build/autoconf Modified Files: aclocal.m4 autoconf_inc.m4 configure.ac utils.m4 Log Message: don't build lua interpreter and lua compiler if using system lua Index: utils.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/utils.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** utils.m4 14 Jan 2008 12:11:32 -0000 1.2 --- utils.m4 15 Jan 2008 20:19:56 -0000 1.3 *************** *** 109,112 **** --- 109,135 ---- ]) + AC_DEFUN([UTILS_BOOLOPT_INV_SUMMARY], + [ + if [[ "x$$1" = "x0" ]]; then + echo $2 + elif [[ "x$$1" = "x1" ]]; then + echo $3 + else + echo "$1 is $$1" + fi + ]) + + # same as UTILS_BOOLOPT_SUMMARY but takes 2 bool options + AC_DEFUN([UTILS_2BOOLOPT_INV_SUMMARY], + [ + if [[ "x$$1" = "x0" -a "x$$2" = "x0" ]]; then + echo $3 + elif [[ "x$$1" = "x1" -o "x$$2" = "x1" ]]; then + echo $4 + else + echo "$1 is $$1; $2 is $$2" + fi + ]) + dnl --------------------------------------------------------------------------- Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** autoconf_inc.m4 15 Jan 2008 00:04:58 -0000 1.28 --- autoconf_inc.m4 15 Jan 2008 20:19:55 -0000 1.29 *************** *** 117,121 **** fi AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_SHARED_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_0="#" if test "x$SHARED" = "x0" ; then --- 117,121 ---- fi AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_SHARED_0[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_0="#" if test "x$SHARED" = "x0" ; then *************** *** 123,127 **** fi AC_SUBST(COND_SHARED_0) ! dnl ### begin block 20_COND_SHARED_0_USE_SYSTEM_LUA_0[../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_0_USE_SYSTEM_LUA_0="#" if test "x$SHARED" = "x0" -a "x$USE_SYSTEM_LUA" = "x0" ; then --- 123,127 ---- fi AC_SUBST(COND_SHARED_0) ! dnl ### begin block 20_COND_SHARED_0_USE_SYSTEM_LUA_0[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### COND_SHARED_0_USE_SYSTEM_LUA_0="#" if test "x$SHARED" = "x0" -a "x$USE_SYSTEM_LUA" = "x0" ; then *************** *** 345,348 **** --- 345,354 ---- fi AC_SUBST(COND_USE_SOVERSOLARIS_1) + dnl ### begin block 20_COND_USE_SYSTEM_LUA_0[../../apps/build/bakefiles/apps.bkl] ### + COND_USE_SYSTEM_LUA_0="#" + if test "x$USE_SYSTEM_LUA" = "x0" ; then + COND_USE_SYSTEM_LUA_0="" + fi + AC_SUBST(COND_USE_SYSTEM_LUA_0) dnl ### begin block 20_COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1[../../apps/build/bakefiles/apps.bkl] ### COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1="#" Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** configure.ac 15 Jan 2008 19:45:27 -0000 1.65 --- configure.ac 15 Jan 2008 20:19:55 -0000 1.66 *************** *** 743,746 **** --- 743,758 ---- # applications echo + + # note that these use the _INV_ version of the macros since in the bakefiles + # the associated "cond" property are respectively USE_SYSTEM_LUA=='0' and + # SHARED=='0' and USE_SYSTEM_LUA=='1' + UTILS_BOOLOPT_INV_SUMMARY([USE_SYSTEM_LUA], + [" - Lua interpreter: yes"], + [" - Lua interpreter: no"]) + UTILS_2BOOLOPT_INV_SUMMARY([SHARED], [USE_SYSTEM_LUA], + [" - Lua compiler: yes"], + [" - Lua compiler: no"]) + + # these use "normal" versions of the macros UTILS_3BOOLOPT_SUMMARY([USE_WXLUAAPP], [USE_WXBINDSTC], [USE_WXLUADEBUG], [" - wxLua application: yes"], Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** aclocal.m4 15 Jan 2008 18:37:27 -0000 1.56 --- aclocal.m4 15 Jan 2008 20:19:55 -0000 1.57 *************** *** 1,6 **** ! # generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ! # 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, |
|
From: Francesco M. <fr...@us...> - 2008-01-15 20:19:59
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2609/apps/build/bakefiles Modified Files: apps.bkl Log Message: don't build lua interpreter and lua compiler if using system lua Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** apps.bkl 15 Jan 2008 18:37:26 -0000 1.59 --- apps.bkl 15 Jan 2008 20:19:55 -0000 1.60 *************** *** 96,100 **** <!-- ================================================================== --> ! <exe id="app_lua" template="luaapp"> <!--- the .. is because SRCDIR is always set to us to the wxLua/apps folder and thus we only need to use .. to get to the module root --> --- 96,100 ---- <!-- ================================================================== --> ! <exe id="app_lua" template="luaapp" cond="USE_SYSTEM_LUA=='0'"> <!--- the .. is because SRCDIR is always set to us to the wxLua/apps folder and thus we only need to use .. to get to the module root --> *************** *** 118,122 **** --> ! <exe id="app_luac" template="luaapp" cond="SHARED=='0'"> <sources> <!--- the .. is because SRCDIR is always set to us to the wxLua/apps --- 118,122 ---- --> ! <exe id="app_luac" template="luaapp" cond="SHARED=='0' and USE_SYSTEM_LUA=='0'"> <sources> <!--- the .. is because SRCDIR is always set to us to the wxLua/apps |
|
From: Francesco M. <fr...@us...> - 2008-01-15 19:45:31
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21790/build/autoconf Modified Files: configure.ac Log Message: rename lua_dir to lua_prefix to avoid conflicts with LUA_DIR; remove brackets in AC_SUBST as we don't use them anywhere in AC_SUBST; always set the LUA_*_DIR variables as leaving them empty gives problems; set them to reasonable values at least for Ubuntu systems Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** configure.ac 15 Jan 2008 18:37:27 -0000 1.64 --- configure.ac 15 Jan 2008 19:45:27 -0000 1.65 *************** *** 94,98 **** AC_ARG_WITH([lua-prefix], [AC_HELP_STRING([--with-lua-prefix], [Prefix where Lua is installed (optional)])], ! [lua_dir="$withval"], [lua_dir=""]) AC_ARG_WITH([wxstedit-prefix], --- 94,98 ---- AC_ARG_WITH([lua-prefix], [AC_HELP_STRING([--with-lua-prefix], [Prefix where Lua is installed (optional)])], ! [lua_prefix="$withval"], [lua_prefix=""]) AC_ARG_WITH([wxstedit-prefix], *************** *** 126,134 **** AC_MSG_CHECKING([for the --with-lua-prefix option]) ! if test ! $lua_dir = ""; then # user explicitely provided a path to its own lua, check that it's an absolute path # (or it won't work for out-of-tree builds) ! case $lua_dir in /*) continue;; *) --- 126,134 ---- AC_MSG_CHECKING([for the --with-lua-prefix option]) ! if test ! $lua_prefix = ""; then # user explicitely provided a path to its own lua, check that it's an absolute path # (or it won't work for out-of-tree builds) ! case $lua_prefix in /*) continue;; *) *************** *** 138,142 **** esac fi ! AC_MSG_RESULT([$lua_dir]) AC_MSG_CHECKING([for the --with-wxstedit-prefix option]) --- 138,142 ---- esac fi ! AC_MSG_RESULT([$lua_prefix]) AC_MSG_CHECKING([for the --with-wxstedit-prefix option]) *************** *** 207,215 **** # exist then we use our built-in lua - AC_MSG_CHECKING([if Lua 5.1 is installed]) USE_SYSTEM_LUA=0 if test ! "$enable_systemlua" = "no"; then UTILS_SAVE_COREVAR() --- 207,226 ---- # exist then we use our built-in lua USE_SYSTEM_LUA=0 + LUA_INCLUDE_DIR="." # leaving these vars empty would give problems + LUA_LIB_DIR="." + if test ! "$enable_systemlua" = "no"; then + # the default prefix is /usr + if test "$lua_prefix" = ""; then + lua_prefix="/usr" + fi + + # default include folder for lua 5.1 seems to be $lua_prefix/include/lua5.1 + LUA_INCLUDE_DIR="$lua_prefix/include/lua5.1" + LUA_LIB_DIR="$lua_prefix/lib" + UTILS_SAVE_COREVAR() *************** *** 217,225 **** CPPFLAGS="-x c $CPPFLAGS" ! # use their Lua path --with-lua-prefix=$lua_dir ! if test ! "$lua_dir" = ""; then ! CPPFLAGS="-I$lua_dir $CPPFLAGS" ! fi ! LIBS="$LIBS -llua5.1" AC_LINK_IFELSE([ AC_LANG_PROGRAM([#include <lua.h>], --- 228,236 ---- CPPFLAGS="-x c $CPPFLAGS" ! # use the Lua path given by the user through --with-lua-prefix option ! CPPFLAGS="-I$LUA_INCLUDE_DIR $CPPFLAGS" ! LDFLAGS="-L$LUA_LIB_DIR $LDFLAGS" ! LIBS="-llua5.1 $LIBS" ! AC_LINK_IFELSE([ AC_LANG_PROGRAM([#include <lua.h>], *************** *** 232,245 **** # from other macros called by AC_LINK_IFELSE may interfere # in the final output if test "$LUA_PRESENCE" = "1"; then AC_MSG_RESULT([yes, using system Lua]) USE_SYSTEM_LUA=1 - if test ! $lua_dir = ""; then - LUA_INCLUDE_DIR=$lua_dir - # We don't know where the system LUA_LIB_DIR is, just duplicate our lib path - LUA_LIB_DIR="`pwd`/lib" - echo " Lua include path: '$LUA_INCLUDE_DIR'" - fi - else AC_MSG_RESULT([not found, falling back to the built-in lua]) --- 243,251 ---- # from other macros called by AC_LINK_IFELSE may interfere # in the final output + AC_MSG_CHECKING([if Lua 5.1 is installed]) + if test "$LUA_PRESENCE" = "1"; then AC_MSG_RESULT([yes, using system Lua]) USE_SYSTEM_LUA=1 else AC_MSG_RESULT([not found, falling back to the built-in lua]) *************** *** 249,264 **** You specified --enable-systemlua=yes, but it is not useable. See config.log. ]) - fi fi UTILS_RESTORE_COREVAR() # restore $CPPFLAGS and $LIBS - else AC_MSG_RESULT([using built-in Lua --enable-systemlua=no]) fi ! AC_SUBST([LUA_INCLUDE_DIR]) ! AC_SUBST([LUA_LIB_DIR]) if test "$USE_SYSTEM_LUA" = "0"; then --- 255,268 ---- You specified --enable-systemlua=yes, but it is not useable. See config.log. ]) fi fi UTILS_RESTORE_COREVAR() # restore $CPPFLAGS and $LIBS else AC_MSG_RESULT([using built-in Lua --enable-systemlua=no]) fi ! AC_SUBST(LUA_INCLUDE_DIR) ! AC_SUBST(LUA_LIB_DIR) if test "$USE_SYSTEM_LUA" = "0"; then *************** *** 756,760 **** if test "$USE_SYSTEM_LUA" = "1"; then ! echo " - Using SYSTEM lua library (prefix is '$lua_dir')" else echo " - Using BUILT-IN lua library" --- 760,764 ---- if test "$USE_SYSTEM_LUA" = "1"; then ! echo " - Using SYSTEM lua library (prefix is '$lua_prefix')" else echo " - Using BUILT-IN lua library" |
|
From: Francesco M. <fr...@us...> - 2008-01-15 19:45:31
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21790 Modified Files: configure Log Message: rename lua_dir to lua_prefix to avoid conflicts with LUA_DIR; remove brackets in AC_SUBST as we don't use them anywhere in AC_SUBST; always set the LUA_*_DIR variables as leaving them empty gives problems; set them to reasonable values at least for Ubuntu systems Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** configure 15 Jan 2008 18:37:26 -0000 1.75 --- configure 15 Jan 2008 19:45:27 -0000 1.76 *************** *** 2452,2458 **** # Check whether --with-lua-prefix was given. if test "${with_lua_prefix+set}" = set; then ! withval=$with_lua_prefix; lua_dir="$withval" else ! lua_dir="" fi --- 2452,2458 ---- # Check whether --with-lua-prefix was given. if test "${with_lua_prefix+set}" = set; then ! withval=$with_lua_prefix; lua_prefix="$withval" else ! lua_prefix="" fi *************** *** 2794,2802 **** { echo "$as_me:$LINENO: checking for the --with-lua-prefix option" >&5 echo $ECHO_N "checking for the --with-lua-prefix option... $ECHO_C" >&6; } ! if test ! $lua_dir = ""; then # user explicitely provided a path to its own lua, check that it's an absolute path # (or it won't work for out-of-tree builds) ! case $lua_dir in /*) continue;; *) --- 2794,2802 ---- { echo "$as_me:$LINENO: checking for the --with-lua-prefix option" >&5 echo $ECHO_N "checking for the --with-lua-prefix option... $ECHO_C" >&6; } ! if test ! $lua_prefix = ""; then # user explicitely provided a path to its own lua, check that it's an absolute path # (or it won't work for out-of-tree builds) ! case $lua_prefix in /*) continue;; *) *************** *** 2810,2815 **** esac fi ! { echo "$as_me:$LINENO: result: $lua_dir" >&5 ! echo "${ECHO_T}$lua_dir" >&6; } { echo "$as_me:$LINENO: checking for the --with-wxstedit-prefix option" >&5 --- 2810,2815 ---- esac fi ! { echo "$as_me:$LINENO: result: $lua_prefix" >&5 ! echo "${ECHO_T}$lua_prefix" >&6; } { echo "$as_me:$LINENO: checking for the --with-wxstedit-prefix option" >&5 *************** *** 4809,4818 **** # exist then we use our built-in lua - { echo "$as_me:$LINENO: checking if Lua 5.1 is installed" >&5 - echo $ECHO_N "checking if Lua 5.1 is installed... $ECHO_C" >&6; } USE_SYSTEM_LUA=0 if test ! "$enable_systemlua" = "no"; then SAVED_CPPFLAGS="$CPPFLAGS" --- 4809,4828 ---- # exist then we use our built-in lua USE_SYSTEM_LUA=0 + LUA_INCLUDE_DIR="." # leaving these vars empty would give problems + LUA_LIB_DIR="." + if test ! "$enable_systemlua" = "no"; then + # the default prefix is /usr + if test "$lua_prefix" = ""; then + lua_prefix="/usr" + fi + + # default include folder for lua 5.1 seems to be $lua_prefix/include/lua5.1 + LUA_INCLUDE_DIR="$lua_prefix/include/lua5.1" + LUA_LIB_DIR="$lua_prefix/lib" + SAVED_CPPFLAGS="$CPPFLAGS" *************** *** 4825,4833 **** CPPFLAGS="-x c $CPPFLAGS" ! # use their Lua path --with-lua-prefix=$lua_dir ! if test ! "$lua_dir" = ""; then ! CPPFLAGS="-I$lua_dir $CPPFLAGS" ! fi ! LIBS="$LIBS -llua5.1" cat >conftest.$ac_ext <<_ACEOF --- 4835,4843 ---- CPPFLAGS="-x c $CPPFLAGS" ! # use the Lua path given by the user through --with-lua-prefix option ! CPPFLAGS="-I$LUA_INCLUDE_DIR $CPPFLAGS" ! LDFLAGS="-L$LUA_LIB_DIR $LDFLAGS" ! LIBS="-llua5.1 $LIBS" ! cat >conftest.$ac_ext <<_ACEOF *************** *** 4881,4895 **** # from other macros called by AC_LINK_IFELSE may interfere # in the final output if test "$LUA_PRESENCE" = "1"; then { echo "$as_me:$LINENO: result: yes, using system Lua" >&5 echo "${ECHO_T}yes, using system Lua" >&6; } USE_SYSTEM_LUA=1 - if test ! $lua_dir = ""; then - LUA_INCLUDE_DIR=$lua_dir - # We don't know where the system LUA_LIB_DIR is, just duplicate our lib path - LUA_LIB_DIR="`pwd`/lib" - echo " Lua include path: '$LUA_INCLUDE_DIR'" - fi - else { echo "$as_me:$LINENO: result: not found, falling back to the built-in lua" >&5 --- 4891,4901 ---- # from other macros called by AC_LINK_IFELSE may interfere # in the final output + { echo "$as_me:$LINENO: checking if Lua 5.1 is installed" >&5 + echo $ECHO_N "checking if Lua 5.1 is installed... $ECHO_C" >&6; } + if test "$LUA_PRESENCE" = "1"; then { echo "$as_me:$LINENO: result: yes, using system Lua" >&5 echo "${ECHO_T}yes, using system Lua" >&6; } USE_SYSTEM_LUA=1 else { echo "$as_me:$LINENO: result: not found, falling back to the built-in lua" >&5 *************** *** 4904,4908 **** " >&2;} { (exit 1); exit 1; }; } - fi fi --- 4910,4913 ---- *************** *** 4914,4918 **** LIBS="$SAVED_LIBS" # restore $CPPFLAGS and $LIBS - else { echo "$as_me:$LINENO: result: using built-in Lua --enable-systemlua=no" >&5 --- 4919,4922 ---- *************** *** 14810,14814 **** if test "$USE_SYSTEM_LUA" = "1"; then ! echo " - Using SYSTEM lua library (prefix is '$lua_dir')" else echo " - Using BUILT-IN lua library" --- 14814,14818 ---- if test "$USE_SYSTEM_LUA" = "1"; then ! echo " - Using SYSTEM lua library (prefix is '$lua_prefix')" else echo " - Using BUILT-IN lua library" |
|
From: Francesco M. <fr...@us...> - 2008-01-15 19:41:15
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20229/docs Modified Files: changelog.txt Log Message: mention configure changes Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** changelog.txt 15 Jan 2008 01:04:04 -0000 1.56 --- changelog.txt 15 Jan 2008 19:41:11 -0000 1.57 *************** *** 2,6 **** =============== ! version 2.8.6.0 -------------------------------------------------------------------- --- 2,6 ---- =============== ! version 2.8.7.0 (released ??/??/????) -------------------------------------------------------------------- *************** *** 117,120 **** --- 117,124 ---- - Copy Lua's print() function to print_lua() instead of simply overwriting it in case someone really wants to use it. + + - Revised the build system, specially the configure script under Linux which + now accepts more options and automatically detects the presence/absence of + each wxWidgets library when --enable-wxbind* options are left in "auto" mode |
|
From: John L. <jr...@us...> - 2008-01-15 18:52:57
|
Update of /cvsroot/wxlua/wxLua/apps/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26453/wxLua/apps/build/msvc6 Modified Files: apps_app_lua.dsp apps_app_luac.dsp Log Message: Updated bakefiles to separate LUA_DIR to LUA_INCLUDE_DIR and LUA_LIB_DIR so a system Lua's include path can be specified exactly. Used bakefile-0.2.3 Index: apps_app_luac.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_luac.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** apps_app_luac.dsp 15 Jan 2008 00:08:16 -0000 1.2 --- apps_app_luac.dsp 15 Jan 2008 18:37:26 -0000 1.3 *************** *** 47,54 **** # PROP Intermediate_Dir "vcmswu\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 47,54 ---- # PROP Intermediate_Dir "vcmswu\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 70,77 **** # PROP Intermediate_Dir "vcmswu\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 70,77 ---- # PROP Intermediate_Dir "vcmswu\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 93,100 **** # PROP Intermediate_Dir "vcmsw\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 93,100 ---- # PROP Intermediate_Dir "vcmsw\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 116,123 **** # PROP Intermediate_Dir "vcmsw\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 116,123 ---- # PROP Intermediate_Dir "vcmsw\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 139,146 **** # PROP Intermediate_Dir "vcmswud\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 139,146 ---- # PROP Intermediate_Dir "vcmswud\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 162,169 **** # PROP Intermediate_Dir "vcmswud\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 162,169 ---- # PROP Intermediate_Dir "vcmswud\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 185,192 **** # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 185,192 ---- # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 208,215 **** # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 208,215 ---- # PROP Intermediate_Dir "vcmswd\app_luac" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\luac.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo Index: apps_app_lua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msvc6/apps_app_lua.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** apps_app_lua.dsp 15 Jan 2008 00:08:16 -0000 1.5 --- apps_app_lua.dsp 15 Jan 2008 18:37:26 -0000 1.6 *************** *** 55,62 **** # PROP Intermediate_Dir "vcmswu_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 55,62 ---- # PROP Intermediate_Dir "vcmswu_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 78,85 **** # PROP Intermediate_Dir "vcmswu_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 78,85 ---- # PROP Intermediate_Dir "vcmswu_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 101,108 **** # PROP Intermediate_Dir "vcmswu\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 101,108 ---- # PROP Intermediate_Dir "vcmswu\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 124,131 **** # PROP Intermediate_Dir "vcmswu\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 124,131 ---- # PROP Intermediate_Dir "vcmswu\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 147,154 **** # PROP Intermediate_Dir "vcmsw_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 147,154 ---- # PROP Intermediate_Dir "vcmsw_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 170,177 **** # PROP Intermediate_Dir "vcmsw_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 170,177 ---- # PROP Intermediate_Dir "vcmsw_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 193,200 **** # PROP Intermediate_Dir "vcmsw\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 193,200 ---- # PROP Intermediate_Dir "vcmsw\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 216,223 **** # PROP Intermediate_Dir "vcmsw\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i ..\..\..\modules\lua\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 216,223 ---- # PROP Intermediate_Dir "vcmsw\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d _CONSOLE BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 239,246 **** # PROP Intermediate_Dir "vcmswud_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 239,246 ---- # PROP Intermediate_Dir "vcmswud_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 262,269 **** # PROP Intermediate_Dir "vcmswud_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 262,269 ---- # PROP Intermediate_Dir "vcmswud_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 285,292 **** # PROP Intermediate_Dir "vcmswud\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 285,292 ---- # PROP Intermediate_Dir "vcmswud\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 308,315 **** # PROP Intermediate_Dir "vcmswud\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 308,315 ---- # PROP Intermediate_Dir "vcmswud\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 331,338 **** # PROP Intermediate_Dir "vcmswd_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 331,338 ---- # PROP Intermediate_Dir "vcmswd_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 354,361 **** # PROP Intermediate_Dir "vcmswd_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 354,361 ---- # PROP Intermediate_Dir "vcmswd_dll\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_dll\lua.pdb /D "WIN32" /D "WXUSINGDLL" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "WXUSINGDLL" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 377,384 **** # PROP Intermediate_Dir "vcmswd\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 377,384 ---- # PROP Intermediate_Dir "vcmswd\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 400,407 **** # PROP Intermediate_Dir "vcmswd\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /i "..\..\..\modules\lua\include" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 400,407 ---- # PROP Intermediate_Dir "vcmswd\app_lua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /W1 /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /Od /Gm /I "..\..\..\modules" /I ".\..\..\.." /I "..\..\..\modules\lua\include" /Zi /Fd..\..\..\bin\vc_lib\lua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_CONSOLE" /D "_DEBUG" /c ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /i "..\..\..\modules\lua\include" /d "_CONSOLE" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo |
|
From: John L. <jr...@us...> - 2008-01-15 18:48:15
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26453/wxLua/apps/build/bakefiles Modified Files: apps.bkl Log Message: Updated bakefiles to separate LUA_DIR to LUA_INCLUDE_DIR and LUA_LIB_DIR so a system Lua's include path can be specified exactly. Used bakefile-0.2.3 Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** apps.bkl 14 Jan 2008 22:58:47 -0000 1.58 --- apps.bkl 15 Jan 2008 18:37:26 -0000 1.59 *************** *** 66,70 **** <rpath-to>$(WXLUA_LIBDIR)</rpath-to> ! <include>$(WXLUA_BASEDIR)/modules/lua/include</include> <!-- see modules/build/bakefiles/options.bkl for these --> --- 66,74 ---- <rpath-to>$(WXLUA_LIBDIR)</rpath-to> ! ! <!-- ! Lua is included by $(LUA_INCLUDE_DIR) ! <include>$(WXLUA_BASEDIR)/modules/lua/include</include> ! --> <!-- see modules/build/bakefiles/options.bkl for these --> *************** *** 98,102 **** <!-- we want as EXE name the standard "lua" name so that when we install ! wxLua we also get official Lua installed in standard places and with standard names (see also the notes in modules.bkl for lua_lib and lua_dll) --> --- 102,106 ---- <!-- we want as EXE name the standard "lua" name so that when we install ! wxLua we also get official Lua installed in standard places and with standard names (see also the notes in modules.bkl for lua_lib and lua_dll) --> *************** *** 122,126 **** <!-- we want as EXE name the standard "luac" name so that when we install ! wxLua we also get official Lua installed in standard places and with standard names (see also the notes in modules.bkl for lua_lib and lua_dll) --> --- 126,130 ---- <!-- we want as EXE name the standard "luac" name so that when we install ! wxLua we also get official Lua installed in standard places and with standard names (see also the notes in modules.bkl for lua_lib and lua_dll) --> |
|
From: John L. <jr...@us...> - 2008-01-15 18:48:08
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26453/wxLua/apps Modified Files: Makefile.in Log Message: Updated bakefiles to separate LUA_DIR to LUA_INCLUDE_DIR and LUA_LIB_DIR so a system Lua's include path can be specified exactly. Used bakefile-0.2.3 Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** Makefile.in 14 Jan 2008 23:30:21 -0000 1.67 --- Makefile.in 15 Jan 2008 18:37:26 -0000 1.68 *************** *** 39,43 **** WX_VERSION_MINOR = @WX_VERSION_MINOR@ WX_PORT = @WX_PORT@ ! LUA_DIR = @LUA_DIR@ WXLUA_LIBS = @WXLUA_LIBS@ RPATH_FLAGS = @RPATH_FLAGS@ --- 39,44 ---- WX_VERSION_MINOR = @WX_VERSION_MINOR@ WX_PORT = @WX_PORT@ ! LUA_INCLUDE_DIR = @LUA_INCLUDE_DIR@ ! LUA_LIB_DIR = @LUA_LIB_DIR@ WXLUA_LIBS = @WXLUA_LIBS@ RPATH_FLAGS = @RPATH_FLAGS@ *************** *** 49,64 **** DESTDIR = APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ ! $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ app_lua_lua.o APP_LUAC_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ ! $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ app_luac_luac.o \ app_luac_print.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_lconsole.o \ --- 50,65 ---- DESTDIR = APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_INCLUDE_DIR) $(WX_CFLAGS) $(LUA_PLATFORM_SPECIFIC_CFLAGS) \ ! $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ app_lua_lua.o APP_LUAC_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_INCLUDE_DIR) $(WX_CFLAGS) $(LUA_PLATFORM_SPECIFIC_CFLAGS) \ ! $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ app_luac_luac.o \ app_luac_print.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_INCLUDE_DIR) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_lconsole.o \ *************** *** 66,70 **** $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ app_wxluaedit_wxledit.o \ --- 67,71 ---- $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_INCLUDE_DIR) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ app_wxluaedit_wxledit.o \ *************** *** 72,76 **** $(__app_wxluaedit___win32rc) APP_WXLUACAN_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include -I$(top_srcdir)/modules/wxbind/setup $(WX_CXXFLAGS) \ $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ --- 73,77 ---- $(__app_wxluaedit___win32rc) APP_WXLUACAN_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_INCLUDE_DIR) -I$(top_srcdir)/modules/wxbind/setup $(WX_CXXFLAGS) \ $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ *************** *** 82,86 **** $(__app_wxluacan___win32rc) APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ app_wxluafreeze_wxluafreeze.o \ --- 83,87 ---- $(__app_wxluacan___win32rc) APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_INCLUDE_DIR) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ app_wxluafreeze_wxluafreeze.o \ *************** *** 112,116 **** @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ../bin/wxlua$(EXEEXT) COND_PLATFORM_MAC_1___app_wxlua___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -i \ ! $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -o \ ../bin/wxlua$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxlua___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxlua___mac_rezcmd) --- 113,117 ---- @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ../bin/wxlua$(EXEEXT) COND_PLATFORM_MAC_1___app_wxlua___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -i \ ! $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_INCLUDE_DIR) -o \ ../bin/wxlua$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxlua___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxlua___mac_rezcmd) *************** *** 134,138 **** @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C ../bin/wxluaedit$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluaedit___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL \ ! -i $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -o \ ../bin/wxluaedit$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluaedit___mac_rezcmd) --- 135,139 ---- @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C ../bin/wxluaedit$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluaedit___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL \ ! -i $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_INCLUDE_DIR) -o \ ../bin/wxluaedit$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluaedit___mac_rezcmd) *************** *** 155,159 **** @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ../bin/wxluacan$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluacan___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -i \ ! $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -i \ $(top_srcdir)/modules/wxbind/setup -o ../bin/wxluacan$(EXEEXT) \ $(top_srcdir)/art/wxlua.r --- 156,160 ---- @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ../bin/wxluacan$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluacan___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -i \ ! $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_INCLUDE_DIR) -i \ $(top_srcdir)/modules/wxbind/setup -o ../bin/wxluacan$(EXEEXT) \ $(top_srcdir)/art/wxlua.r *************** *** 177,181 **** @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C ../bin/wxluafreeze$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluafreeze___mac_rezcmd = $(REZ) -d __DARWIN__ -t \ ! APPL -i $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -o \ ../bin/wxluafreeze$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluafreeze___mac_rezcmd) --- 178,182 ---- @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C ../bin/wxluafreeze$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluafreeze___mac_rezcmd = $(REZ) -d __DARWIN__ -t \ ! APPL -i $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_INCLUDE_DIR) -o \ ../bin/wxluafreeze$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluafreeze___mac_rezcmd) *************** *** 229,233 **** ../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm $(__app_lua___mac_setfilecmd) --- 230,234 ---- ../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm $(__app_lua___mac_setfilecmd) *************** *** 241,245 **** @COND_SHARED_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! @COND_SHARED_0@ $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm @COND_SHARED_0@ @COND_SHARED_0@ $(__app_luac___mac_setfilecmd) --- 242,246 ---- @COND_SHARED_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! @COND_SHARED_0@ $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm @COND_SHARED_0@ @COND_SHARED_0@ $(__app_luac___mac_setfilecmd) *************** *** 253,257 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) --- 254,258 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 288,292 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 289,293 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) *************** *** 323,327 **** @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) --- 324,328 ---- @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) *************** *** 358,362 **** @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) --- 359,363 ---- @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) *************** *** 408,412 **** app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include app_wxluaedit_wxledit.o: $(srcdir)/wxluaedit/src/wxledit.cpp --- 409,413 ---- app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_INCLUDE_DIR) app_wxluaedit_wxledit.o: $(srcdir)/wxluaedit/src/wxledit.cpp *************** *** 417,421 **** app_wxluaedit_wxluaedit_rc.o: $(srcdir)/wxluaedit/src/wxluaedit.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include app_wxluacan_cancom.o: $(srcdir)/wxluacan/src/cancom.cpp --- 418,422 ---- app_wxluaedit_wxluaedit_rc.o: $(srcdir)/wxluaedit/src/wxluaedit.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_INCLUDE_DIR) app_wxluacan_cancom.o: $(srcdir)/wxluacan/src/cancom.cpp *************** *** 435,439 **** app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include --include-dir $(top_srcdir)/modules/wxbind/setup app_wxluafreeze_wxluafreeze.o: $(srcdir)/wxluafreeze/src/wxluafreeze.cpp --- 436,440 ---- app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_INCLUDE_DIR) --include-dir $(top_srcdir)/modules/wxbind/setup app_wxluafreeze_wxluafreeze.o: $(srcdir)/wxluafreeze/src/wxluafreeze.cpp *************** *** 441,445 **** app_wxluafreeze_wxluafreeze_rc.o: $(srcdir)/wxluafreeze/src/wxluafreeze.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include --- 442,446 ---- app_wxluafreeze_wxluafreeze_rc.o: $(srcdir)/wxluafreeze/src/wxluafreeze.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_INCLUDE_DIR) |
|
From: John L. <jr...@us...> - 2008-01-15 18:43:55
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26453/wxLua Modified Files: configure Log Message: Updated bakefiles to separate LUA_DIR to LUA_INCLUDE_DIR and LUA_LIB_DIR so a system Lua's include path can be specified exactly. Used bakefile-0.2.3 Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** configure 15 Jan 2008 00:08:15 -0000 1.74 --- configure 15 Jan 2008 18:37:26 -0000 1.75 *************** *** 692,696 **** WX_PORT RPATH_FLAGS ! LUA_DIR CXXCPP GREP --- 692,697 ---- WX_PORT RPATH_FLAGS ! LUA_INCLUDE_DIR ! LUA_LIB_DIR CXXCPP GREP *************** *** 4810,4813 **** --- 4811,4815 ---- { echo "$as_me:$LINENO: checking if Lua 5.1 is installed" >&5 echo $ECHO_N "checking if Lua 5.1 is installed... $ECHO_C" >&6; } + USE_SYSTEM_LUA=0 if test ! "$enable_systemlua" = "no"; then *************** *** 4883,4890 **** echo "${ECHO_T}yes, using system Lua" >&6; } USE_SYSTEM_LUA=1 else { echo "$as_me:$LINENO: result: not found, falling back to the built-in lua" >&5 echo "${ECHO_T}not found, falling back to the built-in lua" >&6; } - USE_SYSTEM_LUA=0 if test "$enable_systemlua" = "yes"; then --- 4885,4898 ---- echo "${ECHO_T}yes, using system Lua" >&6; } USE_SYSTEM_LUA=1 + if test ! $lua_dir = ""; then + LUA_INCLUDE_DIR=$lua_dir + # We don't know where the system LUA_LIB_DIR is, just duplicate our lib path + LUA_LIB_DIR="`pwd`/lib" + echo " Lua include path: '$LUA_INCLUDE_DIR'" + fi + else { echo "$as_me:$LINENO: result: not found, falling back to the built-in lua" >&5 echo "${ECHO_T}not found, falling back to the built-in lua" >&6; } if test "$enable_systemlua" = "yes"; then *************** *** 4898,4905 **** fi - - # LUA_DIR must always be an absolute path! - LUA_DIR="`pwd`/$srcdir/modules/lua" - fi --- 4906,4909 ---- *************** *** 4909,4924 **** CFLAGS="$SAVED_CFLAGS" LIBS="$SAVED_LIBS" ! # remove the -llua5.1 piece from $LIBS else { echo "$as_me:$LINENO: result: using built-in Lua --enable-systemlua=no" >&5 echo "${ECHO_T}using built-in Lua --enable-systemlua=no" >&6; } - USE_SYSTEM_LUA=0 - LUA_DIR="`pwd`/$srcdir/modules/lua" fi if test "$USE_SYSTEM_LUA" = "0"; then # Checks used to determine right LUA flags (see modules/lua/src/Makefile) luadefs= --- 4913,4932 ---- CFLAGS="$SAVED_CFLAGS" LIBS="$SAVED_LIBS" ! # restore $CPPFLAGS and $LIBS else { echo "$as_me:$LINENO: result: using built-in Lua --enable-systemlua=no" >&5 echo "${ECHO_T}using built-in Lua --enable-systemlua=no" >&6; } fi + + if test "$USE_SYSTEM_LUA" = "0"; then + # LUA_INCLUDE_DIR must always be an absolute path! + LUA_INCLUDE_DIR="`pwd`/$srcdir/modules/lua/include" + LUA_LIB_DIR="`pwd`/lib" + # Checks used to determine right LUA flags (see modules/lua/src/Makefile) luadefs= *************** *** 6177,6181 **** - fi --- 6185,6188 ---- *************** *** 7154,7162 **** if test ! "$wxstedit_dir" = ""; then WXSTEDIT=$wxstedit_dir ! echo "Path to wxStEdit from --with-wxstedit-dir: '$WXSTEDIT'" else # Try to get the wxStEdit src dir from the shell environment variable WXSTEDIT=`echo $WXSTEDIT` ! echo "Path to wxStEdit from \$WXSTEDIT environment variable: '$WXSTEDIT'" fi --- 7161,7169 ---- if test ! "$wxstedit_dir" = ""; then WXSTEDIT=$wxstedit_dir ! echo " wxStEdit include path from --with-wxstedit-dir: '$WXSTEDIT'" else # Try to get the wxStEdit src dir from the shell environment variable WXSTEDIT=`echo $WXSTEDIT` ! echo " wxStEdit include path from \$WXSTEDIT environment variable: '$WXSTEDIT'" fi *************** *** 14173,14177 **** WX_PORT!$WX_PORT$ac_delim RPATH_FLAGS!$RPATH_FLAGS$ac_delim ! LUA_DIR!$LUA_DIR$ac_delim CXXCPP!$CXXCPP$ac_delim GREP!$GREP$ac_delim --- 14180,14185 ---- WX_PORT!$WX_PORT$ac_delim RPATH_FLAGS!$RPATH_FLAGS$ac_delim ! LUA_INCLUDE_DIR!$LUA_INCLUDE_DIR$ac_delim ! LUA_LIB_DIR!$LUA_LIB_DIR$ac_delim CXXCPP!$CXXCPP$ac_delim GREP!$GREP$ac_delim *************** *** 14192,14196 **** AR!$AR$ac_delim AROPTIONS!$AROPTIONS$ac_delim - STRIP!$STRIP$ac_delim _ACEOF --- 14200,14203 ---- *************** *** 14234,14237 **** --- 14241,14245 ---- for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF + STRIP!$STRIP$ac_delim NM!$NM$ac_delim INSTALL_DIR!$INSTALL_DIR$ac_delim *************** *** 14330,14334 **** COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$ac_delim COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim - COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim _ACEOF --- 14338,14341 ---- *************** *** 14372,14375 **** --- 14379,14383 ---- for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF + COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1!$COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1$ac_delim *************** *** 14382,14386 **** _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then break elif $ac_last_try; then --- 14390,14394 ---- _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then break elif $ac_last_try; then |
