From 90d3231f3202abc3449dfb1f46a415cec0cfa706 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 15 Jul 2005 12:48:43 +0000 Subject: [PATCH] Switch to using the wxWidgets Unicode library. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2202 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/kes-1.37 | 1 + bacula/src/win32/README.win32 | 20 +++++++++++++------ bacula/src/win32/wx-console/wx-console.mak | 5 ++--- bacula/src/win32/wx-console/wx-console.mak.in | 5 ++--- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/bacula/kes-1.37 b/bacula/kes-1.37 index 579c9fe05b..add5131551 100644 --- 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 96e0ec4bfd..424ae9a3d2 100644 --- 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 21cf99a158..dfc9535e22 100644 --- 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 9e58009249..426972d997 100644 --- 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@@ - -- 2.39.5