Menu
▾
▴
[Wxlua-commit] wxLua/modules/build/msw makefile.bcc,1.44,1.45 makefile.gcc,1.44,1.45 makefile.vc,1.43,1.44 makefile.wat,1.43,1.44 modules_mod_wxbind.dsp,1.25,1.26 modules_mod_wxbindstc.dsp,1.14,1.15
|
From: Francesco M. <fr...@us...> - 2006-05-20 14:17:49
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32690/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_wxbind.dsp modules_mod_wxbindstc.dsp Log Message: added STC to wxBindSTC dll linkstage Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** makefile.bcc 20 May 2006 13:12:34 -0000 1.44 --- makefile.bcc 20 May 2006 14:17:44 -0000 1.45 *************** *** 291,295 **** borland$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_data.obj \ - borland$(WXLIBPOSTFIX)\wxbind_lib_html.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_grid.obj \ borland$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj \ --- 291,294 ---- *************** *** 328,332 **** borland$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_data.obj \ - borland$(WXLIBPOSTFIX)\wxbind_dll_html.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_grid.obj \ borland$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj \ --- 327,330 ---- *************** *** 795,799 **** ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_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 $(WXBINDSTC_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_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.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ --- 793,797 ---- ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_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 $(WXBINDSTC_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_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 ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ *************** *** 1223,1229 **** $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_lib_html.obj: ..\..\wxbind\src\html.cpp - $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_lib_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** --- 1221,1224 ---- *************** *** 1313,1319 **** $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_dll_html.obj: ..\..\wxbind\src\html.cpp - $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_dll_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** --- 1308,1311 ---- Index: modules_mod_wxbind.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxbind.dsp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** modules_mod_wxbind.dsp 20 May 2006 13:12:35 -0000 1.25 --- modules_mod_wxbind.dsp 20 May 2006 14:17:44 -0000 1.26 *************** *** 509,516 **** # Begin Source File - SOURCE=..\..\wxbind\src\html.cpp - # End Source File - # Begin Source File - SOURCE=..\..\wxbind\src\image.cpp # End Source File --- 509,512 ---- Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** makefile.wat 20 May 2006 13:12:34 -0000 1.43 --- makefile.wat 20 May 2006 14:17:44 -0000 1.44 *************** *** 697,701 **** watcom$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_data.obj & - watcom$(WXLIBPOSTFIX)\wxbind_lib_html.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_grid.obj & watcom$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj & --- 697,700 ---- *************** *** 734,738 **** watcom$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_data.obj & - watcom$(WXLIBPOSTFIX)\wxbind_dll_html.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_grid.obj & watcom$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj & --- 733,736 ---- *************** *** 978,982 **** @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXBINDSTC_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_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) do @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc library %i @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc system nr_dll --- 976,980 ---- @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXBINDSTC_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc file %i ! @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_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) do @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc library %i @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc @%append watcom$(WXLIBPOSTFIX)\wxbindstc_dll.lbc system nr_dll *************** *** 1438,1444 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_lib_html.obj : .AUTODEPEND ..\..\wxbind\src\html.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_lib_grid.obj : .AUTODEPEND ..\..\wxbind\src\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< --- 1436,1439 ---- *************** *** 1528,1534 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_dll_html.obj : .AUTODEPEND ..\..\wxbind\src\html.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_dll_grid.obj : .AUTODEPEND ..\..\wxbind\src\grid.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_DLL_CXXFLAGS) $< --- 1523,1526 ---- Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** makefile.gcc 20 May 2006 13:12:34 -0000 1.44 --- makefile.gcc 20 May 2006 14:17:44 -0000 1.45 *************** *** 249,253 **** mingw$(WXLIBPOSTFIX)\wxbind_lib_geometry.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_data.o \ - mingw$(WXLIBPOSTFIX)\wxbind_lib_html.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_grid.o \ mingw$(WXLIBPOSTFIX)\wxbind_lib_mdi.o \ --- 249,252 ---- *************** *** 286,290 **** mingw$(WXLIBPOSTFIX)\wxbind_dll_geometry.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_data.o \ - mingw$(WXLIBPOSTFIX)\wxbind_dll_html.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_grid.o \ mingw$(WXLIBPOSTFIX)\wxbind_dll_mdi.o \ --- 285,288 ---- *************** *** 865,869 **** ifeq ($(USE_WXBINDSTC),1) ..\..\..\lib\gcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_32) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.a -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif --- 863,867 ---- ifeq ($(USE_WXBINDSTC),1) ..\..\..\lib\gcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBINDSTC_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_32) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,..\..\..\lib\gcc_dll\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.a -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif endif *************** *** 1292,1298 **** $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxbind_lib_html.o: ../../wxbind/src/html.cpp - $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxbind_lib_grid.o: ../../wxbind/src/grid.cpp $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< --- 1290,1293 ---- *************** *** 1382,1388 **** $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxbind_dll_html.o: ../../wxbind/src/html.cpp - $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxbind_dll_grid.o: ../../wxbind/src/grid.cpp $(CXX) -c -o $@ $(WXBIND_DLL_CXXFLAGS) $(CPPDEPS) $< --- 1377,1380 ---- Index: modules_mod_wxbindstc.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxbindstc.dsp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** modules_mod_wxbindstc.dsp 20 May 2006 13:12:35 -0000 1.14 --- modules_mod_wxbindstc.dsp 20 May 2006 14:17:44 -0000 1.15 *************** *** 66,71 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Debug Multilib" --- 66,71 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxmsw26ud.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Debug Multilib" *************** *** 91,96 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Release Monolithic" --- 91,96 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26ud_wxlua.lib wxlua_msw26ud_lua.lib wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26ud_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Release Monolithic" *************** *** 116,121 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Release Multilib" --- 116,121 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxmsw26u.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Unicode Release Multilib" *************** *** 141,146 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Debug Monolithic" --- 141,146 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26u_wxlua.lib wxlua_msw26u_lua.lib wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26u_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Debug Monolithic" *************** *** 166,171 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Debug Multilib" --- 166,171 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxmsw26d.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Debug Multilib" *************** *** 191,196 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Release Monolithic" --- 191,196 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug ! # ADD LINK32 wxlua_msw26d_wxlua.lib wxlua_msw26d_lua.lib wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26d_wxbindstc.lib" /debug !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Release Monolithic" *************** *** 216,221 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxmsw26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Release Multilib" --- 216,221 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxmsw26.lib wxmsw26_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxmsw26.lib wxmsw26_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 DLL Release Multilib" *************** *** 241,246 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 Unicode Debug Monolithic" --- 241,246 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.lib" ! # ADD LINK32 wxlua_msw26_wxlua.lib wxlua_msw26_lua.lib wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxbindstc.lib" !ELSEIF "$(CFG)" == "mod_wxbindstc - Win32 Unicode Debug Monolithic" Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** makefile.vc 20 May 2006 13:12:34 -0000 1.43 --- makefile.vc 20 May 2006 14:17:44 -0000 1.44 *************** *** 272,276 **** msvc$(WXLIBPOSTFIX)\wxbind_lib_geometry.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_data.obj \ - msvc$(WXLIBPOSTFIX)\wxbind_lib_html.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_grid.obj \ msvc$(WXLIBPOSTFIX)\wxbind_lib_mdi.obj \ --- 272,275 ---- *************** *** 312,316 **** msvc$(WXLIBPOSTFIX)\wxbind_dll_geometry.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_data.obj \ - msvc$(WXLIBPOSTFIX)\wxbind_dll_html.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_grid.obj \ msvc$(WXLIBPOSTFIX)\wxbind_dll_mdi.obj \ --- 311,314 ---- *************** *** 792,796 **** ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXBINDSTC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_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_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib << !endif --- 790,794 ---- ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: $(WXBINDSTC_DLL_OBJECTS) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXBINDSTC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_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_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib << !endif *************** *** 1217,1223 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxbind_lib_html.obj: ..\..\wxbind\src\html.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxbind_lib_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** --- 1215,1218 ---- *************** *** 1307,1313 **** $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxbind_dll_html.obj: ..\..\wxbind\src\html.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxbind_dll_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_DLL_CXXFLAGS) $** --- 1302,1305 ---- |
