rlottie: Fix issue with LOT_EXPORT for windows

diff --git a/inc/rlottie.h b/inc/rlottie.h
index 74def69ebc3c984f1410c370e5cc1066a8bbbc55..07956159f3c0dddd1d22fcd8550794371a401fa7 100644 (file)
--- a/inc/rlottie.h
+++ b/inc/rlottie.h
@@ -23,26 +23,18 @@
 #include <vector>
 #include <memory>
 
-#ifdef _WIN32
-#ifdef LOT_BUILD
-#ifdef DLL_EXPORT
-#define LOT_EXPORT __declspec(dllexport)
+#if defined _WIN32 || defined __CYGWIN__
+  #ifdef LOT_BUILD
+    #define LOT_EXPORT __declspec(dllexport)
+  #else
+    #define LOT_EXPORT __declspec(dllimport)
+  #endif
 #else
-#define LOT_EXPORT
-#endif
-#else
-#define LOT_EXPORT __declspec(dllimport)
-#endif
-#else
-#ifdef __GNUC__
-#if __GNUC__ >= 4
-#define LOT_EXPORT __attribute__((visibility("default")))
-#else
-#define LOT_EXPORT
-#endif
-#else
-#define LOT_EXPORT
-#endif
+  #ifdef LOT_BUILD
+      #define LOT_EXPORT __attribute__ ((visibility ("default")))
+  #else
+      #define LOT_EXPORT
+  #endif
 #endif
 
 class AnimationImpl;

diff --git a/inc/rlottiecommon.h b/inc/rlottiecommon.h
index b3ac0229e6bf618e16d5fa9a53a50599e376c290..78ce7de96a6610346cdcba4a718d9b3a51e1ed77 100644 (file)
--- a/inc/rlottiecommon.h
+++ b/inc/rlottiecommon.h
@@ -19,26 +19,18 @@
 #ifndef _RLOTTIE_COMMON_H_
 #define _RLOTTIE_COMMON_H_
 
-#ifdef _WIN32
-#ifdef LOT_BUILD
-#ifdef DLL_EXPORT
-#define LOT_EXPORT __declspec(dllexport)
+#if defined _WIN32 || defined __CYGWIN__
+  #ifdef LOT_BUILD
+    #define LOT_EXPORT __declspec(dllexport)
+  #else
+    #define LOT_EXPORT __declspec(dllimport)
+  #endif
 #else
-#define LOT_EXPORT
-#endif
-#else
-#define LOT_EXPORT __declspec(dllimport)
-#endif
-#else
-#ifdef __GNUC__
-#if __GNUC__ >= 4
-#define LOT_EXPORT __attribute__((visibility("default")))
-#else
-#define LOT_EXPORT
-#endif
-#else
-#define LOT_EXPORT
-#endif
+  #ifdef LOT_BUILD
+      #define LOT_EXPORT __attribute__ ((visibility ("default")))
+  #else
+      #define LOT_EXPORT
+  #endif
 #endif
 
 

diff --git a/src/vector/stb/stb_image.cpp b/src/vector/stb/stb_image.cpp
index e9d79e4247d2e98f9cf016ed78d44122a31b1cc8..dceab5820935805e500c77d0eb86561315c8139e 100644 (file)
--- a/src/vector/stb/stb_image.cpp
+++ b/src/vector/stb/stb_image.cpp
@@ -13,26 +13,18 @@
 
 #include "stb_image.h"
 
-#ifdef _WIN32
-#ifdef LOT_BUILD
-#ifdef DLL_EXPORT
-#define LOT_EXPORT __declspec(dllexport)
+#if defined _WIN32 || defined __CYGWIN__
+  #ifdef LOT_BUILD
+    #define LOT_EXPORT __declspec(dllexport)
+  #else
+    #define LOT_EXPORT __declspec(dllimport)
+  #endif
 #else
-#define LOT_EXPORT
-#endif
-#else
-#define LOT_EXPORT __declspec(dllimport)
-#endif
-#else
-#ifdef __GNUC__
-#if __GNUC__ >= 4
-#define LOT_EXPORT __attribute__((visibility("default")))
-#else
-#define LOT_EXPORT
-#endif
-#else
-#define LOT_EXPORT
-#endif
+  #ifdef LOT_BUILD
+      #define LOT_EXPORT __attribute__ ((visibility ("default")))
+  #else
+      #define LOT_EXPORT
+  #endif
 #endif
 
 #ifdef __cplusplus