From 56d5b4b8609c49932530e3963ff35948afb2dc4c Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Fri, 27 Oct 2006 09:57:42 +0000 Subject: [PATCH] Rebake for new tar streams. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 53 +++++++++++++++++++++++++++++++++++++++ build/bakefiles/files.bkl | 4 +++ build/msw/makefile.bcc | 48 +++++++++++++++++++++++++++++++++++ build/msw/makefile.gcc | 48 +++++++++++++++++++++++++++++++++++ build/msw/makefile.vc | 48 +++++++++++++++++++++++++++++++++++ build/msw/makefile.wat | 48 +++++++++++++++++++++++++++++++++++ build/msw/wx_base.dsp | 16 ++++++++++++ src/wxWindows.dsp | 16 ++++++++++++ wxGTK.spec | 1 + wxMotif.spec | 1 + wxX11.spec | 1 + 11 files changed, 284 insertions(+) diff --git a/Makefile.in b/Makefile.in index cccf474e27..16ddf54e76 100644 --- a/Makefile.in +++ b/Makefile.in @@ -308,6 +308,7 @@ ALL_BASE_HEADERS = \ wx/stream.h \ wx/string.h \ wx/sysopt.h \ + wx/tarstrm.h \ wx/textbuf.h \ wx/textfile.h \ wx/thread.h \ @@ -441,6 +442,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/stream.h \ wx/string.h \ wx/sysopt.h \ + wx/tarstrm.h \ wx/textbuf.h \ wx/textfile.h \ wx/thread.h \ @@ -523,6 +525,8 @@ ALL_PORTS_BASE_HEADERS = \ wx/dbtable.h ALL_BASE_SOURCES = \ src/common/appbase.cpp \ + src/common/arcall.cpp \ + src/common/arcfind.cpp \ src/common/archive.cpp \ src/common/clntdata.cpp \ src/common/cmdline.cpp \ @@ -572,6 +576,7 @@ ALL_BASE_SOURCES = \ src/common/stream.cpp \ src/common/string.cpp \ src/common/sysopt.cpp \ + src/common/tarstrm.cpp \ src/common/textbuf.cpp \ src/common/textfile.cpp \ src/common/tokenzr.cpp \ @@ -675,6 +680,8 @@ MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \ MONODLL_OBJECTS = \ $(__monodll___win32rc) \ monodll_appbase.o \ + monodll_arcall.o \ + monodll_arcfind.o \ monodll_archive.o \ monodll_clntdata.o \ monodll_cmdline.o \ @@ -724,6 +731,7 @@ MONODLL_OBJECTS = \ monodll_stream.o \ monodll_string.o \ monodll_sysopt.o \ + monodll_tarstrm.o \ monodll_textbuf.o \ monodll_textfile.o \ monodll_tokenzr.o \ @@ -771,6 +779,8 @@ MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \ -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = \ monolib_appbase.o \ + monolib_arcall.o \ + monolib_arcfind.o \ monolib_archive.o \ monolib_clntdata.o \ monolib_cmdline.o \ @@ -820,6 +830,7 @@ MONOLIB_OBJECTS = \ monolib_stream.o \ monolib_string.o \ monolib_sysopt.o \ + monolib_tarstrm.o \ monolib_textbuf.o \ monolib_textfile.o \ monolib_tokenzr.o \ @@ -869,6 +880,8 @@ BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \ BASEDLL_OBJECTS = \ $(__basedll___win32rc) \ basedll_appbase.o \ + basedll_arcall.o \ + basedll_arcfind.o \ basedll_archive.o \ basedll_clntdata.o \ basedll_cmdline.o \ @@ -918,6 +931,7 @@ BASEDLL_OBJECTS = \ basedll_stream.o \ basedll_string.o \ basedll_sysopt.o \ + basedll_tarstrm.o \ basedll_textbuf.o \ basedll_textfile.o \ basedll_tokenzr.o \ @@ -950,6 +964,8 @@ BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \ -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS) BASELIB_OBJECTS = \ baselib_appbase.o \ + baselib_arcall.o \ + baselib_arcfind.o \ baselib_archive.o \ baselib_clntdata.o \ baselib_cmdline.o \ @@ -999,6 +1015,7 @@ BASELIB_OBJECTS = \ baselib_stream.o \ baselib_string.o \ baselib_sysopt.o \ + baselib_tarstrm.o \ baselib_textbuf.o \ baselib_textfile.o \ baselib_tokenzr.o \ @@ -12133,6 +12150,12 @@ monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP) monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp +monodll_arcall.o: $(srcdir)/src/common/arcall.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/arcall.cpp + +monodll_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp + monodll_archive.o: $(srcdir)/src/common/archive.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/archive.cpp @@ -12280,6 +12303,9 @@ monodll_string.o: $(srcdir)/src/common/string.cpp $(MONODLL_ODEP) monodll_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp +monodll_tarstrm.o: $(srcdir)/src/common/tarstrm.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/tarstrm.cpp + monodll_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textbuf.cpp @@ -16216,6 +16242,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp +monolib_arcall.o: $(srcdir)/src/common/arcall.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arcall.cpp + +monolib_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp + monolib_archive.o: $(srcdir)/src/common/archive.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/archive.cpp @@ -16363,6 +16395,9 @@ monolib_string.o: $(srcdir)/src/common/string.cpp $(MONOLIB_ODEP) monolib_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp +monolib_tarstrm.o: $(srcdir)/src/common/tarstrm.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/tarstrm.cpp + monolib_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textbuf.cpp @@ -20302,6 +20337,12 @@ basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP) basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp +basedll_arcall.o: $(srcdir)/src/common/arcall.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/arcall.cpp + +basedll_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp + basedll_archive.o: $(srcdir)/src/common/archive.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/archive.cpp @@ -20449,6 +20490,9 @@ basedll_string.o: $(srcdir)/src/common/string.cpp $(BASEDLL_ODEP) basedll_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp +basedll_tarstrm.o: $(srcdir)/src/common/tarstrm.cpp $(BASEDLL_ODEP) + $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/tarstrm.cpp + basedll_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/textbuf.cpp @@ -20878,6 +20922,12 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP) baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp +baselib_arcall.o: $(srcdir)/src/common/arcall.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/arcall.cpp + +baselib_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/arcfind.cpp + baselib_archive.o: $(srcdir)/src/common/archive.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/archive.cpp @@ -21025,6 +21075,9 @@ baselib_string.o: $(srcdir)/src/common/string.cpp $(BASELIB_ODEP) baselib_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp +baselib_tarstrm.o: $(srcdir)/src/common/tarstrm.cpp $(BASELIB_ODEP) + $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/tarstrm.cpp + baselib_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/textbuf.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 69ddb8c7cc..a9221ee003 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -289,6 +289,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/appbase.cpp + src/common/arcall.cpp + src/common/arcfind.cpp src/common/archive.cpp src/common/clntdata.cpp src/common/cmdline.cpp @@ -338,6 +340,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/stream.cpp src/common/string.cpp src/common/sysopt.cpp + src/common/tarstrm.cpp src/common/textbuf.cpp src/common/textfile.cpp src/common/tokenzr.cpp @@ -447,6 +450,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/stream.h wx/string.h wx/sysopt.h + wx/tarstrm.h wx/textbuf.h wx/textfile.h wx/thread.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index f5e4a57541..62e84e3443 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -203,6 +203,8 @@ MONODLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.obj \ $(OBJS)\monodll_appbase.obj \ + $(OBJS)\monodll_arcall.obj \ + $(OBJS)\monodll_arcfind.obj \ $(OBJS)\monodll_archive.obj \ $(OBJS)\monodll_clntdata.obj \ $(OBJS)\monodll_cmdline.obj \ @@ -252,6 +254,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_stream.obj \ $(OBJS)\monodll_string.obj \ $(OBJS)\monodll_sysopt.obj \ + $(OBJS)\monodll_tarstrm.obj \ $(OBJS)\monodll_textbuf.obj \ $(OBJS)\monodll_textfile.obj \ $(OBJS)\monodll_tokenzr.obj \ @@ -320,6 +323,8 @@ MONOLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.obj \ $(OBJS)\monolib_appbase.obj \ + $(OBJS)\monolib_arcall.obj \ + $(OBJS)\monolib_arcfind.obj \ $(OBJS)\monolib_archive.obj \ $(OBJS)\monolib_clntdata.obj \ $(OBJS)\monolib_cmdline.obj \ @@ -369,6 +374,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_stream.obj \ $(OBJS)\monolib_string.obj \ $(OBJS)\monolib_sysopt.obj \ + $(OBJS)\monolib_tarstrm.obj \ $(OBJS)\monolib_textbuf.obj \ $(OBJS)\monolib_textfile.obj \ $(OBJS)\monolib_tokenzr.obj \ @@ -438,6 +444,8 @@ BASEDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.obj \ $(OBJS)\basedll_appbase.obj \ + $(OBJS)\basedll_arcall.obj \ + $(OBJS)\basedll_arcfind.obj \ $(OBJS)\basedll_archive.obj \ $(OBJS)\basedll_clntdata.obj \ $(OBJS)\basedll_cmdline.obj \ @@ -487,6 +495,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_stream.obj \ $(OBJS)\basedll_string.obj \ $(OBJS)\basedll_sysopt.obj \ + $(OBJS)\basedll_tarstrm.obj \ $(OBJS)\basedll_textbuf.obj \ $(OBJS)\basedll_textfile.obj \ $(OBJS)\basedll_tokenzr.obj \ @@ -540,6 +549,8 @@ BASELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.obj \ $(OBJS)\baselib_appbase.obj \ + $(OBJS)\baselib_arcall.obj \ + $(OBJS)\baselib_arcfind.obj \ $(OBJS)\baselib_archive.obj \ $(OBJS)\baselib_clntdata.obj \ $(OBJS)\baselib_cmdline.obj \ @@ -589,6 +600,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_stream.obj \ $(OBJS)\baselib_string.obj \ $(OBJS)\baselib_sysopt.obj \ + $(OBJS)\baselib_tarstrm.obj \ $(OBJS)\baselib_textbuf.obj \ $(OBJS)\baselib_textfile.obj \ $(OBJS)\baselib_tokenzr.obj \ @@ -4488,6 +4500,12 @@ $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -4635,6 +4653,9 @@ $(OBJS)\monodll_string.obj: ..\..\src\common\string.cpp $(OBJS)\monodll_sysopt.obj: ..\..\src\common\sysopt.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_tarstrm.obj: ..\..\src\common\tarstrm.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6455,6 +6476,12 @@ $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_arcall.obj: ..\..\src\common\arcall.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_arcfind.obj: ..\..\src\common\arcfind.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -6602,6 +6629,9 @@ $(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp $(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_tarstrm.obj: ..\..\src\common\tarstrm.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8425,6 +8455,12 @@ $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_arcall.obj: ..\..\src\common\arcall.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + +$(OBJS)\basedll_arcfind.obj: ..\..\src\common\arcfind.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -8572,6 +8608,9 @@ $(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp $(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_tarstrm.obj: ..\..\src\common\tarstrm.cpp + $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -8683,6 +8722,12 @@ $(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_arcall.obj: ..\..\src\common\arcall.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + +$(OBJS)\baselib_arcfind.obj: ..\..\src\common\arcfind.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** @@ -8830,6 +8875,9 @@ $(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp $(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_tarstrm.obj: ..\..\src\common\tarstrm.cpp + $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 7552c4d2e0..6b9525e615 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -189,6 +189,8 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.o \ $(OBJS)\monodll_version_rc.o \ $(OBJS)\monodll_appbase.o \ + $(OBJS)\monodll_arcall.o \ + $(OBJS)\monodll_arcfind.o \ $(OBJS)\monodll_archive.o \ $(OBJS)\monodll_clntdata.o \ $(OBJS)\monodll_cmdline.o \ @@ -238,6 +240,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_stream.o \ $(OBJS)\monodll_string.o \ $(OBJS)\monodll_sysopt.o \ + $(OBJS)\monodll_tarstrm.o \ $(OBJS)\monodll_textbuf.o \ $(OBJS)\monodll_textfile.o \ $(OBJS)\monodll_tokenzr.o \ @@ -306,6 +309,8 @@ MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.o \ $(OBJS)\monolib_appbase.o \ + $(OBJS)\monolib_arcall.o \ + $(OBJS)\monolib_arcfind.o \ $(OBJS)\monolib_archive.o \ $(OBJS)\monolib_clntdata.o \ $(OBJS)\monolib_cmdline.o \ @@ -355,6 +360,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_stream.o \ $(OBJS)\monolib_string.o \ $(OBJS)\monolib_sysopt.o \ + $(OBJS)\monolib_tarstrm.o \ $(OBJS)\monolib_textbuf.o \ $(OBJS)\monolib_textfile.o \ $(OBJS)\monolib_tokenzr.o \ @@ -425,6 +431,8 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.o \ $(OBJS)\basedll_version_rc.o \ $(OBJS)\basedll_appbase.o \ + $(OBJS)\basedll_arcall.o \ + $(OBJS)\basedll_arcfind.o \ $(OBJS)\basedll_archive.o \ $(OBJS)\basedll_clntdata.o \ $(OBJS)\basedll_cmdline.o \ @@ -474,6 +482,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_stream.o \ $(OBJS)\basedll_string.o \ $(OBJS)\basedll_sysopt.o \ + $(OBJS)\basedll_tarstrm.o \ $(OBJS)\basedll_textbuf.o \ $(OBJS)\basedll_textfile.o \ $(OBJS)\basedll_tokenzr.o \ @@ -527,6 +536,8 @@ BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.o \ $(OBJS)\baselib_appbase.o \ + $(OBJS)\baselib_arcall.o \ + $(OBJS)\baselib_arcfind.o \ $(OBJS)\baselib_archive.o \ $(OBJS)\baselib_clntdata.o \ $(OBJS)\baselib_cmdline.o \ @@ -576,6 +587,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_stream.o \ $(OBJS)\baselib_string.o \ $(OBJS)\baselib_sysopt.o \ + $(OBJS)\baselib_tarstrm.o \ $(OBJS)\baselib_textbuf.o \ $(OBJS)\baselib_textfile.o \ $(OBJS)\baselib_tokenzr.o \ @@ -4605,6 +4617,12 @@ $(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc $(OBJS)\monodll_appbase.o: ../../src/common/appbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_arcall.o: ../../src/common/arcall.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\monodll_arcfind.o: ../../src/common/arcfind.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_archive.o: ../../src/common/archive.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -4752,6 +4770,9 @@ $(OBJS)\monodll_string.o: ../../src/common/string.cpp $(OBJS)\monodll_sysopt.o: ../../src/common/sysopt.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_tarstrm.o: ../../src/common/tarstrm.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_textbuf.o: ../../src/common/textbuf.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6672,6 +6693,12 @@ $(OBJS)\monolib_dummy.o: ../../src/common/dummy.cpp $(OBJS)\monolib_appbase.o: ../../src/common/appbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_arcall.o: ../../src/common/arcall.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\monolib_arcfind.o: ../../src/common/arcfind.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_archive.o: ../../src/common/archive.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -6819,6 +6846,9 @@ $(OBJS)\monolib_string.o: ../../src/common/string.cpp $(OBJS)\monolib_sysopt.o: ../../src/common/sysopt.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_tarstrm.o: ../../src/common/tarstrm.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_textbuf.o: ../../src/common/textbuf.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -8742,6 +8772,12 @@ $(OBJS)\basedll_version_rc.o: ../../src/msw/version.rc $(OBJS)\basedll_appbase.o: ../../src/common/appbase.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\basedll_arcall.o: ../../src/common/arcall.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\basedll_arcfind.o: ../../src/common/arcfind.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\basedll_archive.o: ../../src/common/archive.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< @@ -8889,6 +8925,9 @@ $(OBJS)\basedll_string.o: ../../src/common/string.cpp $(OBJS)\basedll_sysopt.o: ../../src/common/sysopt.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\basedll_tarstrm.o: ../../src/common/tarstrm.cpp + $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\basedll_textbuf.o: ../../src/common/textbuf.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< @@ -9000,6 +9039,12 @@ $(OBJS)\baselib_dummy.o: ../../src/common/dummy.cpp $(OBJS)\baselib_appbase.o: ../../src/common/appbase.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\baselib_arcall.o: ../../src/common/arcall.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\baselib_arcfind.o: ../../src/common/arcfind.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\baselib_archive.o: ../../src/common/archive.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< @@ -9147,6 +9192,9 @@ $(OBJS)\baselib_string.o: ../../src/common/string.cpp $(OBJS)\baselib_sysopt.o: ../../src/common/sysopt.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\baselib_tarstrm.o: ../../src/common/tarstrm.cpp + $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\baselib_textbuf.o: ../../src/common/textbuf.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 0856dc725b..7c87a574b6 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -204,6 +204,8 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.obj \ $(OBJS)\monodll_version.res \ $(OBJS)\monodll_appbase.obj \ + $(OBJS)\monodll_arcall.obj \ + $(OBJS)\monodll_arcfind.obj \ $(OBJS)\monodll_archive.obj \ $(OBJS)\monodll_clntdata.obj \ $(OBJS)\monodll_cmdline.obj \ @@ -253,6 +255,7 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_stream.obj \ $(OBJS)\monodll_string.obj \ $(OBJS)\monodll_sysopt.obj \ + $(OBJS)\monodll_tarstrm.obj \ $(OBJS)\monodll_textbuf.obj \ $(OBJS)\monodll_textfile.obj \ $(OBJS)\monodll_tokenzr.obj \ @@ -326,6 +329,8 @@ MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \ MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.obj \ $(OBJS)\monolib_appbase.obj \ + $(OBJS)\monolib_arcall.obj \ + $(OBJS)\monolib_arcfind.obj \ $(OBJS)\monolib_archive.obj \ $(OBJS)\monolib_clntdata.obj \ $(OBJS)\monolib_cmdline.obj \ @@ -375,6 +380,7 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_stream.obj \ $(OBJS)\monolib_string.obj \ $(OBJS)\monolib_sysopt.obj \ + $(OBJS)\monolib_tarstrm.obj \ $(OBJS)\monolib_textbuf.obj \ $(OBJS)\monolib_textfile.obj \ $(OBJS)\monolib_tokenzr.obj \ @@ -450,6 +456,8 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.obj \ $(OBJS)\basedll_version.res \ $(OBJS)\basedll_appbase.obj \ + $(OBJS)\basedll_arcall.obj \ + $(OBJS)\basedll_arcfind.obj \ $(OBJS)\basedll_archive.obj \ $(OBJS)\basedll_clntdata.obj \ $(OBJS)\basedll_cmdline.obj \ @@ -499,6 +507,7 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_stream.obj \ $(OBJS)\basedll_string.obj \ $(OBJS)\basedll_sysopt.obj \ + $(OBJS)\basedll_tarstrm.obj \ $(OBJS)\basedll_textbuf.obj \ $(OBJS)\basedll_textfile.obj \ $(OBJS)\basedll_tokenzr.obj \ @@ -558,6 +567,8 @@ BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \ BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.obj \ $(OBJS)\baselib_appbase.obj \ + $(OBJS)\baselib_arcall.obj \ + $(OBJS)\baselib_arcfind.obj \ $(OBJS)\baselib_archive.obj \ $(OBJS)\baselib_clntdata.obj \ $(OBJS)\baselib_cmdline.obj \ @@ -607,6 +618,7 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_stream.obj \ $(OBJS)\baselib_string.obj \ $(OBJS)\baselib_sysopt.obj \ + $(OBJS)\baselib_tarstrm.obj \ $(OBJS)\baselib_textbuf.obj \ $(OBJS)\baselib_textfile.obj \ $(OBJS)\baselib_tokenzr.obj \ @@ -4821,6 +4833,12 @@ $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + +$(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -4968,6 +4986,9 @@ $(OBJS)\monodll_string.obj: ..\..\src\common\string.cpp $(OBJS)\monodll_sysopt.obj: ..\..\src\common\sysopt.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_tarstrm.obj: ..\..\src\common\tarstrm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6788,6 +6809,12 @@ $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_arcall.obj: ..\..\src\common\arcall.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + +$(OBJS)\monolib_arcfind.obj: ..\..\src\common\arcfind.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -6935,6 +6962,9 @@ $(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp $(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_tarstrm.obj: ..\..\src\common\tarstrm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -8758,6 +8788,12 @@ $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_arcall.obj: ..\..\src\common\arcall.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** + +$(OBJS)\basedll_arcfind.obj: ..\..\src\common\arcfind.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -8905,6 +8941,9 @@ $(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp $(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** +$(OBJS)\basedll_tarstrm.obj: ..\..\src\common\tarstrm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** + $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -9016,6 +9055,12 @@ $(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_arcall.obj: ..\..\src\common\arcall.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** + +$(OBJS)\baselib_arcfind.obj: ..\..\src\common\arcfind.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** @@ -9163,6 +9208,9 @@ $(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp $(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** +$(OBJS)\baselib_tarstrm.obj: ..\..\src\common\tarstrm.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** + $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index d6f0282894..e80969e7ec 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -2908,6 +2908,8 @@ MONODLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & MONODLL_OBJECTS = & $(OBJS)\monodll_dummy.obj & $(OBJS)\monodll_appbase.obj & + $(OBJS)\monodll_arcall.obj & + $(OBJS)\monodll_arcfind.obj & $(OBJS)\monodll_archive.obj & $(OBJS)\monodll_clntdata.obj & $(OBJS)\monodll_cmdline.obj & @@ -2957,6 +2959,7 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_stream.obj & $(OBJS)\monodll_string.obj & $(OBJS)\monodll_sysopt.obj & + $(OBJS)\monodll_tarstrm.obj & $(OBJS)\monodll_textbuf.obj & $(OBJS)\monodll_textfile.obj & $(OBJS)\monodll_tokenzr.obj & @@ -3025,6 +3028,8 @@ MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & MONOLIB_OBJECTS = & $(OBJS)\monolib_dummy.obj & $(OBJS)\monolib_appbase.obj & + $(OBJS)\monolib_arcall.obj & + $(OBJS)\monolib_arcfind.obj & $(OBJS)\monolib_archive.obj & $(OBJS)\monolib_clntdata.obj & $(OBJS)\monolib_cmdline.obj & @@ -3074,6 +3079,7 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_stream.obj & $(OBJS)\monolib_string.obj & $(OBJS)\monolib_sysopt.obj & + $(OBJS)\monolib_tarstrm.obj & $(OBJS)\monolib_textbuf.obj & $(OBJS)\monolib_textfile.obj & $(OBJS)\monolib_tokenzr.obj & @@ -3144,6 +3150,8 @@ BASEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & BASEDLL_OBJECTS = & $(OBJS)\basedll_dummy.obj & $(OBJS)\basedll_appbase.obj & + $(OBJS)\basedll_arcall.obj & + $(OBJS)\basedll_arcfind.obj & $(OBJS)\basedll_archive.obj & $(OBJS)\basedll_clntdata.obj & $(OBJS)\basedll_cmdline.obj & @@ -3193,6 +3201,7 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_stream.obj & $(OBJS)\basedll_string.obj & $(OBJS)\basedll_sysopt.obj & + $(OBJS)\basedll_tarstrm.obj & $(OBJS)\basedll_textbuf.obj & $(OBJS)\basedll_textfile.obj & $(OBJS)\basedll_tokenzr.obj & @@ -3247,6 +3256,8 @@ BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & BASELIB_OBJECTS = & $(OBJS)\baselib_dummy.obj & $(OBJS)\baselib_appbase.obj & + $(OBJS)\baselib_arcall.obj & + $(OBJS)\baselib_arcfind.obj & $(OBJS)\baselib_archive.obj & $(OBJS)\baselib_clntdata.obj & $(OBJS)\baselib_cmdline.obj & @@ -3296,6 +3307,7 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_stream.obj & $(OBJS)\baselib_string.obj & $(OBJS)\baselib_sysopt.obj & + $(OBJS)\baselib_tarstrm.obj & $(OBJS)\baselib_textbuf.obj & $(OBJS)\baselib_textfile.obj & $(OBJS)\baselib_tokenzr.obj & @@ -4833,6 +4845,12 @@ $(OBJS)\monodll_version.res : .AUTODEPEND ..\..\src\msw\version.rc $(OBJS)\monodll_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_arcall.obj : .AUTODEPEND ..\..\src\common\arcall.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + +$(OBJS)\monodll_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -4980,6 +4998,9 @@ $(OBJS)\monodll_string.obj : .AUTODEPEND ..\..\src\common\string.cpp $(OBJS)\monodll_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_tarstrm.obj : .AUTODEPEND ..\..\src\common\tarstrm.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6900,6 +6921,12 @@ $(OBJS)\monolib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(OBJS)\monolib_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_arcall.obj : .AUTODEPEND ..\..\src\common\arcall.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + +$(OBJS)\monolib_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -7047,6 +7074,9 @@ $(OBJS)\monolib_string.obj : .AUTODEPEND ..\..\src\common\string.cpp $(OBJS)\monolib_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_tarstrm.obj : .AUTODEPEND ..\..\src\common\tarstrm.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8970,6 +9000,12 @@ $(OBJS)\basedll_version.res : .AUTODEPEND ..\..\src\msw\version.rc $(OBJS)\basedll_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_arcall.obj : .AUTODEPEND ..\..\src\common\arcall.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + +$(OBJS)\basedll_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -9117,6 +9153,9 @@ $(OBJS)\basedll_string.obj : .AUTODEPEND ..\..\src\common\string.cpp $(OBJS)\basedll_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< +$(OBJS)\basedll_tarstrm.obj : .AUTODEPEND ..\..\src\common\tarstrm.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< + $(OBJS)\basedll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -9228,6 +9267,12 @@ $(OBJS)\baselib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(OBJS)\baselib_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_arcall.obj : .AUTODEPEND ..\..\src\common\arcall.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + +$(OBJS)\baselib_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< @@ -9375,6 +9420,9 @@ $(OBJS)\baselib_string.obj : .AUTODEPEND ..\..\src\common\string.cpp $(OBJS)\baselib_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< +$(OBJS)\baselib_tarstrm.obj : .AUTODEPEND ..\..\src\common\tarstrm.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< + $(OBJS)\baselib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp index 294e9c0885..1dfe7eee7c 100644 --- a/build/msw/wx_base.dsp +++ b/build/msw/wx_base.dsp @@ -456,6 +456,14 @@ SOURCE=..\..\src\common\appbase.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\arcall.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\common\arcfind.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\archive.cpp # End Source File # Begin Source File @@ -671,6 +679,10 @@ SOURCE=..\..\src\common\sysopt.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\tarstrm.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\textbuf.cpp # End Source File # Begin Source File @@ -1731,6 +1743,10 @@ SOURCE=..\..\include\wx\sysopt.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\tarstrm.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\textbuf.h # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 2fa4c45310..cd4065de3e 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -317,6 +317,14 @@ SOURCE=.\common\appcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\arcall.cpp +# End Source File +# Begin Source File + +SOURCE=.\common\arcfind.cpp +# End Source File +# Begin Source File + SOURCE=.\common\archive.cpp # End Source File # Begin Source File @@ -891,6 +899,10 @@ SOURCE=.\common\sysopt.cpp # End Source File # Begin Source File +SOURCE=.\common\tarstrm.cpp +# End Source File +# Begin Source File + SOURCE=.\common\taskbarcmn.cpp # End Source File # Begin Source File @@ -3291,6 +3303,10 @@ SOURCE=..\include\wx\tabctrl.h # End Source File # Begin Source File +SOURCE=..\include\wx\tarstrm.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\taskbar.h # End Source File # Begin Source File diff --git a/wxGTK.spec b/wxGTK.spec index bdf767ffc1..06a4e97295 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -296,6 +296,7 @@ wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h +wx/tarstrm.h wx/textbuf.h wx/textfile.h wx/thread.h diff --git a/wxMotif.spec b/wxMotif.spec index ee57ba2a09..62953c3bd0 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -199,6 +199,7 @@ wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h +wx/tarstrm.h wx/textbuf.h wx/textfile.h wx/thread.h diff --git a/wxX11.spec b/wxX11.spec index 78968978ef..c6176eac95 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -224,6 +224,7 @@ wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h +wx/tarstrm.h wx/textbuf.h wx/textfile.h wx/thread.h -- 2.47.2