From: Francesco M. <fr...@us...> - 2006-05-20 20:18:05
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8475/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_wxlua.dsp Log Message: changed luamodule to link against verbatim lua and output result in DLL dir Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** makefile.vc 20 May 2006 18:22:26 -0000 1.45 --- makefile.vc 20 May 2006 20:17:57 -0000 1.46 *************** *** 237,242 **** $(____BUILD_42) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(WX_DIR)\contrib\include /GR /EHsc \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ --- 237,242 ---- $(____BUILD_42) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(WX_DIR)\contrib\include \ ! /DWXLUA_LUA_NEWTHREAD /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ *************** *** 252,256 **** /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(WX_DIR)\contrib\include \ ! /DWXMAKINGDLL_WXLUA /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ --- 252,256 ---- /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(WX_DIR)\contrib\include \ ! /DWXMAKINGDLL_WXLUA /DWXLUA_LUA_NEWTHREAD /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ *************** *** 424,428 **** /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_41) \ ! $(____BUILD_42) $(______BUILD) /Fd..\..\..\lib\vc_lib\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ --- 424,428 ---- /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_41) \ ! $(____BUILD_42) $(______BUILD) /Fd..\..\..\lib\vc_dll\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ *************** *** 489,493 **** !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\vc_lib\wx.dll !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" --- 489,493 ---- !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\vc_dll\wx.dll !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" *************** *** 717,723 **** -if exist ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb del ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb -if exist ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\vc_lib\wx.dll del ..\..\..\lib\vc_lib\wx.dll ! -if exist ..\..\..\lib\vc_lib\wx.ilk del ..\..\..\lib\vc_lib\wx.ilk ! -if exist ..\..\..\lib\vc_lib\wx.pdb del ..\..\..\lib\vc_lib\wx.pdb !if "$(SHARED)" == "0" --- 717,723 ---- -if exist ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb del ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb -if exist ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\vc_dll\wx.dll del ..\..\..\lib\vc_dll\wx.dll ! -if exist ..\..\..\lib\vc_dll\wx.ilk del ..\..\..\lib\vc_dll\wx.ilk ! -if exist ..\..\..\lib\vc_dll\wx.pdb del ..\..\..\lib\vc_dll\wx.pdb !if "$(SHARED)" == "0" *************** *** 827,833 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\vc_lib\wx.dll: $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif --- 827,833 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\vc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << !endif Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** makefile.bcc 20 May 2006 18:22:26 -0000 1.46 --- makefile.bcc 20 May 2006 20:17:56 -0000 1.47 *************** *** 262,267 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ --- 262,267 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -DWXLUA_LUA_NEWTHREAD $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ *************** *** 274,278 **** -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ --- 274,278 ---- -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -DWXMAKINGDLL_WXLUA -DWXLUA_LUA_NEWTHREAD $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ *************** *** 488,492 **** !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\bcc_lib\wx.dll !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" --- 488,492 ---- !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! __mod_luamodule___depname = ..\..\..\lib\bcc_dll\wx.dll !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" *************** *** 713,722 **** -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\bcc_lib\wx.dll del ..\..\..\lib\bcc_lib\wx.dll ! -if exist ..\..\..\lib\bcc_lib\wx.tds del ..\..\..\lib\bcc_lib\wx.tds ! -if exist ..\..\..\lib\bcc_lib\wx.ilc del ..\..\..\lib\bcc_lib\wx.ilc ! -if exist ..\..\..\lib\bcc_lib\wx.ild del ..\..\..\lib\bcc_lib\wx.ild ! -if exist ..\..\..\lib\bcc_lib\wx.ilf del ..\..\..\lib\bcc_lib\wx.ilf ! -if exist ..\..\..\lib\bcc_lib\wx.ils del ..\..\..\lib\bcc_lib\wx.ils !if "$(SHARED)" == "0" --- 713,722 ---- -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.ils -if exist ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\bcc_dll\wx.dll del ..\..\..\lib\bcc_dll\wx.dll ! -if exist ..\..\..\lib\bcc_dll\wx.tds del ..\..\..\lib\bcc_dll\wx.tds ! -if exist ..\..\..\lib\bcc_dll\wx.ilc del ..\..\..\lib\bcc_dll\wx.ilc ! -if exist ..\..\..\lib\bcc_dll\wx.ild del ..\..\..\lib\bcc_dll\wx.ild ! -if exist ..\..\..\lib\bcc_dll\wx.ilf del ..\..\..\lib\bcc_dll\wx.ilf ! -if exist ..\..\..\lib\bcc_dll\wx.ils del ..\..\..\lib\bcc_dll\wx.ils !if "$(SHARED)" == "0" *************** *** 833,839 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\bcc_lib\wx.dll: $(MOD_LUAMODULE_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | !endif --- 833,839 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ! ..\..\..\lib\bcc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | !endif Index: modules_mod_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxlua.dsp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** modules_mod_wxlua.dsp 20 May 2006 13:12:35 -0000 1.22 --- modules_mod_wxlua.dsp 20 May 2006 20:17:57 -0000 1.23 *************** *** 56,65 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 56,65 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 81,90 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 81,90 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 106,115 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 106,115 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 131,140 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 131,140 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 156,165 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 156,165 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 181,190 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 181,190 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dll\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d "_DEBUG" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 206,215 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 206,215 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 231,240 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXMAKINGDLL_WXLUA BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 231,240 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_WXLUA" /D "WXLUA_LUA_NEWTHREAD" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD ! # ADD RSC /l 0x409 /i "..\..\..\modules\wxbind\setup" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXMAKINGDLL_WXLUA" /d WXLUA_LUA_NEWTHREAD BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 256,261 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 256,261 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 279,284 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 279,284 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 302,307 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 302,307 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 325,330 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 325,330 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 348,353 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 348,353 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 371,376 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 371,376 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_lib\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 394,399 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 394,399 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 417,422 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 417,422 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "..\..\..\modules\wxbind\setup" /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "WXLUA_LUA_NEWTHREAD" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** makefile.wat 20 May 2006 18:22:26 -0000 1.45 --- makefile.wat 20 May 2006 20:17:57 -0000 1.46 *************** *** 179,183 **** !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! __mod_luamodule___depname = ..\..\..\lib\wat_lib\wx.dll !endif !endif --- 179,183 ---- !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! __mod_luamodule___depname = ..\..\..\lib\wat_dll\wx.dll !endif !endif *************** *** 669,673 **** -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_28) & $(____BUILD_29) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj & --- 669,673 ---- -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_28) & $(____BUILD_29) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WX_DIR)\contrib\include -dWXLUA_LUA_NEWTHREAD $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj & *************** *** 680,684 **** -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_28) & $(____BUILD_29) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WX_DIR)\contrib\include -dWXMAKINGDLL_WXLUA $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj & --- 680,685 ---- -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_28) & $(____BUILD_29) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WX_DIR)\contrib\include -dWXMAKINGDLL_WXLUA -dWXLUA_LUA_NEWTHREAD & ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj & *************** *** 870,874 **** -if exist ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll -if exist ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\wat_lib\wx.dll del ..\..\..\lib\wat_lib\wx.dll !ifeq SHARED 0 --- 871,875 ---- -if exist ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll del ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll -if exist ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\wat_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! -if exist ..\..\..\lib\wat_dll\wx.dll del ..\..\..\lib\wat_dll\wx.dll !ifeq SHARED 0 *************** *** 1040,1044 **** !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! ..\..\..\lib\wat_lib\wx.dll : $(MOD_LUAMODULE_OBJECTS) @%create watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc option quiet --- 1041,1045 ---- !ifeq SHARED 1 !ifeq USE_LUAMODULE 1 ! ..\..\..\lib\wat_dll\wx.dll : $(MOD_LUAMODULE_OBJECTS) @%create watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc option quiet *************** *** 1047,1051 **** @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(MOD_LUAMODULE_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc library %i @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc system nt_dll --- 1048,1052 ---- @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(MOD_LUAMODULE_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc library %i @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc @%append watcom$(WXLIBPOSTFIX)\mod_luamodule.lbc system nt_dll Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** makefile.gcc 20 May 2006 18:22:26 -0000 1.46 --- makefile.gcc 20 May 2006 20:17:57 -0000 1.47 *************** *** 221,225 **** -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_29) \ $(____BUILD_32) -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.o \ --- 221,225 ---- -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_29) \ $(____BUILD_32) -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -DWXLUA_LUA_NEWTHREAD $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.o \ *************** *** 232,236 **** -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_29) \ $(____BUILD_32) -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\includ... [truncated message content] |