[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] core/libs/rawengine: fix libraw export symbols for CLI tools
From:       Gilles Caulier <null () kde ! org>
Date:       2018-07-21 22:49:45
Message-ID: E1fh0h7-0004f9-9l () code ! kde ! org
[Download RAW message or body]

Git commit 015b9a0dc388cde5fb8f6ab9b00b8af8a6ae86bf by Gilles Caulier.
Committed on 21/07/2018 at 22:49.
Pushed by cgilles into branch 'master'.

fix libraw export symbols for CLI tools

M  +2    -0    core/libs/rawengine/CMakeLists.txt
M  +10   -10   core/libs/rawengine/libraw/libraw/libraw_types.h

https://commits.kde.org/digikam/015b9a0dc388cde5fb8f6ab9b00b8af8a6ae86bf

diff --git a/core/libs/rawengine/CMakeLists.txt b/core/libs/rawengine/CMake=
Lists.txt
index 2e9488dd38..ebe62505c7 100644
--- a/core/libs/rawengine/CMakeLists.txt
+++ b/core/libs/rawengine/CMakeLists.txt
@@ -58,6 +58,8 @@ if(WIN32)
     else()
         add_definitions(-DLIBRAW_NODLL)
     endif()
+else()
+    add_definitions(-DLIBRAW_BUILDLIB)
 endif()
 =

 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libraw
diff --git a/core/libs/rawengine/libraw/libraw/libraw_types.h b/core/libs/r=
awengine/libraw/libraw/libraw_types.h
index 230c877866..21f01ca7c2 100644
--- a/core/libs/rawengine/libraw/libraw/libraw_types.h
+++ b/core/libs/rawengine/libraw/libraw/libraw_types.h
@@ -97,17 +97,17 @@ typedef unsigned long long UINT64;
   typedef unsigned short ushort;
 =

 #ifdef WIN32
-#ifdef LIBRAW_NODLL
-#define DllDef
+#   ifdef LIBRAW_NODLL
+#       define DllDef
+#   else
+#       ifdef LIBRAW_BUILDLIB
+#           define DllDef __declspec(dllexport)
+#       else
+#          define DllDef __declspec(dllimport)
+#       endif
+#   endif
 #else
-#ifdef LIBRAW_BUILDLIB
-#define DllDef __declspec(dllexport)
-#else
-#define DllDef __declspec(dllimport)
-#endif
-#endif
-#else
-#define DllDef
+#   define DllDef __attribute__((visibility("default")))
 #endif
 =

   typedef struct
[prev in list] [next in list] [prev in thread] [next in thread]