set m_encoding in wxCSConv ctor from name

[wxWidgets.git] / tests / test.bkl

diff --git a/tests/test.bkl b/tests/test.bkl
index 03f3c7119104d7b233f78c25a86282c1c1efafa4..5dacf714af3d712233a76a1709818445edffffec 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -5,8 +5,9 @@
 
     <include file="../build/bakefiles/common_samples.bkl"/>
 
 
     <include file="../build/bakefiles/common_samples.bkl"/>
 

-    <exe id="test" template="wx_test_console"
-                   template_append="wx_append_base">
+    <template id="wx_test">
+        <cppflags>$(CPPUNIT_CFLAGS)</cppflags>
+        <ldflags>$(CPPUNIT_LIBS)</ldflags>

 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
             <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
             <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">


@@ -17,32 +18,42 @@
             <precomp-headers>on</precomp-headers>
             <precomp-headers-file>testprec_$(id)</precomp-headers-file>
         </if>
             <precomp-headers>on</precomp-headers>
             <precomp-headers-file>testprec_$(id)</precomp-headers-file>
         </if>

+    </template>

 
 

+    <exe id="test" template="wx_sample_console,wx_test"
+                   template_append="wx_append_base">

         <sources>
             test.cpp
             archive/archivetest.cpp
         <sources>
             test.cpp
             archive/archivetest.cpp

+            archive/ziptest.cpp

             arrays/arrays.cpp
             datetime/datetimetest.cpp
             fileconf/fileconftest.cpp
             arrays/arrays.cpp
             datetime/datetimetest.cpp
             fileconf/fileconftest.cpp

+            filekind/filekind.cpp

             filename/filenametest.cpp
             filesys/filesystest.cpp
             fontmap/fontmaptest.cpp
             formatconverter/formatconvertertest.cpp
             hashes/hashes.cpp
             filename/filenametest.cpp
             filesys/filesystest.cpp
             fontmap/fontmaptest.cpp
             formatconverter/formatconvertertest.cpp
             hashes/hashes.cpp

+            lists/lists.cpp

             longlong/longlongtest.cpp
             mbconv/mbconvtest.cpp
             regex/regextest.cpp
             regex/wxregextest.cpp
             longlong/longlongtest.cpp
             mbconv/mbconvtest.cpp
             regex/regextest.cpp
             regex/wxregextest.cpp

+            scopeguard/scopeguardtest.cpp

             strings/strings.cpp
             strings/stdstrings.cpp
             strings/strings.cpp
             strings/stdstrings.cpp

+            strings/tokenizer.cpp

             strings/unicode.cpp
             strings/crt.cpp
             streams/bstream.cpp
             streams/datastreamtest.cpp
             streams/ffilestream.cpp
             streams/filestream.cpp
             strings/unicode.cpp
             strings/crt.cpp
             streams/bstream.cpp
             streams/datastreamtest.cpp
             streams/ffilestream.cpp
             streams/filestream.cpp

+            streams/largefile.cpp

             streams/memstream.cpp
             streams/sstream.cpp
             streams/memstream.cpp
             streams/sstream.cpp

+            streams/tempfile.cpp

             streams/textstreamtest.cpp
             streams/zlibstream.cpp
             uris/uris.cpp
             streams/textstreamtest.cpp
             streams/zlibstream.cpp
             uris/uris.cpp


@@ -51,6 +62,25 @@
         <wx-lib>base</wx-lib>
     </exe>
 
         <wx-lib>base</wx-lib>
     </exe>
 

+
+    <exe id="test_gui" template="wx_sample,wx_test"
+                       template_append="wx_append"
+         cond="USE_GUI=='1'">
+
+        <!-- link against GUI libraries, but be a console app: -->
+        <app-type>console</app-type>
+
+        <sources>
+            test.cpp
+            geometry/rect.cpp
+            geometry/size.cpp
+            geometry/point.cpp
+        </sources>
+        <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
+    </exe>
+
+

     <wx-data id="data">
         <files>testdata.fc</files>
     </wx-data>
     <wx-data id="data">
         <files>testdata.fc</files>
     </wx-data>