Commit 45d01e0f authored by Max Lyon's avatar Max Lyon
Browse files

Merge branch 'merge-from-ReForm' into 'master'

Merge from ReForm

See merge request !26
parents d64f46f6 d0806a32
Pipeline #6102 passed with stages
in 11 minutes and 54 seconds
Base @ d8f56549
Subproject commit 588861acd0768d78b0590b48b44fa048094ab821 Subproject commit d8f56549c8f6c55ae76aaed6f2ff8159d93c0d5f
...@@ -33,12 +33,19 @@ ...@@ -33,12 +33,19 @@
#define COMISODLLEXPORTONLY __declspec(dllexport) #define COMISODLLEXPORTONLY __declspec(dllexport)
#endif #endif
#else #else
#define COMISODLLEXPORT #define COMISODLLEXPORT
#define COMISODLLEXPORTONLY #define COMISODLLEXPORTONLY
#endif #endif
#else #else // non-Windows symbols export:
#define COMISODLLEXPORT #ifdef COMISODLL
#define COMISODLLEXPORTONLY // only export symbols if COMISODLL is defined (same behavior as Windows)
#define COMISODLLEXPORT __attribute__((visibility("default")))
#define COMISODLLEXPORTONLY COMISODLLEXPORT
#else // COMISODLL not defined
// this allows building CoMISo as static library without exposing its symbols
#define COMISODLLEXPORT
#define COMISODLLEXPORTONLY
#endif // COMISODLL
#endif #endif
#endif #endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment