From a8098f8653e770e4bf10f7dcf468819ad0675071 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 10 Jul 2007 02:00:51 +0000
Subject: [PATCH] regenerated after adding base64.h/cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 Makefile.in            | 19 +++++++++++++++++++
 build/msw/makefile.bcc | 16 ++++++++++++++++
 build/msw/makefile.gcc | 16 ++++++++++++++++
 build/msw/makefile.vc  | 16 ++++++++++++++++
 build/msw/makefile.wat | 16 ++++++++++++++++
 build/msw/wx_base.dsp  | 12 ++++++++++++
 tests/Makefile.in      |  4 ++++
 tests/test_test.dsp    |  4 ++++
 wxGTK.spec             |  2 ++
 wxMotif.spec           |  2 ++
 wxX11.spec             |  2 ++
 11 files changed, 109 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index 7b673633c3..9e62270a56 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -316,6 +316,7 @@ ALL_BASE_HEADERS =  \
 	wx/arrimpl.cpp \
 	wx/arrstr.h \
 	wx/atomic.h \
+	wx/base64.h \
 	wx/beforestd.h \
 	wx/buffer.h \
 	wx/build.h \
@@ -461,6 +462,7 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/arrimpl.cpp \
 	wx/arrstr.h \
 	wx/atomic.h \
+	wx/base64.h \
 	wx/beforestd.h \
 	wx/buffer.h \
 	wx/build.h \
@@ -643,6 +645,7 @@ ALL_BASE_SOURCES =  \
 	src/common/arcfind.cpp \
 	src/common/archive.cpp \
 	src/common/arrstr.cpp \
+	src/common/base64.cpp \
 	src/common/clntdata.cpp \
 	src/common/cmdline.cpp \
 	src/common/config.cpp \
@@ -820,6 +823,7 @@ MONODLL_OBJECTS =  \
 	monodll_arcfind.o \
 	monodll_archive.o \
 	monodll_arrstr.o \
+	monodll_base64.o \
 	monodll_clntdata.o \
 	monodll_cmdline.o \
 	monodll_config.o \
@@ -933,6 +937,7 @@ MONOLIB_OBJECTS =  \
 	monolib_arcfind.o \
 	monolib_archive.o \
 	monolib_arrstr.o \
+	monolib_base64.o \
 	monolib_clntdata.o \
 	monolib_cmdline.o \
 	monolib_config.o \
@@ -1043,6 +1048,7 @@ BASEDLL_OBJECTS =  \
 	basedll_arcfind.o \
 	basedll_archive.o \
 	basedll_arrstr.o \
+	basedll_base64.o \
 	basedll_clntdata.o \
 	basedll_cmdline.o \
 	basedll_config.o \
@@ -1137,6 +1143,7 @@ BASELIB_OBJECTS =  \
 	baselib_arcfind.o \
 	baselib_archive.o \
 	baselib_arrstr.o \
+	baselib_base64.o \
 	baselib_clntdata.o \
 	baselib_cmdline.o \
 	baselib_config.o \
@@ -13422,6 +13429,9 @@ monodll_archive.o: $(srcdir)/src/common/archive.cpp $(MONODLL_ODEP)
 monodll_arrstr.o: $(srcdir)/src/common/arrstr.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/arrstr.cpp
 
+monodll_base64.o: $(srcdir)/src/common/base64.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/base64.cpp
+
 monodll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
 
@@ -17736,6 +17746,9 @@ monolib_archive.o: $(srcdir)/src/common/archive.cpp $(MONOLIB_ODEP)
 monolib_arrstr.o: $(srcdir)/src/common/arrstr.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arrstr.cpp
 
+monolib_base64.o: $(srcdir)/src/common/base64.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/base64.cpp
+
 monolib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
 
@@ -22050,6 +22063,9 @@ basedll_archive.o: $(srcdir)/src/common/archive.cpp $(BASEDLL_ODEP)
 basedll_arrstr.o: $(srcdir)/src/common/arrstr.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/arrstr.cpp
 
+basedll_base64.o: $(srcdir)/src/common/base64.cpp $(BASEDLL_ODEP)
+	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/base64.cpp
+
 basedll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASEDLL_ODEP)
 	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
 
@@ -22815,6 +22831,9 @@ baselib_archive.o: $(srcdir)/src/common/archive.cpp $(BASELIB_ODEP)
 baselib_arrstr.o: $(srcdir)/src/common/arrstr.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/arrstr.cpp
 
+baselib_base64.o: $(srcdir)/src/common/base64.cpp $(BASELIB_ODEP)
+	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/base64.cpp
+
 baselib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASELIB_ODEP)
 	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
 
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 4cbc0e5d7f..1b0b6d59db 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -299,6 +299,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_arcfind.obj \
 	$(OBJS)\monodll_archive.obj \
 	$(OBJS)\monodll_arrstr.obj \
+	$(OBJS)\monodll_base64.obj \
 	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdline.obj \
 	$(OBJS)\monodll_config.obj \
@@ -434,6 +435,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_arcfind.obj \
 	$(OBJS)\monolib_archive.obj \
 	$(OBJS)\monolib_arrstr.obj \
+	$(OBJS)\monolib_base64.obj \
 	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdline.obj \
 	$(OBJS)\monolib_config.obj \
@@ -566,6 +568,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_arcfind.obj \
 	$(OBJS)\basedll_archive.obj \
 	$(OBJS)\basedll_arrstr.obj \
+	$(OBJS)\basedll_base64.obj \
 	$(OBJS)\basedll_clntdata.obj \
 	$(OBJS)\basedll_cmdline.obj \
 	$(OBJS)\basedll_config.obj \
@@ -683,6 +686,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_arcfind.obj \
 	$(OBJS)\baselib_archive.obj \
 	$(OBJS)\baselib_arrstr.obj \
+	$(OBJS)\baselib_base64.obj \
 	$(OBJS)\baselib_clntdata.obj \
 	$(OBJS)\baselib_cmdline.obj \
 	$(OBJS)\baselib_config.obj \
@@ -5190,6 +5194,9 @@ $(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp
 $(OBJS)\monodll_arrstr.obj: ..\..\src\common\arrstr.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_base64.obj: ..\..\src\common\base64.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 
@@ -7252,6 +7259,9 @@ $(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp
 $(OBJS)\monolib_arrstr.obj: ..\..\src\common\arrstr.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_base64.obj: ..\..\src\common\base64.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -9314,6 +9324,9 @@ $(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp
 $(OBJS)\basedll_arrstr.obj: ..\..\src\common\arrstr.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_base64.obj: ..\..\src\common\base64.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -9614,6 +9627,9 @@ $(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp
 $(OBJS)\baselib_arrstr.obj: ..\..\src\common\arrstr.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_base64.obj: ..\..\src\common\base64.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $**
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index bb4ad68d31..80924572ff 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -283,6 +283,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_arcfind.o \
 	$(OBJS)\monodll_archive.o \
 	$(OBJS)\monodll_arrstr.o \
+	$(OBJS)\monodll_base64.o \
 	$(OBJS)\monodll_clntdata.o \
 	$(OBJS)\monodll_cmdline.o \
 	$(OBJS)\monodll_config.o \
@@ -419,6 +420,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_arcfind.o \
 	$(OBJS)\monolib_archive.o \
 	$(OBJS)\monolib_arrstr.o \
+	$(OBJS)\monolib_base64.o \
 	$(OBJS)\monolib_clntdata.o \
 	$(OBJS)\monolib_cmdline.o \
 	$(OBJS)\monolib_config.o \
@@ -553,6 +555,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_arcfind.o \
 	$(OBJS)\basedll_archive.o \
 	$(OBJS)\basedll_arrstr.o \
+	$(OBJS)\basedll_base64.o \
 	$(OBJS)\basedll_clntdata.o \
 	$(OBJS)\basedll_cmdline.o \
 	$(OBJS)\basedll_config.o \
@@ -670,6 +673,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_arcfind.o \
 	$(OBJS)\baselib_archive.o \
 	$(OBJS)\baselib_arrstr.o \
+	$(OBJS)\baselib_base64.o \
 	$(OBJS)\baselib_clntdata.o \
 	$(OBJS)\baselib_cmdline.o \
 	$(OBJS)\baselib_config.o \
@@ -5359,6 +5363,9 @@ $(OBJS)\monodll_archive.o: ../../src/common/archive.cpp
 $(OBJS)\monodll_arrstr.o: ../../src/common/arrstr.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monodll_base64.o: ../../src/common/base64.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_clntdata.o: ../../src/common/clntdata.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -7521,6 +7528,9 @@ $(OBJS)\monolib_archive.o: ../../src/common/archive.cpp
 $(OBJS)\monolib_arrstr.o: ../../src/common/arrstr.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monolib_base64.o: ../../src/common/base64.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_clntdata.o: ../../src/common/clntdata.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9683,6 +9693,9 @@ $(OBJS)\basedll_archive.o: ../../src/common/archive.cpp
 $(OBJS)\basedll_arrstr.o: ../../src/common/arrstr.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\basedll_base64.o: ../../src/common/base64.cpp
+	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\basedll_clntdata.o: ../../src/common/clntdata.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9983,6 +9996,9 @@ $(OBJS)\baselib_archive.o: ../../src/common/archive.cpp
 $(OBJS)\baselib_arrstr.o: ../../src/common/arrstr.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\baselib_base64.o: ../../src/common/base64.cpp
+	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\baselib_clntdata.o: ../../src/common/clntdata.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 793e8b8f34..b3882367f4 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -301,6 +301,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_arcfind.obj \
 	$(OBJS)\monodll_archive.obj \
 	$(OBJS)\monodll_arrstr.obj \
+	$(OBJS)\monodll_base64.obj \
 	$(OBJS)\monodll_clntdata.obj \
 	$(OBJS)\monodll_cmdline.obj \
 	$(OBJS)\monodll_config.obj \
@@ -441,6 +442,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_arcfind.obj \
 	$(OBJS)\monolib_archive.obj \
 	$(OBJS)\monolib_arrstr.obj \
+	$(OBJS)\monolib_base64.obj \
 	$(OBJS)\monolib_clntdata.obj \
 	$(OBJS)\monolib_cmdline.obj \
 	$(OBJS)\monolib_config.obj \
@@ -579,6 +581,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_arcfind.obj \
 	$(OBJS)\basedll_archive.obj \
 	$(OBJS)\basedll_arrstr.obj \
+	$(OBJS)\basedll_base64.obj \
 	$(OBJS)\basedll_clntdata.obj \
 	$(OBJS)\basedll_cmdline.obj \
 	$(OBJS)\basedll_config.obj \
@@ -701,6 +704,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_arcfind.obj \
 	$(OBJS)\baselib_archive.obj \
 	$(OBJS)\baselib_arrstr.obj \
+	$(OBJS)\baselib_base64.obj \
 	$(OBJS)\baselib_clntdata.obj \
 	$(OBJS)\baselib_cmdline.obj \
 	$(OBJS)\baselib_config.obj \
@@ -5552,6 +5556,9 @@ $(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp
 $(OBJS)\monodll_arrstr.obj: ..\..\src\common\arrstr.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_base64.obj: ..\..\src\common\base64.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -7614,6 +7621,9 @@ $(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp
 $(OBJS)\monolib_arrstr.obj: ..\..\src\common\arrstr.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_base64.obj: ..\..\src\common\base64.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -9676,6 +9686,9 @@ $(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp
 $(OBJS)\basedll_arrstr.obj: ..\..\src\common\arrstr.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_base64.obj: ..\..\src\common\base64.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -9976,6 +9989,9 @@ $(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp
 $(OBJS)\baselib_arrstr.obj: ..\..\src\common\arrstr.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_base64.obj: ..\..\src\common\base64.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 9bde431392..84941a3974 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -3227,6 +3227,7 @@ MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_arcfind.obj &
 	$(OBJS)\monodll_archive.obj &
 	$(OBJS)\monodll_arrstr.obj &
+	$(OBJS)\monodll_base64.obj &
 	$(OBJS)\monodll_clntdata.obj &
 	$(OBJS)\monodll_cmdline.obj &
 	$(OBJS)\monodll_config.obj &
@@ -3362,6 +3363,7 @@ MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_arcfind.obj &
 	$(OBJS)\monolib_archive.obj &
 	$(OBJS)\monolib_arrstr.obj &
+	$(OBJS)\monolib_base64.obj &
 	$(OBJS)\monolib_clntdata.obj &
 	$(OBJS)\monolib_cmdline.obj &
 	$(OBJS)\monolib_config.obj &
@@ -3495,6 +3497,7 @@ BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_arcfind.obj &
 	$(OBJS)\basedll_archive.obj &
 	$(OBJS)\basedll_arrstr.obj &
+	$(OBJS)\basedll_base64.obj &
 	$(OBJS)\basedll_clntdata.obj &
 	$(OBJS)\basedll_cmdline.obj &
 	$(OBJS)\basedll_config.obj &
@@ -3612,6 +3615,7 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_arcfind.obj &
 	$(OBJS)\baselib_archive.obj &
 	$(OBJS)\baselib_arrstr.obj &
+	$(OBJS)\baselib_base64.obj &
 	$(OBJS)\baselib_clntdata.obj &
 	$(OBJS)\baselib_cmdline.obj &
 	$(OBJS)\baselib_config.obj &
@@ -5621,6 +5625,9 @@ $(OBJS)\monodll_archive.obj :  .AUTODEPEND ..\..\src\common\archive.cpp
 $(OBJS)\monodll_arrstr.obj :  .AUTODEPEND ..\..\src\common\arrstr.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_base64.obj :  .AUTODEPEND ..\..\src\common\base64.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -7783,6 +7790,9 @@ $(OBJS)\monolib_archive.obj :  .AUTODEPEND ..\..\src\common\archive.cpp
 $(OBJS)\monolib_arrstr.obj :  .AUTODEPEND ..\..\src\common\arrstr.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_base64.obj :  .AUTODEPEND ..\..\src\common\base64.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -9945,6 +9955,9 @@ $(OBJS)\basedll_archive.obj :  .AUTODEPEND ..\..\src\common\archive.cpp
 $(OBJS)\basedll_arrstr.obj :  .AUTODEPEND ..\..\src\common\arrstr.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
+$(OBJS)\basedll_base64.obj :  .AUTODEPEND ..\..\src\common\base64.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
@@ -10245,6 +10258,9 @@ $(OBJS)\baselib_archive.obj :  .AUTODEPEND ..\..\src\common\archive.cpp
 $(OBJS)\baselib_arrstr.obj :  .AUTODEPEND ..\..\src\common\arrstr.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
+$(OBJS)\baselib_base64.obj :  .AUTODEPEND ..\..\src\common\base64.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_clntdata.obj :  .AUTODEPEND ..\..\src\common\clntdata.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index fa53b617a0..0550a84f96 100644
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -472,6 +472,10 @@ SOURCE=..\..\src\common\arrstr.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\base64.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\clntdata.cpp
 # End Source File
 # Begin Source File
@@ -1479,6 +1483,14 @@ SOURCE=..\..\include\wx\arrstr.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\atomic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\base64.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\beforestd.h
 # End Source File
 # Begin Source File
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6e25a8e5e8..3f0419a914 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -54,6 +54,7 @@ TEST_OBJECTS =  \
 	test_ziptest.o \
 	test_tartest.o \
 	test_arrays.o \
+	test_base64.o \
 	test_datetimetest.o \
 	test_fileconftest.o \
 	test_filekind.o \
@@ -324,6 +325,9 @@ test_tartest.o: $(srcdir)/archive/tartest.cpp $(TEST_ODEP)
 test_arrays.o: $(srcdir)/arrays/arrays.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/arrays/arrays.cpp
 
+test_base64.o: $(srcdir)/base64/base64.cpp $(TEST_ODEP)
+	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/base64/base64.cpp
+
 test_datetimetest.o: $(srcdir)/datetime/datetimetest.cpp $(TEST_ODEP)
 	$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/datetime/datetimetest.cpp
 
diff --git a/tests/test_test.dsp b/tests/test_test.dsp
index 647f81e221..ff959c27ee 100644
--- a/tests/test_test.dsp
+++ b/tests/test_test.dsp
@@ -447,6 +447,10 @@ SOURCE=.\thread\atomic.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\base64\base64.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\streams\bstream.cpp
 # End Source File
 # Begin Source File
diff --git a/wxGTK.spec b/wxGTK.spec
index 1c8c79361a..dbd1509c8e 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -213,6 +213,8 @@ wx/apptrait.h
 wx/archive.h
 wx/arrimpl.cpp
 wx/arrstr.h
+wx/atomic.h
+wx/base64.h
 wx/beforestd.h
 wx/buffer.h
 wx/build.h
diff --git a/wxMotif.spec b/wxMotif.spec
index d1dc3d3c19..525d05ce88 100644
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -116,6 +116,8 @@ wx/apptrait.h
 wx/archive.h
 wx/arrimpl.cpp
 wx/arrstr.h
+wx/atomic.h
+wx/base64.h
 wx/beforestd.h
 wx/buffer.h
 wx/build.h
diff --git a/wxX11.spec b/wxX11.spec
index 1d2e7ef54a..28a5e33373 100644
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -141,6 +141,8 @@ wx/apptrait.h
 wx/archive.h
 wx/arrimpl.cpp
 wx/arrstr.h
+wx/atomic.h
+wx/base64.h
 wx/beforestd.h
 wx/buffer.h
 wx/build.h