Skip to content

Commit 557b205

Browse files
committed
fix: correctyl dect MSYS2 in EXPORT declarations
1 parent 5a2afa3 commit 557b205

File tree

5 files changed

+41
-1
lines changed

5 files changed

+41
-1
lines changed

src/helper/graphic_utils.hpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,21 @@ namespace utils {
5050
#endif
5151

5252

53-
#if defined(_MSC_VER)
53+
#if defined(_MSC_VER) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
5454
#if defined(OOPETRIS_LIBRARY_GRAPHICS_TYPE) && OOPETRIS_LIBRARY_GRAPHICS_TYPE == 0
5555
#if defined(OOPETRIS_LIBRARY_GRAPHICS_EXPORT)
56+
#if defined(__GNUC__)
57+
#define OOPETRIS_GRAPHICS_EXPORTED_NORETURN __attribute__((dllexport, noreturn))
58+
#else
5659
#define OOPETRIS_GRAPHICS_EXPORTED_NORETURN __declspec(dllexport, noreturn)
60+
#endif
61+
#else
62+
#if defined(__GNUC__)
63+
#define OOPETRIS_GRAPHICS_EXPORTED_NORETURN __attribute__((dllimport, noreturn))
5764
#else
5865
#define OOPETRIS_GRAPHICS_EXPORTED_NORETURN __declspec(dllimport, noreturn)
5966
#endif
67+
#endif
6068
#else
6169
#define OOPETRIS_GRAPHICS_EXPORTED_NORETURN __declspec(noreturn)
6270
#endif

src/helper/windows.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
#if defined(_MSC_VER) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
44
#if defined(OOPETRIS_LIBRARY_GRAPHICS_TYPE) && OOPETRIS_LIBRARY_GRAPHICS_TYPE == 0
55
#if defined(OOPETRIS_LIBRARY_GRAPHICS_EXPORT)
6+
#if defined(__GNUC__)
7+
#define OOPETRIS_GRAPHICS_EXPORTED __attribute__((dllexport))
8+
#else
69
#define OOPETRIS_GRAPHICS_EXPORTED __declspec(dllexport)
10+
#endif
11+
#else
12+
#if defined(__GNUC__)
13+
#define OOPETRIS_GRAPHICS_EXPORTED __attribute__((dllimport))
714
#else
815
#define OOPETRIS_GRAPHICS_EXPORTED __declspec(dllimport)
916
#endif
17+
#endif
1018
#else
1119
#define OOPETRIS_GRAPHICS_EXPORTED __attribute__((visibility("default")))
1220
#endif

src/libs/core/hash-library/sha256.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,18 @@ typedef unsigned __int64 uint64_t;
2020

2121
#if defined(OOPETRIS_LIBRARY_CORE_TYPE) && OOPETRIS_LIBRARY_CORE_TYPE == 0
2222
#if defined(OOPETRIS_LIBRARY_CORE_EXPORT)
23+
#if defined(__GNUC__)
24+
#define HASH_LIBRARY_EXPORTED __attribute__((dllexport))
25+
#else
2326
#define HASH_LIBRARY_EXPORTED __declspec(dllexport)
27+
#endif
28+
#else
29+
#if defined(__GNUC__)
30+
#define HASH_LIBRARY_EXPORTED __attribute__((dllimport))
2431
#else
2532
#define HASH_LIBRARY_EXPORTED __declspec(dllimport)
2633
#endif
34+
#endif
2735
#else
2836
#define HASH_LIBRARY_EXPORTED __attribute__((visibility("default")))
2937
#endif

src/libs/core/helper/windows.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
#if defined(_MSC_VER) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
44
#if defined(OOPETRIS_LIBRARY_CORE_TYPE) && OOPETRIS_LIBRARY_CORE_TYPE == 0
55
#if defined(OOPETRIS_LIBRARY_CORE_EXPORT)
6+
#if defined(__GNUC__)
7+
#define OOPETRIS_CORE_EXPORTED __attribute__((dllexport))
8+
#else
69
#define OOPETRIS_CORE_EXPORTED __declspec(dllexport)
10+
#endif
11+
#else
12+
#if defined(__GNUC__)
13+
#define OOPETRIS_CORE_EXPORTED __attribute__((dllimport))
714
#else
815
#define OOPETRIS_CORE_EXPORTED __declspec(dllimport)
916
#endif
17+
#endif
1018
#else
1119
#define OOPETRIS_CORE_EXPORTED __attribute__((visibility("default")))
1220
#endif

src/libs/recordings/utility/windows.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
#if defined(_MSC_VER) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
44
#if defined(OOPETRIS_LIBRARY_RECORDINGS_TYPE) && OOPETRIS_LIBRARY_RECORDINGS_TYPE == 0
55
#if defined(OOPETRIS_LIBRARY_RECORDINGS_EXPORT)
6+
#if defined(__GNUC__)
7+
#define OOPETRIS_RECORDINGS_EXPORTED __attribute__((dllexport))
8+
#else
69
#define OOPETRIS_RECORDINGS_EXPORTED __declspec(dllexport)
10+
#endif
11+
#else
12+
#if defined(__GNUC__)
13+
#define OOPETRIS_RECORDINGS_EXPORTED __attribute__((dllimport))
714
#else
815
#define OOPETRIS_RECORDINGS_EXPORTED __declspec(dllimport)
916
#endif
17+
#endif
1018
#else
1119
#define OOPETRIS_RECORDINGS_EXPORTED __attribute__((visibility("default")))
1220
#endif

0 commit comments

Comments
 (0)