From 538b7569e566bf74101fbceb44aed581aa8f8c6f Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 4 Aug 2003 12:57:59 +0000 Subject: [PATCH] static libs depend on 3rd party ones now, too (for convenience) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 45 +++++++++++++++++++++++---------------------- build/makefile.bcc | 20 ++++++++++---------- build/makefile.gcc | 20 ++++++++++---------- build/makefile.vc | 20 ++++++++++---------- build/makefile.wat | 20 ++++++++++---------- 5 files changed, 63 insertions(+), 62 deletions(-) diff --git a/Makefile.in b/Makefile.in index e3fd78bbb4..6e86f6e229 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1241,6 +1241,7 @@ COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR = \ wx/msw/gccpriv.h \ wx/msw/mimetype.h \ wx/msw/winundef.h \ + wx/msw/wrapcctl.h \ wx/msw/wrapwin.h @COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR) @COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = @@ -6037,7 +6038,7 @@ advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a: $(ADVLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a: $(ADVLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ $(ADVLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@ @@ -6409,7 +6410,7 @@ basedll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp basedll_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(BASELIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(BASELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(BASELIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ @@ -8099,9 +8100,6 @@ coredll_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_GTK_USE_GUI_1@coredll_pen.o: $(srcdir)/src/gtk/pen.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/cocoa/pen.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_pen.o: $(srcdir)/src/x11/pen.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8111,6 +8109,9 @@ coredll_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_MGL_USE_GUI_1@coredll_pen.o: $(srcdir)/src/mgl/pen.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/cocoa/pen.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + coredll_penwin.o: $(srcdir)/src/msw/penwin.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -8789,7 +8790,7 @@ coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp @COND_USE_GUI_1@coredll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a: $(CORELIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a: $(CORELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ $(CORELIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@ @@ -10153,9 +10154,6 @@ corelib_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_GTK_USE_GUI_1@corelib_pen.o: $(srcdir)/src/gtk/pen.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/cocoa/pen.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_pen.o: $(srcdir)/src/x11/pen.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10165,6 +10163,9 @@ corelib_notebmac.o: $(srcdir)/src/mac/notebmac.cpp @COND_TOOLKIT_MGL_USE_GUI_1@corelib_pen.o: $(srcdir)/src/mgl/pen.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/cocoa/pen.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + corelib_penwin.o: $(srcdir)/src/msw/penwin.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -10850,7 +10851,7 @@ corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a: $(DBGRIDLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a: $(DBGRIDLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(AR) rcu $@ $(DBGRIDLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(RANLIB) $@ @@ -10881,7 +10882,7 @@ distclean: clean @COND_TOOLKIT_MSW@gldll_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $< -@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a: $(GLLIB_OBJECTS) +@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a: $(GLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ rm -f $@ @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(AR) rcu $@ $(GLLIB_OBJECTS) @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(RANLIB) $@ @@ -10971,7 +10972,7 @@ htmldll_m_tables.o: $(srcdir)/src/html/m_tables.cpp htmldll_winpars.o: $(srcdir)/src/html/winpars.cpp $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a: $(HTMLLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a: $(HTMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(AR) rcu $@ $(HTMLLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(RANLIB) $@ @@ -12867,9 +12868,6 @@ monodll_object.o: $(srcdir)/src/common/object.cpp @COND_TOOLKIT_GTK_USE_GUI_1@monodll_pen.o: $(srcdir)/src/gtk/pen.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/cocoa/pen.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_pen.o: $(srcdir)/src/x11/pen.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12879,6 +12877,9 @@ monodll_object.o: $(srcdir)/src/common/object.cpp @COND_TOOLKIT_MGL_USE_GUI_1@monodll_pen.o: $(srcdir)/src/mgl/pen.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/cocoa/pen.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_penwin.o: $(srcdir)/src/msw/penwin.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -13731,7 +13732,7 @@ monodll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp monodll_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_MONOLITHIC_1_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(MONOLIB_OBJECTS) +@COND_MONOLITHIC_1_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(MONOLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_1_SHARED_0@ rm -f $@ @COND_MONOLITHIC_1_SHARED_0@ $(AR) rcu $@ $(MONOLIB_OBJECTS) @COND_MONOLITHIC_1_SHARED_0@ $(RANLIB) $@ @@ -15383,9 +15384,6 @@ monolib_object.o: $(srcdir)/src/common/object.cpp @COND_TOOLKIT_GTK_USE_GUI_1@monolib_pen.o: $(srcdir)/src/gtk/pen.cpp @COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/cocoa/pen.cpp -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_pen.o: $(srcdir)/src/x11/pen.cpp @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -15395,6 +15393,9 @@ monolib_object.o: $(srcdir)/src/common/object.cpp @COND_TOOLKIT_MGL_USE_GUI_1@monolib_pen.o: $(srcdir)/src/mgl/pen.cpp @COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/cocoa/pen.mm +@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_penwin.o: $(srcdir)/src/msw/penwin.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -16299,7 +16300,7 @@ netdll_socket.o: $(srcdir)/src/common/socket.cpp netdll_url.o: $(srcdir)/src/common/url.cpp $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a: $(NETLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a: $(NETLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(NETLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ @@ -16362,7 +16363,7 @@ odbcdll_db.o: $(srcdir)/src/common/db.cpp odbcdll_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a: $(ODBCLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a: $(ODBCLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(AR) rcu $@ $(ODBCLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(RANLIB) $@ @@ -16819,7 +16820,7 @@ wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a: $(XMLLIB_OBJECTS) +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a: $(XMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(XMLLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ diff --git a/build/makefile.bcc b/build/makefile.bcc index 53376734b2..30fec18634 100644 --- a/build/makefile.bcc +++ b/build/makefile.bcc @@ -8785,7 +8785,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bc !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(ADVLIB_OBJECTS) $(OBJS)\advlib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(ADVLIB_OBJECTS) $(OBJS)\advlib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ tlib /a /p2048 $@ @&&| $(ADVLIB_OBJECTS) @@ -8801,7 +8801,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(BAS !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(BASELIB_OBJECTS) $(OBJS)\baselib_dummy.obj +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(BASELIB_OBJECTS) $(OBJS)\baselib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ tlib /a /p2048 $@ @&&| $(BASELIB_OBJECTS) @@ -8857,7 +8857,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_b !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(CORELIB_OBJECTS) $(OBJS)\corelib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(CORELIB_OBJECTS) $(OBJS)\corelib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ tlib /a /p2048 $@ @&&| $(CORELIB_OBJECTS) @@ -8873,7 +8873,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(DBGRIDLIB_OBJECTS) $(OBJS)\dbgridlib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(DBGRIDLIB_OBJECTS) $(OBJS)\dbgridlib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ tlib /a /p2048 $@ @&&| $(DBGRIDLIB_OBJECTS) @@ -8889,7 +8889,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc !endif !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(GLLIB_OBJECTS) $(OBJS)\gllib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(GLLIB_OBJECTS) $(OBJS)\gllib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ tlib /a /p2048 $@ @&&| $(GLLIB_OBJECTS) @@ -8905,7 +8905,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_b !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(HTMLLIB_OBJECTS) $(OBJS)\htmllib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(HTMLLIB_OBJECTS) $(OBJS)\htmllib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ tlib /a /p2048 $@ @&&| $(HTMLLIB_OBJECTS) @@ -8927,7 +8927,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(V !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(MONOLIB_OBJECTS) $(OBJS)\monolib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(MONOLIB_OBJECTS) $(OBJS)\monolib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ tlib /a /p2048 $@ @&&| $(MONOLIB_OBJECTS) @@ -8946,7 +8946,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_bcc$(VENDORTAG).dll: $ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS) $(OBJS)\netlib_dummy.obj +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS) $(OBJS)\netlib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ tlib /a /p2048 $@ @&&| $(NETLIB_OBJECTS) @@ -8962,7 +8962,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll: !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(ODBCLIB_OBJECTS) $(OBJS)\odbclib_dummy.obj +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(ODBCLIB_OBJECTS) $(OBJS)\odbclib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ tlib /a /p2048 $@ @&&| $(ODBCLIB_OBJECTS) @@ -9025,7 +9025,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_bcc$(VENDORTAG).dll: $ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(XMLLIB_OBJECTS) $(OBJS)\xmllib_dummy.obj +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(XMLLIB_OBJECTS) $(OBJS)\xmllib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ tlib /a /p2048 $@ @&&| $(XMLLIB_OBJECTS) diff --git a/build/makefile.gcc b/build/makefile.gcc index a1656482c1..c0302c32d2 100644 --- a/build/makefile.gcc +++ b/build/makefile.gcc @@ -9262,7 +9262,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a: $(ADVLIB_OBJECTS) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.a: $(ADVLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a if exist $@ del $@ ar rcu $@ $(ADVLIB_OBJECTS) ranlib $@ @@ -9279,7 +9279,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) -$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(BASELIB_OBJECTS) +$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(BASELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a if exist $@ del $@ ar rcu $@ $(BASELIB_OBJECTS) ranlib $@ @@ -9337,7 +9337,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a: $(CORELIB_OBJECTS) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.a: $(CORELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a if exist $@ del $@ ar rcu $@ $(CORELIB_OBJECTS) ranlib $@ @@ -9360,7 +9360,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) ifeq ($(USE_ODBC),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a: $(DBGRIDLIB_OBJECTS) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.a: $(DBGRIDLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a if exist $@ del $@ ar rcu $@ $(DBGRIDLIB_OBJECTS) ranlib $@ @@ -9381,7 +9381,7 @@ endif ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) ifeq ($(USE_OPENGL),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a: $(GLLIB_OBJECTS) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a: $(GLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a if exist $@ del $@ ar rcu $@ $(GLLIB_OBJECTS) ranlib $@ @@ -9401,7 +9401,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_HTML),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a: $(HTMLLIB_OBJECTS) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.a: $(HTMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a if exist $@ del $@ ar rcu $@ $(HTMLLIB_OBJECTS) ranlib $@ @@ -9424,7 +9424,7 @@ endif ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),0) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(MONOLIB_OBJECTS) +$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(MONOLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a if exist $@ del $@ ar rcu $@ $(MONOLIB_OBJECTS) ranlib $@ @@ -9443,7 +9443,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) -$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a: $(NETLIB_OBJECTS) +$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.a: $(NETLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a if exist $@ del $@ ar rcu $@ $(NETLIB_OBJECTS) ranlib $@ @@ -9465,7 +9465,7 @@ ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) ifeq ($(USE_GUI),1) ifeq ($(USE_ODBC),1) -$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a: $(ODBCLIB_OBJECTS) +$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a: $(ODBCLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a if exist $@ del $@ ar rcu $@ $(ODBCLIB_OBJECTS) ranlib $@ @@ -9524,7 +9524,7 @@ endif ifeq ($(MONOLITHIC),0) ifeq ($(SHARED),0) -$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a: $(XMLLIB_OBJECTS) +$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a: $(XMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a if exist $@ del $@ ar rcu $@ $(XMLLIB_OBJECTS) ranlib $@ diff --git a/build/makefile.vc b/build/makefile.vc index c5f12883ab..dc0d570ce1 100644 --- a/build/makefile.vc +++ b/build/makefile.vc @@ -9348,7 +9348,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(ADVLIB_OBJECTS) $(OBJS)\advlib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib: $(ADVLIB_OBJECTS) $(OBJS)\advlib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(ADVLIB_OBJECTS) @@ -9363,7 +9363,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(BASE !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(BASELIB_OBJECTS) $(OBJS)\baselib_dummy.obj +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(BASELIB_OBJECTS) $(OBJS)\baselib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(BASELIB_OBJECTS) @@ -9418,7 +9418,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_v !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(CORELIB_OBJECTS) $(OBJS)\corelib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib: $(CORELIB_OBJECTS) $(OBJS)\corelib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(CORELIB_OBJECTS) @@ -9433,7 +9433,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(DBGRIDLIB_OBJECTS) $(OBJS)\dbgridlib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib: $(DBGRIDLIB_OBJECTS) $(OBJS)\dbgridlib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(DBGRIDLIB_OBJECTS) @@ -9448,7 +9448,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$ !endif !if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(GLLIB_OBJECTS) $(OBJS)\gllib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib: $(GLLIB_OBJECTS) $(OBJS)\gllib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(GLLIB_OBJECTS) @@ -9463,7 +9463,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_v !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_HTML)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(HTMLLIB_OBJECTS) $(OBJS)\htmllib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib: $(HTMLLIB_OBJECTS) $(OBJS)\htmllib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(HTMLLIB_OBJECTS) @@ -9484,7 +9484,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VE !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(MONOLIB_OBJECTS) $(OBJS)\monolib_dummy.obj +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(MONOLIB_OBJECTS) $(OBJS)\monolib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(MONOLIB_OBJECTS) @@ -9502,7 +9502,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_vc$(VENDORTAG).dll: $( !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS) $(OBJS)\netlib_dummy.obj +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(NETLIB_OBJECTS) $(OBJS)\netlib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(NETLIB_OBJECTS) @@ -9517,7 +9517,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll: $ !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(ODBCLIB_OBJECTS) $(OBJS)\odbclib_dummy.obj +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(ODBCLIB_OBJECTS) $(OBJS)\odbclib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(ODBCLIB_OBJECTS) @@ -9579,7 +9579,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_vc$(VENDORTAG).dll: $( !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(XMLLIB_OBJECTS) $(OBJS)\xmllib_dummy.obj +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib: $(XMLLIB_OBJECTS) $(OBJS)\xmllib_dummy.obj $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib if exist $@ del $@ lib /NOLOGO /OUT:$@ @<< $(XMLLIB_OBJECTS) diff --git a/build/makefile.wat b/build/makefile.wat index 55ff3becca..83bae67a2e 100644 --- a/build/makefile.wat +++ b/build/makefile.wat @@ -9370,7 +9370,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wa !ifeq MONOLITHIC 0 !ifeq SHARED 0 !ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib : $(ADVLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib : $(ADVLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\advlib.lbc @for %i in ($(ADVLIB_OBJECTS)) do @%append $(OBJS)\advlib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\advlib.lbc @@ -9397,7 +9397,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(VENDORTAG).dll : $(B !ifeq MONOLITHIC 0 !ifeq SHARED 0 -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : $(BASELIB_OBJECTS) +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : $(BASELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\baselib.lbc @for %i in ($(BASELIB_OBJECTS)) do @%append $(OBJS)\baselib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\baselib.lbc @@ -9468,7 +9468,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core_w !ifeq MONOLITHIC 0 !ifeq SHARED 0 !ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib : $(CORELIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib : $(CORELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\corelib.lbc @for %i in ($(CORELIB_OBJECTS)) do @%append $(OBJS)\corelib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\corelib.lbc @@ -9501,7 +9501,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid !ifeq SHARED 0 !ifeq USE_GUI 1 !ifeq USE_ODBC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib : $(DBGRIDLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid.lib : $(DBGRIDLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\dbgridlib.lbc @for %i in ($(DBGRIDLIB_OBJECTS)) do @%append $(OBJS)\dbgridlib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\dbgridlib.lbc @@ -9532,7 +9532,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat !ifeq SHARED 0 !ifeq USE_GUI 1 !ifeq USE_OPENGL 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib : $(GLLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib : $(GLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\gllib.lbc @for %i in ($(GLLIB_OBJECTS)) do @%append $(OBJS)\gllib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\gllib.lbc @@ -9562,7 +9562,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html_w !ifeq MONOLITHIC 0 !ifeq SHARED 0 !ifeq USE_HTML 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib : $(HTMLLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib : $(HTMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\htmllib.lbc @for %i in ($(HTMLLIB_OBJECTS)) do @%append $(OBJS)\htmllib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\htmllib.lbc @@ -9595,7 +9595,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(V !ifeq MONOLITHIC 1 !ifeq SHARED 0 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : $(MONOLIB_OBJECTS) +$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : $(MONOLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\monolib.lbc @for %i in ($(MONOLIB_OBJECTS)) do @%append $(OBJS)\monolib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\monolib.lbc @@ -9624,7 +9624,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net_wat$(VENDORTAG).dll : !ifeq MONOLITHIC 0 !ifeq SHARED 0 -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib : $(NETLIB_OBJECTS) +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib : $(NETLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\netlib.lbc @for %i in ($(NETLIB_OBJECTS)) do @%append $(OBJS)\netlib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\netlib.lbc @@ -9656,7 +9656,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll : !ifeq SHARED 0 !ifeq USE_GUI 1 !ifeq USE_ODBC 1 -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib : $(ODBCLIB_OBJECTS) +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib : $(ODBCLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\odbclib.lbc @for %i in ($(ODBCLIB_OBJECTS)) do @%append $(OBJS)\odbclib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\odbclib.lbc @@ -9725,7 +9725,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml_wat$(VENDORTAG).dll : !ifeq MONOLITHIC 0 !ifeq SHARED 0 -$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib : $(XMLLIB_OBJECTS) +$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.lib : $(XMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib @%create $(OBJS)\xmllib.lbc @for %i in ($(XMLLIB_OBJECTS)) do @%append $(OBJS)\xmllib.lbc +%i wlib -q -p2048 -n -b $^@ @$(OBJS)\xmllib.lbc -- 2.45.2