From: Francesco Montorsi Date: Sun, 24 Feb 2008 14:19:20 +0000 (+0000) Subject: remove other references to the contrib hierarchy, which does not exist anymore X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cf8e09572478b7bdf53eb81d4dbf8638b8295d12 remove other references to the contrib hierarchy, which does not exist anymore git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/tech/tn0010.htm b/docs/tech/tn0010.htm index ec13fa0440..d5470a46fc 100644 --- a/docs/tech/tn0010.htm +++ b/docs/tech/tn0010.htm @@ -74,7 +74,7 @@ WINVER=0x0400,STRICT

The Additional include directories field should contain the following:

-c:\wx2\include,c:\wx2\contrib\include
+c:\wx2\include
 

(and of course any other directories you wish to use in your project).

@@ -125,7 +125,7 @@ for the Release configuration.

The Additional library path field should contain

-c:\wx2\lib,c:\wx2\contrib\lib
+c:\wx2\lib
 
for both Debug and Release configurations. @@ -137,7 +137,7 @@ for both Debug and Release configurations. Select your .rc file. The Additional resource include directories field should contain:
-c:\wx2\include;c:\wx2\contrib\include
+c:\wx2\include
 
@@ -202,7 +202,7 @@ libcd.lib,libcid.lib Select your .rc file. The Additional resource include directories field should contain:
-..\..\include\msw;..\..\contrib\fafa
+..\..\include\msw
 
diff --git a/docs/tech/tn0013.txt b/docs/tech/tn0013.txt index 6b170e754a..afeaa56b1d 100644 --- a/docs/tech/tn0013.txt +++ b/docs/tech/tn0013.txt @@ -22,7 +22,7 @@ a) Do a fresh checkout using the command by this command, please modify CVSROOT/modules to include the missing files so that it works for the next release! - You also need the samples, demos and contrib directories, so change to + You also need the samples and demos directories, so change to wxWidgets directory created by the first cvs command and do "cvs up -d" for each of them. Of course, you can also check out everything (use wxWidgets module name instead of wxGTK) if the bandwidth and disk space diff --git a/docs/tech/tn0016.txt b/docs/tech/tn0016.txt index 3d93009bf7..6120998ddf 100644 --- a/docs/tech/tn0016.txt +++ b/docs/tech/tn0016.txt @@ -16,7 +16,7 @@ the bakefile_gen tool. Run it from $(wx)/build/bakefiles directory and it will regenerate all outdated makefiles. See $(wx)/build/bakefiles/README for more details. -Note that it generates makefiles for samples and contrib libraries, too. +Note that it generates makefiles for samples, too. IMPORTANT NOTE: Don't forget to run autoconf in wxWidgets root directory (after running Bakefile) if you changed any conditional @@ -49,18 +49,16 @@ and use bakefile_gen instead of running bakefile directly. 2. Bakefile files organization ------------------------------ -Makefile are generated from .bkl files ("bakefiles") from three places: +Makefile are generated from .bkl files ("bakefiles") from two places: - $(wx)/build/bakefiles directory - - $(wx)/contrib/build/* directories - samples directories $(wx)/build/bakefiles contains bakefiles for main library and support files -that simplify writing bakefiles for contrib and samples. +that simplify writing bakefiles for samples. Support files are: wxwin.py - helper functions common.bkl common_samples.bkl - common_contrib.bkl - shared definitions and templates config.bkl - user-configurable build options make_dist.mk - implementation of "make dist" on Unix @@ -181,8 +179,7 @@ e) Regenerate all makefiles (don't forget to run autoconf) f) Update configure.in and wx-config.in to contain information about the library and needed linker flags: - * Add "foo" to either STD_BASE_LIBS or STD_GUI_LIBS in configure.in if - wxFoo is not to be treated as contrib library in monolithic build. + * Add "foo" to either STD_BASE_LIBS or STD_GUI_LIBS in configure.in. * If wxFoo links against additional libraries, add necessary linker flags and libraries to ldflags_foo and ldlibs_foo variables in wx-config.in (both are optional).