meson: Disallow default_library == 'both' on Visual Studio

fanc999-1 · fanc999-1 · commit 29adb517f589 · 2023-06-26T11:25:16.000+08:00
We need different defines/cflags for building static and shared builds of
libsigc++, so we can't really support default_library = 'both' for libsigc++
without much retinkering.

So, just disallow such builds at least for now.
Also, save up whether we are attempting a static build in the Visual Studio
build.
diff --git a/meson.build b/meson.build
@@ -43,6 +43,18 @@ cpp_compiler = meson.get_compiler('cpp')
 is_msvc = cpp_compiler.get_id() == 'msvc'
 python3 = find_program('python3', version: '>=3.5')
 
+# MSVC: We currently do not support shared and static builds at the,
+#       same time, since we need different defines/cflags for proper
+#       linking.
+if is_msvc
+  if get_option('default_library') == 'both'
+    error('-Ddefault_library=both is currently not supported for Visual Studio')
+  endif
+  is_msvc_static = get_option('default_library') == 'static'
+else
+  is_msvc_static = false
+endif
+
 # Do we build from a git repository?
 # Suppose we do if and only if the meson.build file is tracked by git.
 cmd_py = '''
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)
