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
This commit is contained in:
@@ -74,7 +74,7 @@ WINVER=0x0400,STRICT</PRE>
|
|||||||
<P>
|
<P>
|
||||||
The <B>Additional include directories</B> field should contain the following:<P>
|
The <B>Additional include directories</B> field should contain the following:<P>
|
||||||
<PRE>
|
<PRE>
|
||||||
c:\wx2\include,c:\wx2\contrib\include
|
c:\wx2\include
|
||||||
</PRE>
|
</PRE>
|
||||||
<P>(and of course any other directories you wish to use in your project).<P>
|
<P>(and of course any other directories you wish to use in your project).<P>
|
||||||
|
|
||||||
@@ -125,7 +125,7 @@ for the Release configuration.<P>
|
|||||||
The <B>Additional library path</B> field should contain
|
The <B>Additional library path</B> field should contain
|
||||||
|
|
||||||
<PRE>
|
<PRE>
|
||||||
c:\wx2\lib,c:\wx2\contrib\lib
|
c:\wx2\lib
|
||||||
</PRE>
|
</PRE>
|
||||||
|
|
||||||
for both Debug and Release configurations.
|
for both Debug and Release configurations.
|
||||||
@@ -137,7 +137,7 @@ for both Debug and Release configurations.
|
|||||||
Select your .rc file. The <B>Additional resource include directories</B> field should contain:
|
Select your .rc file. The <B>Additional resource include directories</B> field should contain:
|
||||||
|
|
||||||
<PRE>
|
<PRE>
|
||||||
c:\wx2\include;c:\wx2\contrib\include
|
c:\wx2\include
|
||||||
</PRE>
|
</PRE>
|
||||||
|
|
||||||
</DL>
|
</DL>
|
||||||
@@ -202,7 +202,7 @@ libcd.lib,libcid.lib
|
|||||||
Select your .rc file. The <B>Additional resource include directories</B> field should contain:
|
Select your .rc file. The <B>Additional resource include directories</B> field should contain:
|
||||||
|
|
||||||
<PRE>
|
<PRE>
|
||||||
..\..\include\msw;..\..\contrib\fafa
|
..\..\include\msw
|
||||||
</PRE>
|
</PRE>
|
||||||
|
|
||||||
</DL>
|
</DL>
|
||||||
|
@@ -22,7 +22,7 @@ a) Do a fresh checkout using the command
|
|||||||
by this command, please modify CVSROOT/modules to include the missing
|
by this command, please modify CVSROOT/modules to include the missing
|
||||||
files so that it works for the next release!
|
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"
|
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
|
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
|
wxWidgets module name instead of wxGTK) if the bandwidth and disk space
|
||||||
|
@@ -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
|
regenerate all outdated makefiles. See $(wx)/build/bakefiles/README for more
|
||||||
details.
|
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
|
IMPORTANT NOTE: Don't forget to run autoconf in wxWidgets root directory
|
||||||
(after running Bakefile) if you changed any conditional
|
(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
|
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)/build/bakefiles directory
|
||||||
- $(wx)/contrib/build/* directories
|
|
||||||
- samples directories
|
- samples directories
|
||||||
$(wx)/build/bakefiles contains bakefiles for main library and support files
|
$(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:
|
Support files are:
|
||||||
wxwin.py - helper functions
|
wxwin.py - helper functions
|
||||||
common.bkl
|
common.bkl
|
||||||
common_samples.bkl
|
common_samples.bkl
|
||||||
common_contrib.bkl - shared definitions and templates
|
|
||||||
config.bkl - user-configurable build options
|
config.bkl - user-configurable build options
|
||||||
make_dist.mk - implementation of "make dist" on Unix
|
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
|
f) Update configure.in and wx-config.in to contain information about
|
||||||
the library and needed linker flags:
|
the library and needed linker flags:
|
||||||
* Add "foo" to either STD_BASE_LIBS or STD_GUI_LIBS in configure.in if
|
* Add "foo" to either STD_BASE_LIBS or STD_GUI_LIBS in configure.in.
|
||||||
wxFoo is not to be treated as contrib library in monolithic build.
|
|
||||||
* If wxFoo links against additional libraries, add necessary linker
|
* If wxFoo links against additional libraries, add necessary linker
|
||||||
flags and libraries to ldflags_foo and ldlibs_foo variables in
|
flags and libraries to ldflags_foo and ldlibs_foo variables in
|
||||||
wx-config.in (both are optional).
|
wx-config.in (both are optional).
|
||||||
|
Reference in New Issue
Block a user