Switch to using the wxWidgets Unicode library.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2202 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 579c9fe05b8fa83b7e7b1e68886e4b22ed4d0423..add5131551fdafd5e7b127fe7b82ee5ba7a5ac71 100644 (file)
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -5,6 +5,7 @@ General:
 
 Changes to 1.37.30:
 14Jul05
+- Switch to using the wxWidgets Unicode library.
 - Include msvcr71.dll in distribution.
 - Add VSS to status line in Win32 FD if enabled.
 - Get VSS build scripts working with Thorsten's help.

diff --git a/bacula/src/win32/README.win32 b/bacula/src/win32/README.win32
index 96e0ec4bfda62876f1ddf4ace347d8148c50c206..424ae9a3d216ca48a1b273fab058923d3c036139 100644 (file)
--- a/bacula/src/win32/README.win32
+++ b/bacula/src/win32/README.win32
@@ -91,11 +91,12 @@ The native Win32 interface code was written by:
 
 For more details of building wx, see depkgs-win32/wx/docs/msw/install.txt
 
-The easiest way to build this is to have a Visual Studio C++ 6.0. 
+The easiest way to build this is to have a Visual Studio .NET 2003
 However, you can use the free Microsoft C++ compiler with a bit
 of additional work.
 
-Here are additional pointers on building wx-console supplied by Nicolas Boichat:
+Here are additional pointers on building wx-console supplied by Nicolas
+Boichat:
 
 
 Tools I used (I think the 3 first one are included in VStudio) :
@@ -122,17 +123,24 @@ Instructions if you want to build wx-console :
   - LIB includes the directories Lib of both the C++ Toolkit and the SDK
     
 - Compile bacula depkg-win32 with Visual Studio or try the
-  supplied makefiles as described in the doc.
+  supplied makefiles as described in the doc. I could not
+  get this to work -- kes.
 
 - Compile wx-console with nmake -f wx-console.mak in
-  src/win32/wx-console
+  src/win32/wx-console  I could not get this to work
+  kes.
 
 - Additional information on using the free Micrsosoft C++ see
   http://sapdb.2scale.net/moin.cgi/MS_20C_2b_2b_20Toolkit
 
 NOTE! I (Kern) cannot build wxWindows with the Makefile until after
-I do a ./configure.  I can us VC Studio directly to do so
-following their instructions.
+I do a ./configure.  I can use VC Studio directly to do so
+following their instructions. Open VC Studio on the project
+file depkgs-win32/wx/src/WxWindows.vcproj.  Then build it.
+Make sure you have selected the Release Unicode version under
+menu->Build->Configuration Manager.  It will create the file:
+depkgs-win32/wx/lib/wxmswu.lib. At that point, you have
+what you need to build wx-console.
 
 Note, the paths given below have changed now that we switched
 to Microsoft Visual Studio .NET 2003 (VC++ 7.1).

diff --git a/bacula/src/win32/wx-console/wx-console.mak b/bacula/src/win32/wx-console/wx-console.mak
index 21cf99a15837b6ce7ff7efa1f74d8f6306771a8c..dfc9535e222cbc67d3cdb34af74f4cc9a0cdb1d9 100644 (file)
--- a/bacula/src/win32/wx-console/wx-console.mak
+++ b/bacula/src/win32/wx-console/wx-console.mak
@@ -112,7 +112,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\wx-console.bsc"
 BSC32_SBRS= \
         
 LINK32=link.exe
-LINK32_FLAGS=wxmsw.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib winmm.lib \
+LINK32_FLAGS=wxmswu.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib winmm.lib \
   comctl32.lib comdlg32.lib Shell32.lib AdvAPI32.lib User32.lib Gdi32.lib wsock32.lib \
   wldap32.lib pthreadVCE.lib zlib.lib /nodefaultlib:libcmt.lib \
   /nologo /subsystem:windows /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/wx/lib" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" 
@@ -394,7 +394,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=wxmswd.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib winmm.lib \
+LINK32_FLAGS=wxmswu.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib winmm.lib \
   comctl32.lib comdlg32.lib Shell32.lib AdvAPI32.lib User32.lib Gdi32.lib wsock32.lib \
   wldap32.lib pthreadVCE.lib zlib.lib /nodefaultlib:libcmtd.lib \
   /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/wx/lib" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" 
@@ -1652,4 +1652,3 @@ SOURCE=..\..\wx-console\wxbhistorytextctrl.cpp
 !ENDIF 
 
 
-

diff --git a/bacula/src/win32/wx-console/wx-console.mak.in b/bacula/src/win32/wx-console/wx-console.mak.in
index 9e58009249d634167b907d06d1935b0b3765873a..426972d9976b52d290071fd8201afa2af98e16f5 100644 (file)
--- a/bacula/src/win32/wx-console/wx-console.mak.in
+++ b/bacula/src/win32/wx-console/wx-console.mak.in
@@ -53,7 +53,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\wx-console.bsc"
 BSC32_SBRS= \
         
 LINK32=link.exe
-LINK32_FLAGS=wxmsw.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib winmm.lib \
+LINK32_FLAGS=wxmswu.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib winmm.lib \
   comctl32.lib comdlg32.lib Shell32.lib AdvAPI32.lib User32.lib Gdi32.lib wsock32.lib \
   wldap32.lib pthreadVCE.lib zlib.lib /nodefaultlib:libcmt.lib \
   /nologo /subsystem:windows /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/wx/lib" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" 
@@ -98,7 +98,7 @@ BSC32_SBRS= \
 <<
 
 LINK32=link.exe
-LINK32_FLAGS=wxmswd.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib winmm.lib \
+LINK32_FLAGS=wxmswu.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib winmm.lib \
   comctl32.lib comdlg32.lib Shell32.lib AdvAPI32.lib User32.lib Gdi32.lib wsock32.lib \
   wldap32.lib pthreadVCE.lib zlib.lib /nodefaultlib:libcmtd.lib \
   /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/wx/lib" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" 
@@ -158,4 +158,3 @@ SOURCE=..\..\wx-console\wx-console_private.rc
         $(RSC) /l 0x409 /fo"$(INTDIR)\wx-console_private.res" /d "NDEBUG" $(SOURCE)
 
 @@OBJTARGETS@@
-