114 lines
3.4 KiB
Diff
114 lines
3.4 KiB
Diff
diff -Naur librocket-orig/Include/Rocket/Controls/Header.h librocket/Include/Rocket/Controls/Header.h
|
|
--- librocket-orig/Include/Rocket/Controls/Header.h 2014-07-11 09:39:04.672400000 +0400
|
|
+++ librocket/Include/Rocket/Controls/Header.h 2014-07-11 09:56:53.265200000 +0400
|
|
@@ -30,18 +30,18 @@
|
|
|
|
#include <Rocket/Core/Platform.h>
|
|
|
|
-#if !defined STATIC_LIB
|
|
- #ifdef ROCKET_PLATFORM_WIN32
|
|
- #ifdef RocketControls_EXPORTS
|
|
+#if defined(ROCKET_PLATFORM_WIN32)
|
|
+ #if defined(RocketControls_EXPORTS) || !defined(STATIC_LIB)
|
|
#define ROCKETCONTROLS_API __declspec(dllexport)
|
|
#else
|
|
#define ROCKETCONTROLS_API __declspec(dllimport)
|
|
#endif
|
|
- #else
|
|
+#else
|
|
+ #if !defined(STATIC_LIB)
|
|
#define ROCKETCONTROLS_API __attribute__((visibility("default")))
|
|
+ #else
|
|
+ #define ROCKETCONTROLS_API
|
|
#endif
|
|
-#else
|
|
- #define ROCKETCONTROLS_API
|
|
#endif
|
|
|
|
#endif
|
|
diff -Naur librocket-orig/Include/Rocket/Core/Header.h librocket/Include/Rocket/Core/Header.h
|
|
--- librocket-orig/Include/Rocket/Core/Header.h 2014-07-11 09:39:04.688000000 +0400
|
|
+++ librocket/Include/Rocket/Core/Header.h 2014-07-11 09:53:04.163600000 +0400
|
|
@@ -30,18 +30,18 @@
|
|
|
|
#include <Rocket/Core/Platform.h>
|
|
|
|
-#if !defined STATIC_LIB
|
|
- #if defined ROCKET_PLATFORM_WIN32
|
|
- #if defined RocketCore_EXPORTS
|
|
+#if defined(ROCKET_PLATFORM_WIN32)
|
|
+ #if (defined RocketCore_EXPORTS) || !defined(STATIC_LIB)
|
|
#define ROCKETCORE_API __declspec(dllexport)
|
|
#else
|
|
#define ROCKETCORE_API __declspec(dllimport)
|
|
#endif
|
|
- #else
|
|
+#else
|
|
+ #if !defined(STATIC_LIB)
|
|
#define ROCKETCORE_API __attribute__((visibility("default")))
|
|
+ #else
|
|
+ #define ROCKETCORE_API
|
|
#endif
|
|
-#else
|
|
- #define ROCKETCORE_API
|
|
#endif
|
|
|
|
#endif
|
|
diff -Naur librocket-orig/Include/Rocket/Core/Python/Header.h librocket/Include/Rocket/Core/Python/Header.h
|
|
--- librocket-orig/Include/Rocket/Core/Python/Header.h 2014-07-11 09:39:04.703600000 +0400
|
|
+++ librocket/Include/Rocket/Core/Python/Header.h 2014-07-11 09:53:23.991200000 +0400
|
|
@@ -30,18 +30,18 @@
|
|
|
|
#include <Rocket/Core/Platform.h>
|
|
|
|
-#if !defined STATIC_LIB
|
|
-#if defined ROCKET_PLATFORM_WIN32
|
|
- #if defined RocketCorePython_EXPORTS
|
|
+#if defined(ROCKET_PLATFORM_WIN32)
|
|
+ #if defined(RocketCorePython_EXPORTS) || !defined(STATIC_LIB)
|
|
#define ROCKETCOREPYTHON_API __declspec(dllexport)
|
|
#else
|
|
#define ROCKETCOREPYTHON_API __declspec(dllimport)
|
|
#endif
|
|
#else
|
|
- #define ROCKETCOREPYTHON_API __attribute__((visibility("default")))
|
|
-#endif
|
|
-#else
|
|
- #define ROCKETCOREPYTHON_API
|
|
+ #if !defined(STATIC_LIB)
|
|
+ #define ROCKETCOREPYTHON_API __attribute__((visibility("default")))
|
|
+ #else
|
|
+ #define ROCKETCOREPYTHON_API
|
|
+ #endif
|
|
#endif
|
|
|
|
#endif
|
|
diff -Naur librocket-orig/Include/Rocket/Debugger/Header.h librocket/Include/Rocket/Debugger/Header.h
|
|
--- librocket-orig/Include/Rocket/Debugger/Header.h 2014-07-11 09:39:04.719200000 +0400
|
|
+++ librocket/Include/Rocket/Debugger/Header.h 2014-07-11 09:55:06.233600000 +0400
|
|
@@ -30,18 +30,18 @@
|
|
|
|
#include <Rocket/Core/Platform.h>
|
|
|
|
-#if !defined STATIC_LIB
|
|
- #ifdef ROCKET_PLATFORM_WIN32
|
|
- #ifdef RocketDebugger_EXPORTS
|
|
+#if defined(ROCKET_PLATFORM_WIN32)
|
|
+ #if defined(RocketDebugger_EXPORTS) || !defined(STATIC_LIB)
|
|
#define ROCKETDEBUGGER_API __declspec(dllexport)
|
|
#else
|
|
#define ROCKETDEBUGGER_API __declspec(dllimport)
|
|
#endif
|
|
- #else
|
|
+#else
|
|
+ #if !defined(STATIC_LIB)
|
|
#define ROCKETDEBUGGER_API __attribute__((visibility("default")))
|
|
+ #else
|
|
+ #define ROCKETDEBUGGER_API
|
|
#endif
|
|
-#else
|
|
- #define ROCKETDEBUGGER_API
|
|
#endif
|
|
|
|
#endif
|