compilation fix

[wxWidgets.git] / docs / tech / tn0016.txt

diff --git a/docs/tech/tn0016.txt b/docs/tech/tn0016.txt
index 076c3340246a34abf8447c653249c676e92aaae8..99d288265886a639949b178138ca956886a7cd2c 100644 (file)
--- a/docs/tech/tn0016.txt
+++ b/docs/tech/tn0016.txt
@@ -14,7 +14,7 @@ Python on Windows.
 Once you have installed Bakefile, you can easily regenerate the makefiles using
 the makefile in $(wx)/build/bakefiles directory. The makefile uses Unix make
 syntax and works on Unix or using either Borland Make or GNU Make (including
-native Win32 port called mingw32-make from http://www.mingw.org) on Windows.
+native Win32 port called mingw32-make from http://www.mingw.org/) on Windows.
 It is possible that other Windows make utilities work as well, but it wasn't
 tested. "make clean" only works on Unix or Cygwin or MSYS emulation layer on
 Windows.
@@ -40,17 +40,21 @@ IMPORTANT NOTE: Don't forget to run autoconf in wxWindows root directory if
 You can use Bakefile to generate makefiles or projects customized to your
 needs, too. See Makefile for details on bakefile commands used to generate
 makefiles. For example, you can use this command to generate VC++ project
-files without wxUniversal configurations:
+files without wxUniversal configurations (you can find needed flags in
+DSWFLAGS variable of build/bakefiles/Makefile):
     bakefile -v -fmsvc6prj -o../wxmy.dsw -DRUNTIME_LIBS=dynamic
-             -DOFFICIAL_BUILD=0 -DUSE_HTML=1 -DUSE_OPENGL=1
+             -DDEBUG_INFO=default -DDEBUG_FLAG=default
+             -DOFFICIAL_BUILD=0 -DUSE_HTML=1 -DUSE_OPENGL=1 -DUSE_ODBC=1
              -DMONOLITHIC=0 -DUSE_GUI=1 -DWXUNIV=0 wx.bkl
 Or monolithic instead of multilib (the default):
     bakefile -v -fmsvc6prj -o../wxmono.dsw -DRUNTIME_LIBS=dynamic
-             -DOFFICIAL_BUILD=0 -DUSE_HTML=1 -DUSE_OPENGL=1
+             -DDEBUG_INFO=default -DDEBUG_FLAG=default
+             -DOFFICIAL_BUILD=0 -DUSE_HTML=1 -DUSE_OPENGL=1 -DUSE_ODBC=1
              -DMONOLITHIC=1 -DUSE_GUI=1 wx.bkl
 Or monolithic wxBase:
     bakefile -v -fmsvc6prj -o../wxBase.dsw -DRUNTIME_LIBS=dynamic
-             -DOFFICIAL_BUILD=0 -DUSE_HTML=0 -DUSE_OPENGL=0
+             -DDEBUG_INFO=default -DDEBUG_FLAG=default
+             -DOFFICIAL_BUILD=0 -DUSE_HTML=0 -DUSE_OPENGL=0 -DUSE_ODBC=0
              -DMONOLITHIC=1 -DUSE_GUI=0 wx.bkl
 
 
@@ -124,7 +128,9 @@ Make sure to add <wx-lib> statements for all libraries from multilib build
 that are required by the sample.
 
 Run Python script regenMakefile.py in $(wx)/build/bakefiles to update Makefile
-and commit $(wx)/build/bakefiles/Makefile.
+then run "make" in $(wx)/build/bakefiles directories.
+
+Finally commit $(wx)/build/bakefiles/Makefile and all the other modified files.
 
 
 5. Adding contrib library
@@ -193,13 +199,13 @@ d) Add files to multilib build: add foolib and foodll targets. Don't use
 
 e) Regenerate all makefiles (don't forget to run autoconf)
 
-f) Update wx-config.in to contain information about the library and needed
-   linker flags:
-   * Add "foo" to either CORE_BASE_LIBS or CORE_GUI_LIBS so that wxFoo is
-     not treated as contrib library in monolithic build.
+f) Update configure.in and wx-config.in to contain information about
+   the library and needed linker flags:
+   * Add "foo" to either CORE_BASE_LIBS or CORE_GUI_LIBS in configure.in so
+     that wxFoo is not treated as contrib library in monolithic build.
    * If wxFoo links against additional libraries, add neccessary linker
-     flags and libraries to ldflags_foo and ldlibs_foo variables (both are
-     optional).
+     flags and libraries to ldflags_foo and ldlibs_foo variables in
+     wx-config.in (both are optional).
 
 g) Update defs.h to define WXMAKINGDLL_FOO if WXMAKINGDLL is defined (add
    #define WXMAKINGDLL_FOO inside first "#ifdef WXMAKINGDLL" block in defs.h)
@@ -217,8 +223,13 @@ g) Update defs.h to define WXMAKINGDLL_FOO if WXMAKINGDLL is defined (add
         #endif
    Use WXDLLIMPEXP_FOO when declaring wxFoo classes and functions.
 
-i) Add information about wxFoo to the manual
-   FIXME - where exactly
+h) Add this code to one of wxFoo's files (the more often used, the better):
+      // DLL options compatibility check:
+      #include "wx/app.h"
+      WX_CHECK_BUILD_OPTIONS("wxFoo")
+
+i) Add information about wxFoo to the manual ("Libraries list" section
+   in libs.tex).
 
 
 === EOF ===