Menu
▾
▴
[Wxlua-commit] wxLua/apps/build/msw apps_app_wxlua.dsp,1.1,1.2 apps_app_wxluaedit.dsp,1.1,1.2 makefile.bcc,1.11,1.12 makefile.gcc,1.11,1.12 makefile.vc,1.9,1.10 makefile.wat,1.11,1.12
|
From: John L. <jr...@us...> - 2005-11-29 23:52:20
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1493/wxLua/apps/build/msw Modified Files: apps_app_wxlua.dsp apps_app_wxluaedit.dsp makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: reorder libs in apps.bkl and rebake, (remove -- in bkl, got error) pulled in generic code in wxLuaInterface into the wxLuaState Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile.bcc 25 Nov 2005 23:06:10 -0000 1.11 --- makefile.bcc 29 Nov 2005 23:52:11 -0000 1.12 *************** *** 192,196 **** ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib 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 oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | !endif --- 192,196 ---- ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | !endif *************** *** 199,203 **** ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif --- 199,203 ---- ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32mt.lib,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif Index: apps_app_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** apps_app_wxlua.dsp 25 Nov 2005 23:08:13 -0000 1.1 --- apps_app_wxlua.dsp 29 Nov 2005 23:52:11 -0000 1.2 *************** *** 58,63 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release" --- 58,63 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Unicode Release" *************** *** 83,88 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug" --- 83,88 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Debug" *************** *** 108,113 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release" --- 108,113 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 DLL Release" *************** *** 133,138 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug" --- 133,138 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Debug" *************** *** 158,163 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Release" --- 158,163 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Unicode Release" *************** *** 183,188 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug" --- 183,188 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxlua - Win32 Debug" *************** *** 208,213 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Release" --- 208,213 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxlua - Win32 Release" *************** *** 233,238 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.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 /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ENDIF --- 233,238 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxlua.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ENDIF Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile.wat 25 Nov 2005 23:06:10 -0000 1.11 --- makefile.wat 29 Nov 2005 23:52:11 -0000 1.12 *************** *** 194,198 **** @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i ! @for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib 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)\app_wxlua.lbc library %i @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc --- 194,198 ---- @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc file %i ! @for %i in ( wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc library %i @%append watcom$(WXLIBPOSTFIX)\app_wxlua.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.res wlink @watcom$(WXLIBPOSTFIX)\app_wxlua.lbc *************** *** 207,211 **** @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc library %i @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res wlink @watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc --- 207,211 ---- @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(__DEBUGINFO_0) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc file %i ! @for %i in ( wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc library %i @%append watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res wlink @watcom$(WXLIBPOSTFIX)\app_wxluaedit.lbc Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile.gcc 25 Nov 2005 23:06:10 -0000 1.11 --- makefile.gcc 29 Nov 2005 23:52:11 -0000 1.12 *************** *** 164,173 **** ifeq ($(USE_WXLUAAPP),1) ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--subsystem,windows -mwindows -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -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 ifeq ($(USE_WXLUAEDITAPP),1) ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o ! $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--subsystem,windows -mwindows -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -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 --- 164,173 ---- ifeq ($(USE_WXLUAAPP),1) ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o ! $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--subsystem,windows -mwindows -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif ifeq ($(USE_WXLUAEDITAPP),1) ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o ! $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(__DEBUGINFO) -mthreads -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--subsystem,windows -mwindows -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif Index: apps_app_wxluaedit.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxluaedit.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** apps_app_wxluaedit.dsp 25 Nov 2005 23:08:13 -0000 1.1 --- apps_app_wxluaedit.dsp 29 Nov 2005 23:52:11 -0000 1.2 *************** *** 58,63 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxmsw26ud_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxmsw26ud_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 DLL Unicode Release" --- 58,63 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 DLL Unicode Release" *************** *** 83,88 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxmsw26u_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxmsw26u_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 DLL Debug" --- 83,88 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 DLL Debug" *************** *** 108,113 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxmsw26d_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxmsw26d_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 DLL Release" --- 108,113 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stedit.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stedit.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 DLL Release" *************** *** 133,138 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxmsw26_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxmsw26_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Unicode Debug" --- 133,138 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stedit.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stedit.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Unicode Debug" *************** *** 158,163 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxmsw26ud_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26ud_adv.lib wxbase26ud.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_xrc.lib wxmsw26ud_stc.lib wxmsw26ud_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Unicode Release" --- 158,163 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26ud_stedit.lib wxmsw26ud_stc.lib wxmsw26ud_xrc.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_adv.lib wxbase26ud_net.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxbase26ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Unicode Release" *************** *** 183,188 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxmsw26u_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26u_adv.lib wxbase26u.lib wxmsw26u_core.lib wxmsw26u_html.lib wxmsw26u_media.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_xrc.lib wxmsw26u_stc.lib wxmsw26u_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug" --- 183,188 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26u_stedit.lib wxmsw26u_stc.lib wxmsw26u_xrc.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_adv.lib wxbase26u_net.lib wxbase26u_xml.lib wxmsw26u_core.lib wxbase26u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Debug" *************** *** 208,213 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxmsw26d_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26d_adv.lib wxbase26d.lib wxmsw26d_core.lib wxmsw26d_html.lib wxmsw26d_media.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_xrc.lib wxmsw26d_stc.lib wxmsw26d_stedit.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release" --- 208,213 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stedit.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26d_stedit.lib wxmsw26d_stc.lib wxmsw26d_xrc.lib wxmsw26d_html.lib wxmsw26d_media.lib wxmsw26d_adv.lib wxbase26d_net.lib wxbase26d_xml.lib wxmsw26d_core.lib wxbase26d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows /debug !ELSEIF "$(CFG)" == "app_wxluaedit - Win32 Release" *************** *** 233,238 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxmsw26_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxluadebug.lib wxluasocket.lib wxlua.lib wxbind.lib lua.lib wxmsw26_adv.lib wxbase26.lib wxmsw26_core.lib wxmsw26_html.lib wxmsw26_media.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_xrc.lib wxmsw26_stc.lib wxmsw26_stedit.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows !ENDIF --- 233,238 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stedit.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /machine:i386 /out:"..\..\..\bin\wxluaedit.exe" /libpath:"$(WXWIN)\lib\vc_lib" /libpath:"..\..\..\lib\vc_lib" /subsystem:windows ! # ADD LINK32 wxluasocket.lib wxluadebug.lib wxbind.lib wxlua.lib lua.lib wxmsw26_stedit.lib wxmsw26_stc.lib wxmsw26_xrc.lib wxmsw26_html.lib wxmsw26_media.lib wxmsw26_adv.lib wxbase26_net.lib wxbase26_xml.lib wxmsw26_core.lib wxbase26.lib w... [truncated message content] |
