Fix gfx and base unittests for windows

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2268 5a81b35b-ba03-0410-adc8-b2c5c5119f08

modules/base/src/pod_vector.hh

@@ -34,7 +34,7 @@ namespace ost {
 /// \brief vector container that treats its data as POD - even if it isn't in 
 ///      the strict sense.
 template <typename T>
-class DLLEXPORT_OST_BASE PodVector {
+class TEMPLATE_DEF_EXPORT PodVector {
 public:
   PodVector(): begin_(NULL), end_(NULL), capacity_(NULL) {}
   typedef T value_type;

modules/gfx/tests/test_ent_pov_export.cc

@@ -22,13 +22,17 @@
  */
 
 #include <fstream>
-#include <boost/test/unit_test.hpp>
 #include <ost/io/load_entity.hh>
 #include <ost/gfx/scene.hh>
 #include <ost/gfx/entity.hh>
+
 #include <ost/test_utils/compare_files.hh>
 
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+
 using boost::unit_test_framework::test_suite;
+
 using namespace ost;
 using namespace ost::gfx;
 
@@ -100,6 +104,7 @@ bool compare_sphere_cyl_entries(const String& test,
 }
 
 }
+
 BOOST_AUTO_TEST_SUITE(gfx)
 
 BOOST_AUTO_TEST_CASE(pov_export_simple)
@@ -127,7 +132,7 @@ BOOST_AUTO_TEST_CASE(pov_export_cartoon)
   Scene::Instance().SetOffscreenMode();
   boost::shared_ptr<Entity> obj=prepare_object(RenderMode::HSC);
   Scene::Instance().ExportPov("pov_cartoon_test", ".");
-  BOOST_CHECK(compare_files("pov_cartoon_test.inc", 
+  BOOST_CHECK(ost::compare_files("pov_cartoon_test.inc", 
                             "testfiles/pov_cartoon_std.inc"));
   Scene::Instance().Remove(obj);
 }
@@ -147,7 +152,7 @@ BOOST_AUTO_TEST_CASE(pov_export_trace)
   Scene::Instance().SetOffscreenMode();
   boost::shared_ptr<Entity> obj=prepare_object(RenderMode::TRACE);
   Scene::Instance().ExportPov("pov_trace_test", ".");
-  BOOST_CHECK(compare_files("pov_trace_test.inc", 
+  BOOST_CHECK(ost::compare_files("pov_trace_test.inc", 
                             "testfiles/pov_trace_std.inc"));
   Scene::Instance().Remove(obj);
 }
@@ -157,7 +162,7 @@ BOOST_AUTO_TEST_CASE(pov_export_line_trace)
   Scene::Instance().SetOffscreenMode();
   boost::shared_ptr<Entity> obj=prepare_object(RenderMode::LINE_TRACE);
   Scene::Instance().ExportPov("pov_line_trace_test", ".");
-  BOOST_CHECK(compare_files("pov_line_trace_test.inc", 
+  BOOST_CHECK(ost::compare_files("pov_line_trace_test.inc", 
                             "testfiles/pov_line_trace_std.inc"));
   Scene::Instance().Remove(obj);
 }
@@ -167,7 +172,7 @@ BOOST_AUTO_TEST_CASE(pov_export_sline)
   Scene::Instance().SetOffscreenMode();
   boost::shared_ptr<Entity> obj=prepare_object(RenderMode::SLINE);
   Scene::Instance().ExportPov("pov_sline_test", ".");
-  BOOST_CHECK(compare_files("pov_sline_test.inc", 
+  BOOST_CHECK(ost::compare_files("pov_sline_test.inc", 
                             "testfiles/pov_sline_std.inc"));
   Scene::Instance().Remove(obj);
 }

modules/gfx/tests/test_map_octree.cc

@@ -21,10 +21,14 @@
   Author: Marco Biasini
  */
 
-#include <boost/test/unit_test.hpp>
+#include <ost/gfx/impl/map_octree.hh>
+
 #include <ost/img/image_handle.hh>
 #include <ost/img/image_factory.hh>
-#include <ost/gfx/impl/map_octree.hh>
+
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+
 
 using boost::unit_test_framework::test_suite;
 using namespace ost;