summaryrefslogtreecommitdiffhomepage
path: root/opentrack-compat
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-11-01 11:28:17 +0100
committerStanislaw Halik <sthalik@misaki.pl>2015-11-01 11:28:17 +0100
commit0424a2802aec3600774ba9347c49312bb09b8cfe (patch)
treeea2e3d9fc0634e235b997b1b6054898a9478f9b2 /opentrack-compat
parent5a2ddaf39cf5ad86cf43d8a01f51989b5e3afa49 (diff)
all: adjust options.hpp move to compat
Diffstat (limited to 'opentrack-compat')
-rw-r--r--opentrack-compat/compat-export.hpp15
-rw-r--r--opentrack-compat/compat-import.hpp15
-rw-r--r--opentrack-compat/export.hpp22
-rw-r--r--opentrack-compat/import.hpp15
-rw-r--r--opentrack-compat/shm.h22
5 files changed, 60 insertions, 29 deletions
diff --git a/opentrack-compat/compat-export.hpp b/opentrack-compat/compat-export.hpp
new file mode 100644
index 00000000..2d6f1d3d
--- /dev/null
+++ b/opentrack-compat/compat-export.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#ifndef OPENTRACK_COMPAT_EXPORT
+# ifdef _WIN32
+# define OPENTRACK_COMPAT_LINKAGE __declspec(dllexport)
+# else
+# define OPENTRACK_COMPAT_LINKAGE
+# endif
+
+# ifndef _MSC_VER
+# define OPENTRACK_COMPAT_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_COMPAT_LINKAGE
+# else
+# define OPENTRACK_COMPAT_EXPORT OPENTRACK_COMPAT_LINKAGE
+# endif
+#endif
diff --git a/opentrack-compat/compat-import.hpp b/opentrack-compat/compat-import.hpp
new file mode 100644
index 00000000..161ccc5d
--- /dev/null
+++ b/opentrack-compat/compat-import.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#ifndef OPENTRACK_COMPAT_EXPORT
+# ifdef _WIN32
+# define OPENTRACK_COMPAT_LINKAGE __declspec(dllimport)
+# else
+# define OPENTRACK_COMPAT_LINKAGE
+# endif
+
+# ifndef _MSC_VER
+# define OPENTRACK_COMPAT_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_COMPAT_LINKAGE
+# else
+# define OPENTRACK_COMPAT_EXPORT OPENTRACK_COMPAT_LINKAGE
+# endif
+#endif
diff --git a/opentrack-compat/export.hpp b/opentrack-compat/export.hpp
index f0983b75..100950a0 100644
--- a/opentrack-compat/export.hpp
+++ b/opentrack-compat/export.hpp
@@ -1,13 +1,15 @@
#pragma once
-#ifdef _WIN32
-# define OPENTRACK_LINKAGE __declspec(dllexport)
-#else
-# define OPENTRACK_LINKAGE
-#endif
+#ifndef OPENTRACK_EXPORT
+# ifdef _WIN32
+# define OPENTRACK_LINKAGE __declspec(dllexport)
+# else
+# define OPENTRACK_LINKAGE
+# endif
-#ifndef _MSC_VER
-# define OPENTRACK_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_LINKAGE
-#else
-# define OPENTRACK_EXPORT OPENTRACK_LINKAGE
-#endif \ No newline at end of file
+# ifndef _MSC_VER
+# define OPENTRACK_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_LINKAGE
+# else
+# define OPENTRACK_EXPORT OPENTRACK_LINKAGE
+# endif
+#endif
diff --git a/opentrack-compat/import.hpp b/opentrack-compat/import.hpp
new file mode 100644
index 00000000..3747b141
--- /dev/null
+++ b/opentrack-compat/import.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#ifndef OPENTRACK_EXPORT
+# ifdef _WIN32
+# define OPENTRACK_LINKAGE __declspec(dllimport)
+# else
+# define OPENTRACK_LINKAGE
+# endif
+
+# ifndef _MSC_VER
+# define OPENTRACK_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_LINKAGE
+# else
+# define OPENTRACK_EXPORT OPENTRACK_LINKAGE
+# endif
+#endif
diff --git a/opentrack-compat/shm.h b/opentrack-compat/shm.h
index 28bda986..c62976bd 100644
--- a/opentrack-compat/shm.h
+++ b/opentrack-compat/shm.h
@@ -22,29 +22,13 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wattributes"
-#ifdef __GNUC__
-# define COMPAT_GNUC_VISIBILITY __attribute__ ((visibility ("default")))
-#else
-# define COMPAT_GNUC_VISIBILITY
-#endif
-
#ifdef BUILD_compat
-# ifdef _WIN32
-# define COMPAT_WIN32_EXPORT __declspec(dllexport)
-# else
-# define COMPAT_WIN32_EXPORT
-# endif
+# include "compat-export.hpp"
#else
-# ifdef _WIN32
-# define COMPAT_WIN32_EXPORT __declspec(dllimport)
-# else
-# define COMPAT_WIN32_EXPORT
-# endif
+# include "compat-import.hpp"
#endif
-#define COMPAT_EXPORT COMPAT_WIN32_EXPORT COMPAT_GNUC_VISIBILITY
-
-class COMPAT_EXPORT PortableLockedShm {
+class OPENTRACK_COMPAT_EXPORT PortableLockedShm {
public:
PortableLockedShm(const char *shmName, const char *mutexName, int mapSize);
~PortableLockedShm();