projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synchronised svn:eol-style and svn:executable properties of some file types.
[wxWidgets.git]
/
build
/
bakefiles
/
regex.bkl
diff --git
a/build/bakefiles/regex.bkl
b/build/bakefiles/regex.bkl
index 2a4dcd76a405d337d9de0a582a708a9b5be9dfc5..28176a5c5490034b22eada04468ca3c187546365 100644
(file)
--- a/
build/bakefiles/regex.bkl
+++ b/
build/bakefiles/regex.bkl
@@
-2,9
+2,14
@@
<!-- $Id$ -->
<makefile>
<!-- $Id$ -->
<makefile>
-
+
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_REGEX"/>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_REGEX"/>
+ <set var="LIB_REGEX">
+ <if cond="wxUSE_REGEX=='builtin'">
+ wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ </if>
+ </set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_REGEX">
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_REGEX">
@@
-12,19
+17,28
@@
<if cond="FORMAT=='msevc4prj'">no</if>
<if cond="FORMAT!='msevc4prj'">builtin</if>
</set>
<if cond="FORMAT=='msevc4prj'">no</if>
<if cond="FORMAT!='msevc4prj'">builtin</if>
</set>
+ <set var="LIB_REGEX">
+ <if cond="wxUSE_REGEX=='builtin'">
+ wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
+ </if>
+ </set>
</if>
</if>
- <set var="LIB_REGEX">
- <if cond="wxUSE_REGEX=='builtin'">wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
- </set>
<set var="INC_REGEX">
<if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
</set>
<lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
<set var="INC_REGEX">
<if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
</set>
<lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
- <libname>$(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
+ <libname cond="FORMAT=='autoconf'">
+ $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+ </libname>
+ <libname cond="FORMAT!='autoconf'">
+ $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
+ </libname>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
+ <define>__WX$(TOOLKIT)__</define>
+ <define>$(WXUNIV_DEFINE)</define>
<define>$(UNICODE_DEFINE)</define>
<dirname>$(LIBDIRNAME)</dirname>
<cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>
<define>$(UNICODE_DEFINE)</define>
<dirname>$(LIBDIRNAME)</dirname>
<cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>