use WXDLLIMPEXP_ADV on the base class too

[wxWidgets.git] / build / bakefiles / regex.bkl

diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index cdd83bcc9e6628bdbf7d36f8741fa584c9f03465..28176a5c5490034b22eada04468ca3c187546365 100644 (file)
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -1,58 +1,48 @@
 <?xml version="1.0" ?>
 <?xml version="1.0" ?>

-<makefile>
-    
-    <set var="UNICODE_DEFINE">
-        <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
-    </set>
-    
-    <set var="UNICOWS_LIB">
-        <if cond="MSLU=='1'">unicows</if>
-    </set>
-
-    <define-tag name="msvc-headers" rules="dll,lib">
-        <if cond="FORMAT=='msvc6prj'">
-            <msvc-project-files>
-                $(addPrefixToList('include\', wxwin.headersOnly(value)))
-            </msvc-project-files>
-        </if>
-    </define-tag>
+<!-- $Id$ -->

 
 

-    <define-tag name="msvc-copy-setup-h" rules="dll,lib">
-        <if cond="FORMAT=='msvc6prj'">
-            <msvc-headers>wx/msw/setup.h</msvc-headers>
-            <set var="__custom_build_files" append="1">
-                include\wx\msw\setup.h
-            </set>
-            <set var="__custom_build_include_wx_msw_setup_h">
-Creating $(SETUPHDIR)\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
-$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
-            </set>
-        </if>
-    </define-tag>
+<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'">
     </if>
     <if cond="FORMAT!='autoconf'">

-        <set var="wxUSE_REGEX">builtin</set>
+        <set var="wxUSE_REGEX">
+            <!-- NB: regex lib doesn't compile on WinCE -->
+            <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$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
-    </set>

     <set var="INC_REGEX">
         <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
     </set>
 
     <set var="INC_REGEX">
         <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
     </set>
 

-    <lib id="wxregex" template="3rdparty_lib"
+    <lib id="wxregex" template="msvc_setup_h,3rdparty_lib"

          cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
          cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">

+        <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>
         <define>$(UNICODE_DEFINE)</define>
         <dirname>$(LIBDIRNAME)</dirname>

-        <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8066</cflags-borland> 
+        <cflags-borland>-w-8008 -w-8012 -w-8057 -w-8064 -w-8066 -w-8070</cflags-borland>
+        <cflags-dmars>-w12</cflags-dmars>

         <sources>
             src/regex/regcomp.c
             src/regex/regexec.c
         <sources>
             src/regex/regcomp.c
             src/regex/regexec.c