build: Drop _WINDLL from sigc++config.h.[in|meson|cmake]

fanc999-1 · kjellahl · commit a23cdc451769 · 2023-06-26T11:10:11.000+02:00
...and add a new check macro LIBSIGCXX_STATIC, to use the appropriate macros to
build and link against libsigc++. Drop this from the build files as well.
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
@@ -14,7 +14,7 @@ DEBUG_SUFFIX = -d
 DEBUG_SUFFIX =
 !endif
 
-LIBSIGCPP_DEFINES = /DSIGC_BUILD /D_WINDLL
+LIBSIGCPP_DEFINES = /DSIGC_BUILD
 
 SIGCPP_BASE_CFLAGS = /I.. /I. /I..\untracked\MSVC_NMake /std:c++17 /EHsc $(CFLAGS)
 
diff --git a/sigc++/meson.build b/sigc++/meson.build
@@ -74,7 +74,7 @@ extra_sigc_objects = []
 
 # Make sure we are exporting the symbols from the DLL
 if is_msvc
-  extra_sigc_cppflags += ['-DSIGC_BUILD', '-D_WINDLL']
+  extra_sigc_cppflags += ['-DSIGC_BUILD']
 endif
 
 # Build the .rc file for Windows builds and link to it
diff --git a/sigc++config.h.cmake b/sigc++config.h.cmake
@@ -16,7 +16,9 @@
 # if defined(_MSC_VER)
 #  define SIGC_MSC 1
 #  define SIGC_WIN32 1
-#  define SIGC_DLL 1
+#  ifndef LIBSIGCXX_STATIC
+#   define SIGC_DLL 1
+#  endif
 # elif defined(__CYGWIN__)
 #  define SIGC_CONFIGURE 1
 # elif defined(__MINGW32__)
@@ -54,7 +56,7 @@
 #endif /* !SIGC_MSC */
 
 #ifdef SIGC_DLL
-# if defined(SIGC_BUILD) && defined(_WINDLL)
+# ifdef SIGC_BUILD
 #  define SIGC_API __declspec(dllexport)
 # elif !defined(SIGC_BUILD)
 #  define SIGC_API __declspec(dllimport)
diff --git a/sigc++config.h.in b/sigc++config.h.in
@@ -16,7 +16,9 @@
 #if defined(_MSC_VER)
 #define SIGC_MSC 1
 #define SIGC_WIN32 1
+#ifndef LIBSIGCXX_STATIC
 #define SIGC_DLL 1
+#endif
 #elif defined(__CYGWIN__)
 #define SIGC_CONFIGURE 1
 #elif defined(__MINGW32__)
@@ -54,7 +56,7 @@
 #endif /* !SIGC_MSC */
 
 #ifdef SIGC_DLL
-#if defined(SIGC_BUILD) && defined(_WINDLL)
+#ifdef SIGC_BUILD
 #define SIGC_API __declspec(dllexport)
 #elif !defined(SIGC_BUILD)
 #define SIGC_API __declspec(dllimport)
diff --git a/sigc++config.h.meson b/sigc++config.h.meson
@@ -19,7 +19,9 @@
 #if defined(_MSC_VER)
 #define SIGC_MSC 1
 #define SIGC_WIN32 1
+#ifndef LIBSIGCXX_STATIC
 #define SIGC_DLL 1
+#endif
 #elif defined(__CYGWIN__)
 #define SIGC_CONFIGURE 1
 #elif defined(__MINGW32__)
@@ -57,7 +59,7 @@
 #endif /* !SIGC_MSC */
 
 #ifdef SIGC_DLL
-#if defined(SIGC_BUILD) && defined(_WINDLL)
+#ifdef SIGC_BUILD
 #define SIGC_API __declspec(dllexport)
 #elif !defined(SIGC_BUILD)
 #define SIGC_API __declspec(dllimport)
