Don't include wxUniversal configurations in MSVC project files.

[wxWidgets.git] / tests / test.bkl

diff --git a/tests/test.bkl b/tests/test.bkl
index d650f8d470ff9139ee98675182ed6297c7057ed9..0c142a34098aa25f1a2bf8bd8c358be2cd7b2d1f 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -15,7 +15,7 @@
         <ldflags>$(CPPUNIT_LIBS)</ldflags>
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
         <ldflags>$(CPPUNIT_LIBS)</ldflags>
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">

-            <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
+            <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">

                 <sources>dummy.cpp</sources>
                 <precomp-headers-gen>dummy.cpp</precomp-headers-gen>
             </if>
                 <sources>dummy.cpp</sources>
                 <precomp-headers-gen>dummy.cpp</precomp-headers-gen>
             </if>


@@ -132,6 +132,7 @@
             geometry/rect.cpp
             geometry/size.cpp
             geometry/point.cpp
             geometry/rect.cpp
             geometry/size.cpp
             geometry/point.cpp

+            geometry/region.cpp

             graphics/bitmap.cpp
             graphics/colour.cpp
             graphics/ellipsization.cpp
             graphics/bitmap.cpp
             graphics/colour.cpp
             graphics/ellipsization.cpp


@@ -171,6 +172,7 @@
             controls/radiobuttontest.cpp
             controls/rearrangelisttest.cpp
             controls/richtextctrltest.cpp
             controls/radiobuttontest.cpp
             controls/rearrangelisttest.cpp
             controls/richtextctrltest.cpp

+            controls/searchctrltest.cpp

             controls/slidertest.cpp
             controls/spinctrldbltest.cpp
             controls/spinctrltest.cpp
             controls/slidertest.cpp
             controls/spinctrldbltest.cpp
             controls/spinctrltest.cpp


@@ -180,8 +182,11 @@
             controls/toolbooktest.cpp
             controls/treebooktest.cpp
             controls/treectrltest.cpp
             controls/toolbooktest.cpp
             controls/treebooktest.cpp
             controls/treectrltest.cpp

+            controls/treelistctrltest.cpp

             controls/virtlistctrltest.cpp
             controls/virtlistctrltest.cpp

+            controls/webtest.cpp

             controls/windowtest.cpp
             controls/windowtest.cpp

+            controls/dialogtest.cpp

             events/clone.cpp
             events/propagation.cpp
             events/keyboard.cpp
             events/clone.cpp
             events/propagation.cpp
             events/keyboard.cpp


@@ -210,6 +215,13 @@
             window/setsize.cpp
             xml/xrctest.cpp
         </sources>
             window/setsize.cpp
             xml/xrctest.cpp
         </sources>

+        <!--
+            Can't use <wx-lib> here as it doesn't work with conditionally
+            defined variables, so fall back <sys-lib> as we must not link with
+            inexisting webview library to be able to run tests even if
+            wxWebView is not available.
+         -->
+        <sys-lib>$(WXLIB_WEBVIEW)</sys-lib>

         <wx-lib>richtext</wx-lib>
         <wx-lib>media</wx-lib>
         <wx-lib>xrc</wx-lib>
         <wx-lib>richtext</wx-lib>
         <wx-lib>media</wx-lib>
         <wx-lib>xrc</wx-lib>