summaryrefslogtreecommitdiffstats
path: root/depends
diff options
context:
space:
mode:
authorMrazek, Petr <petr.mrazek@acision.com>2015-08-20 15:27:51 +0200
committerMrazek, Petr <petr.mrazek@acision.com>2015-08-20 15:27:51 +0200
commite5f7676622e6186386335e676940a16903fb8242 (patch)
treefc5bd825352cbc931cf454a2a2627c85d7628ef4 /depends
parentcc4d0a0a8e40b83d7d7345f4fcd248df2ad26e1e (diff)
downloadMultiMC-e5f7676622e6186386335e676940a16903fb8242.tar
MultiMC-e5f7676622e6186386335e676940a16903fb8242.tar.gz
MultiMC-e5f7676622e6186386335e676940a16903fb8242.tar.lz
MultiMC-e5f7676622e6186386335e676940a16903fb8242.tar.xz
MultiMC-e5f7676622e6186386335e676940a16903fb8242.zip
NOISSUE fix librainbow
Diffstat (limited to 'depends')
-rw-r--r--depends/rainbow/CMakeLists.txt5
-rw-r--r--depends/rainbow/include/rainbow_config.h12
2 files changed, 11 insertions, 6 deletions
diff --git a/depends/rainbow/CMakeLists.txt b/depends/rainbow/CMakeLists.txt
index 6eeb2adc..74c593ff 100644
--- a/depends/rainbow/CMakeLists.txt
+++ b/depends/rainbow/CMakeLists.txt
@@ -13,8 +13,9 @@ include/rainbow.h
src/rainbow.cpp
)
-add_definitions(-DRAINBOW_LIBRARY)
+#add_definitions(-DRAINBOW_LIBRARY)
+add_definitions(-DRAINBOW_STATIC)
set(RAINBOW_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
-add_library(rainbow SHARED ${RAINBOW_SOURCES})
+add_library(rainbow STATIC ${RAINBOW_SOURCES})
qt5_use_modules(rainbow Core Gui)
diff --git a/depends/rainbow/include/rainbow_config.h b/depends/rainbow/include/rainbow_config.h
index 0699795c..ccd500ed 100644
--- a/depends/rainbow/include/rainbow_config.h
+++ b/depends/rainbow/include/rainbow_config.h
@@ -15,8 +15,12 @@
#include <QtCore/QtGlobal>
-#ifdef RAINBOW_LIBRARY
-#define RAINBOW_EXPORT Q_DECL_EXPORT
+#ifdef RAINBOW_STATIC
+ #define RAINBOW_EXPORT
#else
-#define RAINBOW_EXPORT Q_DECL_IMPORT
-#endif
+ #ifdef RAINBOW_LIBRARY
+ #define RAINBOW_EXPORT Q_DECL_EXPORT
+ #else
+ #define RAINBOW_EXPORT Q_DECL_IMPORT
+ #endif
+#endif \ No newline at end of file