]>
Commit | Line | Data |
---|---|---|
cf615ebb VS |
1 | How to add new files and libraries to wxWindows build system |
2 | ============================================================ | |
3 | ||
4 | ||
5 | 1. Regenerating makefiles | |
6 | ------------------------- | |
7 | ||
b6e20cff VS |
8 | wxWindows now uses Bakefile (http://bakefile.sourceforge.net) to generate |
9 | native makefiles. You must have bakefile installed if you want to regenerate | |
10 | the makefiles. Bakefile currently runs on Unix and Windows systems. You will | |
11 | need Python >= 2.2 installed on Unix and either use Bakefile installer or have | |
12 | Python on Windows. | |
13 | ||
14 | Once you have installed Bakefile, you can easily regenerate the makefiles using | |
2da40942 VS |
15 | the bakefile_gen tool. Run it from $(wx)/build/bakefiles directory and it will |
16 | regenerate all outdated makefiles. See $(wx)/build/bakefiles/README for more | |
17 | details. | |
b6e20cff VS |
18 | |
19 | Note that it generates makefiles for samples and contrib libraries, too. | |
20 | ||
5c3dca2f VS |
21 | IMPORTANT NOTE: Don't forget to run autoconf in wxWindows root directory |
22 | (after running Bakefile) if you changed any conditional | |
23 | variable or target condition in .bkl files! You will know that | |
24 | this happened if $(wx)/autoconf_inc.m4 content changed. | |
b6e20cff | 25 | |
055f8a8b | 26 | You can use Bakefile to generate makefiles or projects customized to your |
2da40942 VS |
27 | needs, too. See Bakefiles.bkgen for details on bakefile commands used to |
28 | generate makefiles. For example, you can use this command to generate | |
29 | VC++ project files without wxUniversal configurations: | |
055f8a8b | 30 | bakefile -v -fmsvc6prj -o../wxmy.dsw -DRUNTIME_LIBS=dynamic |
f2131574 | 31 | -DDEBUG_INFO=default -DDEBUG_FLAG=default |
c580f45e | 32 | -DOFFICIAL_BUILD=0 -DUSE_HTML=1 -DUSE_OPENGL=1 -DUSE_ODBC=1 |
055f8a8b VS |
33 | -DMONOLITHIC=0 -DUSE_GUI=1 -DWXUNIV=0 wx.bkl |
34 | Or monolithic instead of multilib (the default): | |
35 | bakefile -v -fmsvc6prj -o../wxmono.dsw -DRUNTIME_LIBS=dynamic | |
f2131574 | 36 | -DDEBUG_INFO=default -DDEBUG_FLAG=default |
c580f45e | 37 | -DOFFICIAL_BUILD=0 -DUSE_HTML=1 -DUSE_OPENGL=1 -DUSE_ODBC=1 |
055f8a8b VS |
38 | -DMONOLITHIC=1 -DUSE_GUI=1 wx.bkl |
39 | Or monolithic wxBase: | |
40 | bakefile -v -fmsvc6prj -o../wxBase.dsw -DRUNTIME_LIBS=dynamic | |
f2131574 | 41 | -DDEBUG_INFO=default -DDEBUG_FLAG=default |
c580f45e | 42 | -DOFFICIAL_BUILD=0 -DUSE_HTML=0 -DUSE_OPENGL=0 -DUSE_ODBC=0 |
055f8a8b VS |
43 | -DMONOLITHIC=1 -DUSE_GUI=0 wx.bkl |
44 | ||
cf615ebb VS |
45 | |
46 | 2. Bakefile files organization | |
47 | ------------------------------ | |
48 | ||
b6e20cff VS |
49 | Makefile are generated from .bkl files ("bakefiles") from three places: |
50 | - $(wx)/build/bakefiles directory | |
51 | - $(wx)/contrib/build/* directories | |
52 | - samples directories | |
53 | $(wx)/build/bakefiles contains bakefiles for main library and support files | |
54 | that simplify writing bakefiles for contrib and samples. | |
55 | ||
56 | Support files are: | |
57 | wxwin.py - helper functions | |
58 | common.bkl | |
59 | common_samples.bkl | |
60 | common_contrib.bkl - shared definitions and templates | |
61 | config.bkl - user-configurable build options | |
19c35fa5 | 62 | make_dist.mk - implementation of "make dist" on Unix |
b6e20cff VS |
63 | |
64 | Files used to build the library are: | |
65 | wx.bkl - main file | |
66 | files.bkl - lists of source files | |
67 | monolithic.bkl - targets for wxWin built as single big library | |
68 | multilib.bkl - targets for multilib build | |
69 | opengl.bkl - GL library with wxGLCanvas (this one is not | |
70 | included in monolithic library for historical | |
71 | reasons, so "monolithic" really means "two libs") | |
72 | {expat,jpeg,png,tiff, | |
73 | regex,zlib,odbc}.bkl - 3rd party libraries makefiles | |
74 | ||
cf615ebb VS |
75 | |
76 | 3. Adding files to existing library | |
77 | ----------------------------------- | |
78 | ||
b6e20cff VS |
79 | All files used by main libraries are listed in files.bkl. The file is |
80 | organized into variables for toolkits, platforms and libraries. The variables | |
81 | come in pairs: there's always FOO_SRC for source files and FOO_HDR for header | |
82 | files. Platform or toolkit specific files are grouped together in variable | |
83 | with platform or tookit name in them, e.g. BASE_WIN32_SRC, BASE_UNIX_SRC, | |
84 | GTK_SRC, MOTIF_SRC. | |
cf615ebb | 85 | |
b6e20cff VS |
86 | Note: A side effect of this toolkit-centric organization is that one file may |
87 | be present several times in files.bkl in different contenxt. | |
88 | ||
89 | When you are adding a file, you must put it into appropriate variable. This is | |
90 | easy if you are adding the file to library that is always built from same | |
91 | sources on all platforms (e.g. wxXml or wxXML) -- simply add the file to e.g. | |
92 | HTML_SRC or HTML_HDR. | |
93 | ||
94 | If the file is used only on one platform and is part of wxBase, add it to | |
95 | BASE_{platform}_SRC/HDR. If it is used on all platforms, add it to BASE_CMN. | |
96 | If it is built on more than one platform but not on all of them, add the file | |
97 | to *all platforms that use it*! | |
98 | ||
99 | If a file is not wxBase file, but GUI file, then the variables are named after | |
100 | toolkits/ports, not platforms. Same rules as for wxBase files apply | |
101 | (substitute "platform" with "toolkit"). Make sure you correctly choose between | |
102 | {port}_LOWLEVEL_SRC and {port}_SRC -- the former is for files used by | |
103 | wxUniversal, e.g. GDI classes. Files shared by all X Window System ports | |
104 | should be put into XWIN_LOWLEVEL_SRC. | |
105 | ||
106 | ||
107 | 4. Adding sample | |
108 | ---------------- | |
109 | ||
110 | Copy the bakefile from another sample, change the ID and files accordingly. | |
111 | If the sample uses some data files, make sure to have <wx-data> node | |
112 | in the sample's bakefile (see e.g. samples/image/image.bkl for an example). | |
113 | Make sure to add <wx-lib> statements for all libraries from multilib build | |
114 | that are required by the sample. | |
115 | ||
cfde0f19 | 116 | Run bakefile_gen in $(wx)/build/bakefiles to regenerate the bakefiles. |
91b34dd9 VZ |
117 | |
118 | Finally commit $(wx)/build/bakefiles/Makefile and all the other modified files. | |
b6e20cff VS |
119 | |
120 | ||
121 | 5. Adding contrib library | |
122 | ------------------------- | |
123 | ||
124 | Contrib library bakefiles are located in $(wx)/contrib/build/name-of-contrib | |
125 | directory, together with generated makefiles. Copy the bakefile from another | |
126 | contrib library, change the IDs and files accordingly. Note that there must be | |
127 | two targets for contrib wxFoo: foodll and foolib. | |
128 | ||
129 | foodll definition must contain <wx-lib> statements for all libraries it | |
130 | depends on. WXUSINGDLL and WXMAKINGDLL_FOO must be defined and symbols from | |
131 | the library should use WXDLLIMPEXP_FOO defined in wxFoo's headers analogically | |
132 | to WXDLLIMPEXP_{BASE,CORE,HTML,...} in the main library (see 5g below for | |
133 | additional details). | |
134 | ||
cfde0f19 VS |
135 | Run bakefile_gen in $(wx)/build/bakefiles to regenerate makefiles |
136 | then commit $(wx)/build/bakefiles/Makefile. | |
cf615ebb VS |
137 | |
138 | ||
b6e20cff | 139 | 6. Adding new core library |
cf615ebb VS |
140 | -------------------------- |
141 | ||
142 | When adding new library to the core set of libraries, the files must be | |
143 | added to both a newly added library in multilib build and into the single | |
144 | library built in monolithic mode. We will assume that the new library is | |
145 | called wxFoo. | |
146 | ||
b6e20cff VS |
147 | a) Add files to files.bkl: |
148 | * If wxFoo builds from same files on all platforms (e.g. wxNet), | |
149 | add FOO_SRC and FOO_HDR variables with lists of sources and headers. | |
150 | * If wxFoo have no files in common (e.g. wxGL), add FOO_SRC and FOO_HDR | |
151 | with toolkit or platform conditions. Have a look at OPENGL_SRC for an | |
152 | example. | |
153 | * Otherwise add FOO_CMN_SRC and FOO_CMN_HDR for common files and | |
154 | FOO_{platform}_{SRC,HDR} or FOO_{toolkit}_{SRC,HDR} as appropriate. Add | |
155 | FOO_PLATFORM_{SRC,HDR} into "Define sources for specific libraries" | |
156 | section that is conditionally set to one of FOO_xxx_{SRC,HDR} based on | |
157 | target platform/toolkit (see NET_PLATFORM_SRC definition for an example). | |
158 | Finally, define FOO_SRC and FOO_HDR to contain both | |
159 | FOO_PLATFORM_{SRC,HDR} and FOO_{SRC,HDR} (see NET_SRC definition for an | |
160 | example). | |
19c35fa5 VS |
161 | * Add FOO_HDR to ALL_GUI_HEADERS or ALL_BASE_HEADERS. |
162 | * If wxFoo is wxBase library (doesn't use GUI), add FOO_SRC to | |
163 | ALL_BASE_SOURCES. | |
b6e20cff VS |
164 | |
165 | (You can apply different approaches to HDR and SRC variables, if e.g. | |
166 | headers are all common but sources are not.) | |
167 | ||
168 | Note that the conditions can only test for equality, due to limitations of | |
169 | native make tools. | |
cf615ebb VS |
170 | |
171 | b) Modify bakefile system in build/bakefiles/ to recognize wxFoo: | |
19c35fa5 | 172 | * Add 'foo' to MAIN_LIBS and LIBS_NOGUI or LIBS_GUI (depending on whether |
cf615ebb | 173 | the library depends on wxCore or not) to wxwin.py file. |
19c35fa5 | 174 | * Add the library to DEPS_TABLE in wxwin.py |
cf615ebb VS |
175 | * Add WXLIB_FOO definition to common.bkl (into the "Names of component |
176 | libraries" section). It looks like this: | |
177 | <set var="WXLIB_FOO"> | |
178 | <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('foo')))</if> | |
179 | </set> | |
180 | ||
b6e20cff VS |
181 | c) Add files to monolithic build: it's enough to add FOO_SRC to MONOLIB_GUI_SRC |
182 | or MONOLIB_SRC, depending on whether wxFoo uses GUI or not. | |
cf615ebb | 183 | |
b6e20cff VS |
184 | d) Add files to multilib build: add foolib and foodll targets. Don't use |
185 | wxBase targets as the template, use e.g. wxXML or wxHTML. Make sure | |
186 | WXMAKINGDLL_FOO is defined in foodll. | |
cf615ebb VS |
187 | |
188 | e) Regenerate all makefiles (don't forget to run autoconf) | |
189 | ||
0c5852cb VS |
190 | f) Update configure.in and wx-config.in to contain information about |
191 | the library and needed linker flags: | |
192 | * Add "foo" to either CORE_BASE_LIBS or CORE_GUI_LIBS in configure.in so | |
193 | that wxFoo is not treated as contrib library in monolithic build. | |
cf615ebb | 194 | * If wxFoo links against additional libraries, add neccessary linker |
0c5852cb VS |
195 | flags and libraries to ldflags_foo and ldlibs_foo variables in |
196 | wx-config.in (both are optional). | |
cf615ebb | 197 | |
7d2681a3 VS |
198 | g) Update dlimpexp.h to define WXMAKINGDLL_FOO if WXMAKINGDLL is defined (add |
199 | #define WXMAKINGDLL_FOO inside first "#ifdef WXMAKINGDLL" block in | |
200 | dlimpexp.h) and to define WXDLLIMPEXP_FOO and WXDLLIMPEXP_DATA_FOO. You | |
201 | can copy e.g. WXDLLIMPEXP_NET definition, it is something like this: | |
cf615ebb VS |
202 | #ifdef WXMAKINGDLL_NET |
203 | #define WXDLLIMPEXP_NET WXEXPORT | |
204 | #define WXDLLIMPEXP_DATA_NET(type) WXEXPORT type | |
205 | #elif defined(WXUSINGDLL) | |
206 | #define WXDLLIMPEXP_NET WXIMPORT | |
207 | #define WXDLLIMPEXP_DATA_NET(type) WXIMPORT type | |
208 | #else // not making nor using DLL | |
209 | #define WXDLLIMPEXP_NET | |
210 | #define WXDLLIMPEXP_DATA_NET(type) type | |
211 | #endif | |
b6e20cff | 212 | Use WXDLLIMPEXP_FOO when declaring wxFoo classes and functions. |
cf615ebb | 213 | |
2512ee4e VS |
214 | h) Add this code to one of wxFoo's files (the more often used, the better): |
215 | // DLL options compatibility check: | |
216 | #include "wx/app.h" | |
217 | WX_CHECK_BUILD_OPTIONS("wxFoo") | |
218 | ||
44aaf7da VS |
219 | i) Add information about wxFoo to the manual ("Libraries list" section |
220 | in libs.tex). | |
cf615ebb VS |
221 | |
222 | ||
223 | === EOF === | |
224 | ||
225 | Version: $Id$ |