Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forcefully disable wxUSE_STD_STRING and wxUSE_STL for Digital Mars and Open Watcom

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-30 23:09:39 +00:00
parent f0985cf4ea
commit 0797d64777
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docs/msw/install.txt
View File

@@ -344,6 +344,13 @@ Note (4): if Watcom can't read the precompiled header when building a sample,
try deleting .pch files in build\msw\wat_* and compiling try deleting .pch files in build\msw\wat_* and compiling
the sample again. the sample again.
Note (5): wxUSE_STD_STRING is disabled in wx/string.h for Watcom as this
compiler doesn't come with standard C++ library headers by default.
If you install STLPort or another STL implementation, you'll need to
edit wx/string.h and remove the check for Digital Mars in it (search
for __WATCOM__).
Metrowerks CodeWarrior compilation Metrowerks CodeWarrior compilation
---------------------------------------------------------------- ----------------------------------------------------------------
@@ -597,6 +604,12 @@ using bakefile tool according to the instructions in build\bakefiles\README:
bakefile_gen -f dmars -b ../../samples/minimal/minimal.bkl bakefile_gen -f dmars -b ../../samples/minimal/minimal.bkl
Note that wxUSE_STD_STRING is disabled in wx/string.h for Digital Mars as this
compiler doesn't come with standard C++ library headers by default. If you
install STLPort or another STL implementation, you'll need to edit wx/string.h
and remove the check for Digital Mars in it (search for __DMC__).
16-bit compilation is no longer supported. 16-bit compilation is no longer supported.
Configuring the build Configuring the build

11
include/wx/string.h
View File

@@ -169,6 +169,17 @@ inline int Stricmp(const char *psz1, const char *psz2)
// deal with STL/non-STL/non-STL-but-wxUSE_STD_STRING // deal with STL/non-STL/non-STL-but-wxUSE_STD_STRING
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_STL || wxUSE_STD_STRING
// these compilers come without standard C++ library headers by default,
// remove the tests here if you do have them (e.g. from STLPort)
#if defined(__DMC__) || defined(__WATCOMC__)
#undef wxUSE_STL
#undef wxUSE_STD_STRING
#define wxUSE_STL 0
#define wxUSE_STD_STRING 0
#endif
#endif // wxUSE_STL || wxUSE_STD_STRING
// in both cases we need to define wxStdString // in both cases we need to define wxStdString
#if wxUSE_STL || wxUSE_STD_STRING #if wxUSE_STL || wxUSE_STD_STRING