libfityk: use FITYK_API macro to explicitely set visibility

fityk/CMPfit.cpp

@@ -1,6 +1,7 @@
 // This file is part of fityk program. Copyright (C) Marcin Wojdyr
 // Licence: GNU General Public License ver. 2+
 
+#define BUILDING_LIBFITYK
 #include "CMPfit.h"
 #include "logic.h"
 #include "data.h"

fityk/GAfit.cpp

@@ -1,6 +1,9 @@
 // This file is part of fityk program. Copyright (C) Marcin Wojdyr
 // Licence: GNU General Public License ver. 2+
 
+#define BUILDING_LIBFITYK
+#include "GAfit.h"
+
 #include <stdlib.h>
 #include <time.h>
 #include <algorithm>
@@ -9,7 +12,6 @@
 #include <math.h>
 
 #include "common.h"
-#include "GAfit.h"
 #include "logic.h"
 #include "settings.h"
 #include "numfuncs.h"

fityk/LMfit.cpp

@@ -1,15 +1,18 @@
 // This file is part of fityk program. Copyright (C) Marcin Wojdyr
 // Licence: GNU General Public License ver. 2+
 
-#include "common.h"
+#define BUILDING_LIBFITYK
 #include "LMfit.h"
-#include "ui.h"
-#include "settings.h"
-#include "logic.h"
+
 #include <math.h>
 #include <vector>
 #include <algorithm>
 
+#include "common.h"
+#include "ui.h"
+#include "settings.h"
+#include "logic.h"
+
 using namespace std;
 
 namespace fityk {

fityk/NLfit.cpp

@@ -1,6 +1,7 @@
 // This file is part of fityk program. Copyright Marcin Wojdyr.
 // Licence: GNU General Public License ver. 2+
 
+#define BUILDING_LIBFITYK
 #include "NLfit.h"
 #include "logic.h"
 #include "data.h"

fityk/NMfit.cpp

@@ -1,13 +1,15 @@
 // This file is part of fityk program. Copyright (C) Marcin Wojdyr
 // Licence: GNU General Public License ver. 2+
 
+#define BUILDING_LIBFITYK
+#include "NMfit.h"
+
 #include <stdlib.h>
 #include <time.h>
 #include <math.h>
 #include <vector>
 
 #include "common.h"
-#include "NMfit.h"
 #include "logic.h"
 #include "settings.h"
 

fityk/ast.cpp

@@ -1,6 +1,9 @@
 // This file is part of fityk program. Copyright (C) 2005 Marcin Wojdyr
 // Licence: GNU General Public License ver. 2+
 
+#define BUILDING_LIBFITYK
+#include "ast.h"
+
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/special_functions/digamma.hpp>
 
@@ -12,7 +15,6 @@
 
 #include "common.h"
 #include "ui.h"
-#include "ast.h"
 #include "var.h"
 #include "logic.h"
 #include "numfuncs.h"

fityk/bfunc.cpp

@@ -2,6 +2,7 @@
 // Licence: GNU General Public License ver. 2+
 /// Built-in function definitions
 
+#define BUILDING_LIBFITYK
 #include "bfunc.h"
 
 #include <boost/math/special_functions/gamma.hpp>

fityk/common.cpp

@@ -1,6 +1,7 @@
 // This file is part of fityk program. Copyright (C) Marcin Wojdyr
 // Licence: GNU General Public License ver. 2+
 
+#define BUILDING_LIBFITYK
 #include "common.h"
 #include <string>
 #include <time.h>

fityk/common.h

@@ -216,7 +216,7 @@ namespace fityk {
 
 /// epsilon is used for comparision of real numbers
 /// defined in settings.cpp; it can be changed in Settings
-extern double epsilon;
+extern FITYK_API double epsilon;
 
 inline bool is_eq(double a, double b) { return fabs(a-b) <= epsilon; }
 inline bool is_neq(double a, double b) { return fabs(a-b) > epsilon; }
@@ -253,8 +253,8 @@ bool is_double (std::string const& s);
 bool is_int (std::string const& s);
 
 /// replace all occurences of old in string s with new_
-void replace_all(std::string &s, std::string const &old,
-                                 std::string const &new_);
+FITYK_API void replace_all(std::string &s, std::string const &old,
+                                           std::string const &new_);
 
 void replace_words(std::string &t, std::string const &old_word,
                                    std::string const &new_word);
@@ -269,7 +269,7 @@ bool match_glob(const char* name, const char* pattern);
 //                           v e c t o r
 
 /// Make (u-l)-element vector, filled by numbers: l, l+1, ..., u-1.
-std::vector<int> range_vector(int l, int u);
+FITYK_API std::vector<int> range_vector(int l, int u);
 
 /// Expression like "i<v.size()", where i is int and v is a std::vector gives:
 /// "warning: comparison between signed and unsigned integer expressions"
@@ -299,7 +299,8 @@ inline std::string get_directory(std::string const& filename)
   TypeName(const TypeName&);               \
   void operator=(const TypeName&)
 
-extern const char* fityk_version_line; /// it is used to put version to script
+/// used to put version to script
+extern FITYK_API const char* fityk_version_line;
 
 extern const std::string help_filename;
 

fityk/cparser.cpp

@@ -3,6 +3,7 @@
 
 /// Command parser.
 
+#define BUILDING_LIBFITYK
 #include "cparser.h"
 
 #include <string.h>

fityk/cparser.h

@@ -72,7 +72,7 @@ extern const char* debug_args[];
 
 const char* commandtype2str(CommandType c);
 
-class Parser
+class FITYK_API Parser
 {
 public:
     Parser(const Ftk* F);

fityk/data.cpp

@@ -1,8 +1,9 @@
 // This file is part of fityk program. Copyright (C) Marcin Wojdyr
 // Licence: GNU General Public License ver. 2+
 
-#include "common.h"
+#define BUILDING_LIBFITYK
 #include "data.h"
+#include "common.h"
 #include "ui.h"
 #include "numfuncs.h"
 #include "settings.h"

fityk/data.h

@@ -8,16 +8,16 @@
 #include <limits.h>
 #include "common.h"
 
-#include "fityk.h" // struct Point
+#include "fityk.h" // struct Point, FITYK_API
 
 namespace fityk {
 
 class Ftk;
 
-std::string get_file_basename(std::string const& path);
+FITYK_API std::string get_file_basename(std::string const& path);
 
 /// dataset
-class Data
+class FITYK_API Data
 {
 public :
     static int count_blocks(const std::string& fn,

fityk/eparser.cpp

@@ -3,6 +3,7 @@
 
 /// Data expression parser.
 
+#define BUILDING_LIBFITYK
 #include "eparser.h"
 
 #include <cstring>

fityk/eparser.h

@@ -37,7 +37,7 @@ class AggregFunc
 /// Expression parser.
 /// Derived from ExpressionParser only because it is handy to keep both
 /// in one class. 
-class ExpressionParser : public ExprCalculator
+class FITYK_API ExpressionParser : public ExprCalculator
 {
 public:
     enum ExpectedType

fityk/fit.cpp

@@ -1,12 +1,14 @@
 // This file is part of fityk program. Copyright (C) Marcin Wojdyr
 // Licence: GNU General Public License ver. 2+
 
+#define BUILDING_LIBFITYK
+#include "fit.h"
+
 #include <algorithm>
 #include <math.h>
 #include <string.h>
 #include <boost/math/distributions/students_t.hpp>
 
-#include "fit.h"
 #include "logic.h"
 #include "model.h"
 #include "data.h"

fityk/fit.h

@@ -16,7 +16,7 @@ class Ftk;
 class Variable;
 
 ///   interface of fitting method and implementation of common functions
-class Fit
+class FITYK_API Fit
 {
 public:
     const std::string name;
@@ -100,7 +100,7 @@ class Fit
 };
 
 /// handles parameter history
-class ParameterHistoryMgr
+class FITYK_API ParameterHistoryMgr
 {
 public:
     ParameterHistoryMgr(Ftk *F) : F_(F), param_hist_ptr_(0) {}
@@ -123,7 +123,7 @@ class ParameterHistoryMgr
 
 /// gives access to fitting methods, enables swithing between them
 /// also stores parameter history
-class FitMethodsContainer : public ParameterHistoryMgr
+class FITYK_API FitMethodsContainer : public ParameterHistoryMgr
 {
 public:
     static const char* full_method_names[][2];

fityk/fityk.cpp

@@ -3,10 +3,13 @@
 
 /// implementation of libfityk public API
 
+#define BUILDING_LIBFITYK
+#include "fityk.h"
+
 #include <cassert>
 #include <cctype>
 #include <cstring>
-#include "fityk.h"
+
 #include "common.h"
 #include "ui.h"
 #include "logic.h"