Remove mentions of wxUSE_ODBC from documentation.

This option doesn't exist any more in 2.9.

See #12244.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-07-23 23:44:00 +00:00
parent 9a7963a97c
commit e80264fdbe
2 changed files with 9 additions and 24 deletions

View File

@@ -142,8 +142,7 @@ Using project files (VC++ 6 and later):
Alternatively, use the special wx_dll.dsw project which adds the Alternatively, use the special wx_dll.dsw project which adds the
dependencies to force the correct order (but, because of this, doesn't work dependencies to force the correct order (but, because of this, doesn't work
for the static libraries) or simply redo the build several times until all for the static libraries) or simply redo the build several times until all
DLLs are linked correctly. Please notice that it's normal that dbgrid project DLLs are linked correctly.
doesn't build if wxUSE_ODBC is set to 0 (default).
3. Open a sample project file, choose a configuration such as 3. Open a sample project file, choose a configuration such as
Win32 Debug using Build | Set Active Configuration..., and compile. Win32 Debug using Build | Set Active Configuration..., and compile.
The project files don't use precompiled headers, to save disk The project files don't use precompiled headers, to save disk
@@ -300,12 +299,7 @@ make sure that your own project or makefile settings use the
same alignment, or you could experience mysterious crashes. To same alignment, or you could experience mysterious crashes. To
change the alignment, change CPPFLAGS in build\msw\config.bcc. change the alignment, change CPPFLAGS in build\msw\config.bcc.
Note (2): if you get undefined _SQL... symbols at link time, Note (2): If you wish debug messages to be sent to the console in
either install odbc32.lib from the BC++ CD-ROM into your BC++ lib
directory, or set wxUSE_ODBC to 0 in include\wx\msw\setup.h and
recompile wxWidgets. The same applies if compiling using the IDE.
Note (3): If you wish debug messages to be sent to the console in
debug mode, edit makefile.bcc and change /aa to /Tpe in link commands. debug mode, edit makefile.bcc and change /aa to /Tpe in link commands.
Using the Debugger and IDE in BDS or Turbo Explorer Using the Debugger and IDE in BDS or Turbo Explorer
@@ -355,22 +349,18 @@ Watcom C++ 10.6/11 and OpenWatcom Compilation
2. Change directory to samples\minimal and type 'wmake -f makefile.wat' 2. Change directory to samples\minimal and type 'wmake -f makefile.wat'
to make this sample. Repeat for other samples of interest. to make this sample. Repeat for other samples of interest.
Note (1): if your installation of Watcom doesn't have odbc32.lib file and Note (1): if variant.cpp is compiled with date/time class options, the linker
you need it (i.e. you have wxUSE_ODBC=1), you can use the file
from lib\watcom directory. See the notes in that directory.
Note (2): if variant.cpp is compiled with date/time class options, the linker
gives up. So the date/time option is switched off for Watcom C++. gives up. So the date/time option is switched off for Watcom C++.
Also, wxAutomationObject is not compiled with Watcom C++ 10. Also, wxAutomationObject is not compiled with Watcom C++ 10.
Note (3): RawBitmaps won't work at present because they use unsupported template Note (2): RawBitmaps won't work at present because they use unsupported template
classes classes
Note (4): if Watcom can't read the precompiled header when building a sample, Note (3): 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 Note (4): wxUSE_STD_STRING is disabled in wx/string.h for Watcom as this
compiler doesn't come with standard C++ library headers by default. compiler doesn't come with standard C++ library headers by default.
If you install STLPort or another STL implementation, you'll need to 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 edit wx/string.h and remove the check for Digital Mars in it (search
@@ -735,11 +725,6 @@ USE_OPENGL=1
OpenGL library is always built as additional library, even in monolithic OpenGL library is always built as additional library, even in monolithic
build! build!
USE_ODBC=1
Build two additional libraries in multilib mode, one with database
classes and one with wxGrid database support. You must
#define wxUSE_ODBC 1 in setup.h
USE_HTML=0 USE_HTML=0
Do not build wxHTML library. If MONOLITHIC=1, then you must also Do not build wxHTML library. If MONOLITHIC=1, then you must also
#define wxUSE_HTML 1 in setup.h. #define wxUSE_HTML 1 in setup.h.

View File

@@ -29,17 +29,17 @@ generate makefiles. For example, you can use this command to generate
VC++ project files without wxUniversal configurations: VC++ project files without wxUniversal configurations:
bakefile -v -fmsvc6prj -o../wxmy.dsw -DRUNTIME_LIBS=dynamic bakefile -v -fmsvc6prj -o../wxmy.dsw -DRUNTIME_LIBS=dynamic
-DDEBUG_INFO=default -DDEBUG_FLAG=default -DDEBUG_INFO=default -DDEBUG_FLAG=default
-DOFFICIAL_BUILD=0 -DUSE_HTML=1 -DUSE_OPENGL=1 -DUSE_ODBC=1 -DOFFICIAL_BUILD=0 -DUSE_HTML=1 -DUSE_OPENGL=1
-DMONOLITHIC=0 -DUSE_GUI=1 -DWXUNIV=0 wx.bkl -DMONOLITHIC=0 -DUSE_GUI=1 -DWXUNIV=0 wx.bkl
Or monolithic instead of multilib (the default): Or monolithic instead of multilib (the default):
bakefile -v -fmsvc6prj -o../wxmono.dsw -DRUNTIME_LIBS=dynamic bakefile -v -fmsvc6prj -o../wxmono.dsw -DRUNTIME_LIBS=dynamic
-DDEBUG_INFO=default -DDEBUG_FLAG=default -DDEBUG_INFO=default -DDEBUG_FLAG=default
-DOFFICIAL_BUILD=0 -DUSE_HTML=1 -DUSE_OPENGL=1 -DUSE_ODBC=1 -DOFFICIAL_BUILD=0 -DUSE_HTML=1 -DUSE_OPENGL=1
-DMONOLITHIC=1 -DUSE_GUI=1 wx.bkl -DMONOLITHIC=1 -DUSE_GUI=1 wx.bkl
Or monolithic wxBase: Or monolithic wxBase:
bakefile -v -fmsvc6prj -o../wxBase.dsw -DRUNTIME_LIBS=dynamic bakefile -v -fmsvc6prj -o../wxBase.dsw -DRUNTIME_LIBS=dynamic
-DDEBUG_INFO=default -DDEBUG_FLAG=default -DDEBUG_INFO=default -DDEBUG_FLAG=default
-DOFFICIAL_BUILD=0 -DUSE_HTML=0 -DUSE_OPENGL=0 -DUSE_ODBC=0 -DOFFICIAL_BUILD=0 -DUSE_HTML=0 -DUSE_OPENGL=0
-DMONOLITHIC=1 -DUSE_GUI=0 wx.bkl -DMONOLITHIC=1 -DUSE_GUI=0 wx.bkl
It is, however, recommended to modify Bakefiles.bkgen (or It is, however, recommended to modify Bakefiles.bkgen (or
Bakefiles.local.bkgen) by means of <add-flags> and <del-flags> directives Bakefiles.local.bkgen) by means of <add-flags> and <del-flags> directives