Minor output simplification. Significantly influences all makefiles but nothing regenerated before incoming new bakefile release.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
1b3d358519
commit
46da6d0629
1 changed files with 7 additions and 5 deletions
|
|
@ -204,13 +204,15 @@
|
|||
<set var="BUILDDIR">$(OBJS)</set>
|
||||
</if>
|
||||
|
||||
<set var="LIBTYPE_SUFFIX" make_var="1">
|
||||
<if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if>
|
||||
<if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if>
|
||||
</set>
|
||||
|
||||
<set var="LIBDIRNAME" make_var="1">
|
||||
<if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
|
||||
<if cond="FORMAT!='autoconf' and SHARED=='0'">
|
||||
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_lib$(CFG)
|
||||
</if>
|
||||
<if cond="FORMAT!='autoconf' and SHARED=='1'">
|
||||
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_dll$(CFG)
|
||||
<if cond="FORMAT!='autoconf'">
|
||||
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
</if>
|
||||
</set>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue