1 diff -ur wxWidgets-2.8.7-rel/build/msw/config.gcc wxWidgets-2.8.7/build/msw/config.gcc
2 --- build/msw/config.mingw32 2007-11-21 13:42:45.000000000 +0100
3 +++ build/msw/config.mingw32 2008-03-11 15:45:30.000000000 +0100
5 # -------------------------------------------------------------------------
15 # Standard flags for CC
20 # Standard preprocessor flags (common for CC and CXX)
22 +CPPFLAGS := -I../../../zlib
24 # Standard linker flags
26 +LDFLAGS := -L../../../zlib
33 # Type of compiled binaries [debug,release]
37 # Should debugging info be included in the executables? The default value
38 # "default" means that debug info will be included if BUILD=debug
40 # "3" ...... this is for Mingw 2.0 or newer (comes with gcc3)
41 # "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95]
44 diff -ur wxWidgets-2.8.7-rel/include/wx/string.h wxWidgets-2.8.7/include/wx/string.h
45 --- include/wx/string.h 2007-11-21 13:41:54.000000000 +0100
46 +++ include/wx/string.h 2008-03-11 15:50:58.000000000 +0100
49 // VC++ free must take place in same DLL as allocation when using non dll
50 // run-time library (e.g. Multithreaded instead of Multithreaded DLL)
51 -#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
52 +#if 1 || defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
53 void Unlock() { if ( !IsEmpty() && --nRefs == 0) Free(); }
54 // we must not inline deallocation since allocation is not inlined
56 diff -ur wxWidgets-2.8.7-rel/src/common/string.cpp wxWidgets-2.8.7/src/common/string.cpp
57 --- src/common/string.cpp 2007-11-21 13:41:57.000000000 +0100
58 +++ src/common/string.cpp 2008-03-11 15:53:17.000000000 +0100
60 // wxStringData class deallocation
61 // ===========================================================================
63 -#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
64 +#if 1 || defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
65 # pragma message (__FILE__ ": building with Multithreaded non DLL runtime has a performance impact on wxString!")
66 void wxStringData::Free()