Format-specific notes:
* autoconf:
- Beware that you have to use AM_OPTIONS_WXCONFIG and
- AM_PATH_WXCONFIG in your configure.in to get at least the
+ Beware that you have to use WX_CONFIG_OPTIONS and
+ WX_CONFIG_CHECK in your configure.in to get at least the
WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS option values defined.
+
To detect the WX_* option values typically you also want to use
- the AM_WXPRESETS_OPTIONS and AM_WXPRESETS_CHECKS macros
- (see wxpresets.m4 for more info).
+ the WX_STANDARD_OPTIONS, WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS,
+ WX_CONFIG_CHECK and finally WX_DETECT_STANDARD_OPTION_VALUES macros
+ (see wxwin.m4 for more info).
-->
thus we can now add WX_LIBS to the linker line -->
<ldlibs>$(WX_LIBS)</ldlibs>
</if>
- <if cond="value not in ALLLIB_LIST.split()">
+ <if cond="value not in WX_LIB_LIST.split()">
<error>Unknown wxWidgets library given in the wx-lib tag</error>
</if>
</define-tag>
of the WX_* options in wx.bkl -->
<unset var="WX_SHARED"/>
<unset var="WX_UNICODE"/>
- <unset var="WX_DEBUG"/>
<unset var="WX_PORT"/>
<unset var="WX_VERSION"/>
</option>
<set var="WX_PORT_DEFAULT" overwrite="0">
- $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+ $(DOLLAR)(shell $(WX_CONFIG) --query-toolkit)
</set>
<option name="WX_PORT">
- <values>gtk1,gtk2,msw,x11,motif,mgl,mac,dfb</values>
+ <values>gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb</values>
<default-value force="1">$(WX_PORT_DEFAULT)</default-value>
<description>
Port of the wx library to build against
</option>
<set var="WX_SHARED_DEFAULT" overwrite="0">
- $(DOLLAR)(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+ $(DOLLAR)(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; else echo 0; fi)
</set>
<option name="WX_SHARED">
<values>0,1</values>
</option>
<set var="WX_UNICODE_DEFAULT" overwrite="0">
- $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+ $(DOLLAR)(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/')
</set>
<option name="WX_UNICODE">
<values>0,1</values>
</description>
</option>
- <set var="WX_DEBUG_DEFAULT" overwrite="0">
- $(DOLLAR)(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
- </set>
- <option name="WX_DEBUG">
- <values>0,1</values>
- <values-description>Release,Debug</values-description>
- <default-value force="1">$(WX_DEBUG_DEFAULT)</default-value>
- <description>
- Use debug build of wxWidgets (define __WXDEBUG__)?
- </description>
- </option>
-
<set var="WX_VERSION_DEFAULT" overwrite="0">
- $(DOLLAR)(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+ $(DOLLAR)(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/')
</set>
<option name="WX_VERSION">
<default-value>$(WX_VERSION_DEFAULT)</default-value>
a win32 makefile: i.e. a makefile where you can select the wanted
wxWidgets build using the WX_* options.
- The difference with win32 makefiles is that WX_DEBUG, WX_UNICODE and
+ The difference with win32 makefiles is that WX_PORT, WX_UNICODE and
WX_SHARED options have a smart default value which is created using
the installed wx-config or the wx-config given using WX_CONFIG option
-->
- <set var="WX_CONFIG_DEBUG_FLAG">
- <if cond="WX_DEBUG=='0'">--debug=no</if>
- <if cond="WX_DEBUG=='1'">--debug=yes</if>
- </set>
<set var="WX_CONFIG_UNICODE_FLAG">
<if cond="WX_UNICODE=='0'">--unicode=no</if>
<if cond="WX_UNICODE=='1'">--unicode=yes</if>
</set>
<set var="WX_CONFIG_FLAGS" make_var="1">
- $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG)
+ $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG)
$(WX_CONFIG_PORT_FLAG) $(WX_CONFIG_VERSION_FLAG)
</set>
+ <set var="DEFAULT_CXX">`$(DOLLAR)(WX_CONFIG) --cxx`</set>
<set var="WX_CFLAGS">`$(DOLLAR)(WX_CONFIG) --cflags $(WX_CONFIG_FLAGS)`</set>
<set var="WX_CXXFLAGS">`$(DOLLAR)(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)`</set>
<set var="WX_CPPFLAGS">`$(DOLLAR)(WX_CONFIG) --cppflags $(WX_CONFIG_FLAGS)`</set>
that simply creating the following target; if it fails the make
program will halt with the wx-config error message...
-->
- <action id="test_for_selected_wxbuild">
- <dependency-of>all</dependency-of>
-
- <!-- Use @ to hide to the user that we're running wx-config... -->
- <command>@$(DOLLAR)(WX_CONFIG) $(WX_CONFIG_FLAGS)</command>
- </action>
+ <if cond="WX_TEST_FOR_SELECTED_WXBUILD=='1'">
+ <action id="test_for_selected_wxbuild">
+ <dependency-of>all</dependency-of>
+ <!-- Use @ to hide to the user that we're running wx-config... -->
+ <command>@$(DOLLAR)(WX_CONFIG) $(WX_CONFIG_FLAGS)</command>
+ </action>
+ </if>
- <!-- we need this but the trick used in default-values above
+ <!-- we need these vars but the trick used in the default values above
prevents bakefile from detecting it: -->
<set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG WX_VERSION</set>
<define-tag name="wx-lib" rules="exe,dll,module">
<if cond="value=='base'">
<!-- all wx libraries should have been already specified, thus
- $(__liblist) should contain the full list... -->
+ $(__liblist) should contain the full list of required wxlibs... -->
<set var="__liblist" append="1">base</set>
<ldlibs>`$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs $(','.join(__liblist.split()))`</ldlibs>
</if>
<if cond="value!='base'">
<set var="__liblist" append="1">$(value)</set>
</if>
- <if cond="value not in ALLLIB_LIST.split()">
+ <if cond="value not in WX_LIB_LIST.split()">
<error>Unknown wxWidgets library given in the wx-lib tag</error>
</if>
</define-tag>
projects / wxWidgets.git / blobdiff