Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

last fixes from patch 1604462: fix wxlike-libdirname and change WX_VERSION_DEFAULT to have 2 digits, not 3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-11 02:37:57 +00:00
parent 385fa87513
commit c4106e3b2f
2 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
build/bakefiles/wxpresets/presets/wx.bkl
View File

@@ -60,7 +60,12 @@
follows the wxWidgets naming conventions, then this tag is follows the wxWidgets naming conventions, then this tag is
what you need to reference the wx-based additional library. what you need to reference the wx-based additional library.
- <wxlike-paths>: if your library/application needs to cpmpile & link with both - <wxlike-libdirname>: sets the output directory for the current target to $(value)
when on Unix and to e.g. $(value)/vc_lib when on Windows,
i.e. acts like <dirname> just following wxWidgets naming rules.
Useful to allow multiple builds of the
- <wxlike-paths>: if your library/application needs to compile & link with both
wxWidgets and some other wx-based library, which in turn wxWidgets and some other wx-based library, which in turn
follows the wxWidgets naming conventions, then this tag is follows the wxWidgets naming conventions, then this tag is
what you need to add to the compiler and linker flags the paths what you need to add to the compiler and linker flags the paths
@@ -211,7 +216,7 @@
</if> </if>
<if cond="not isdefined('WX_VERSION')"> <if cond="not isdefined('WX_VERSION')">
<set var="WX_VERSION_DEFAULT" overwrite="0">290</set> <set var="WX_VERSION_DEFAULT" overwrite="0">29</set>
<option name="WX_VERSION"> <option name="WX_VERSION">
<default-value>$(WX_VERSION_DEFAULT)</default-value> <default-value>$(WX_VERSION_DEFAULT)</default-value>
<description> <description>
@@ -366,25 +371,44 @@
<if cond="WX_SHARED=='1'">dll</if> <if cond="WX_SHARED=='1'">dll</if>
</set> </set>
<set var="_DIRNAME"> <set var="_DIRNAME">
lib/$(COMPILER)_$(_DIRNAME_SHARED_SUFFIX) $(value)/$(COMPILER)_$(_DIRNAME_SHARED_SUFFIX)
</set> </set>
<dirname>$(_DIRNAME)</dirname> <dirname>$(_DIRNAME)</dirname>
<add-target target="make_lib_dir_$(id)" type="action"/> <if cond="FORMAT_SUPPORTS_ACTIONS=='1'">
<modify-target target="make_lib_dir_$(id)"> <set var="__mkdir_tgt">make_lib_dir_$(id)</set>
<add-target target="$(__mkdir_tgt)" type="action"/>
<modify-target target="$(__mkdir_tgt)">
<command cond="TOOLSET=='unix'"> <command cond="TOOLSET=='unix'">
@mkdir -p $(_DIRNAME) @mkdir -p $(_DIRNAME)
</command> </command>
<command cond="TOOLSET in ['win32','os2','dos']"> <command cond="TOOLSET in ['win32','os2','dos']">
if not exist $(_DIRNAME) mkdir $(_DIRNAME) if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
</command> </command>
<dependency-of>$(id)</dependency-of>
</modify-target> </modify-target>
<!-- the following code is mostly equivalent to a:
<dependency-of>$(id)</dependency-of>
put into the __mkdir_tgt target, except that it does _prepend_
the __mkdir_tgt dependency instead of appending it.
This is required because some compilers (e.g. MSVC) need to store in the
output folder some files (e.g. the PDB file) while compiling and thus
the library output folder must have been created before _any_ source file
is compiled, not just before the library is linked.
-->
<modify-target target="$(id)">
<set var="__deps" prepend="1">
$(substitute(__mkdir_tgt, lambda x: ref('__depname', x), 'DEP'))
</set>
</modify-target>
</if>
</if> </if>
<if cond="FORMAT=='autoconf'"> <if cond="FORMAT=='autoconf'">
<dirname>lib</dirname> <set var="_DIRNAME">$(value)</set>
<dirname>$(_DIRNAME)</dirname>
</if> </if>
</define-tag> </define-tag>
@@ -393,7 +417,7 @@
located in $(value). located in $(value).
--> -->
<define-tag name="wxlike-paths" rules="exe,lib,dll,module"> <define-tag name="wxlike-paths" rules="exe,lib,dll,module">
<if cond="FORMAT!='autoconf'"> <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
<!-- WXLIBPATH is a path like "/lib/vc_lib" <!-- WXLIBPATH is a path like "/lib/vc_lib"
NOTE: even if this template is going to be used for a "lib" NOTE: even if this template is going to be used for a "lib"
target (which does not uses lib-paths at all), we can still target (which does not uses lib-paths at all), we can still

2
build/bakefiles/wxpresets/presets/wx_win32.bkl
View File

@@ -306,7 +306,7 @@
@if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \ @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
echo ---------------------------------------------------------------------------- echo ----------------------------------------------------------------------------
@if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \ @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
echo Selected wxWidgets build is not available! echo The selected wxWidgets build is not available!
@if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \ @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
echo Please use the options prefixed with WX_ to select another wxWidgets build. echo Please use the options prefixed with WX_ to select another wxWidgets build.
@if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \ @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \