[gtkmm/use-dllexport: 47/60] NMake Makefiles: Support linking to Meson-built -mm libraries
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm/use-dllexport: 47/60] NMake Makefiles: Support linking to Meson-built -mm libraries
- Date: Mon, 8 Jun 2020 02:45:57 +0000 (UTC)
commit f255c9a20fb6d19a76588230bf32b212a6aa2ec3
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Jun 4 18:02:47 2020 +0800
NMake Makefiles: Support linking to Meson-built -mm libraries
Add a command line option USE_MESON_LIBS=1 which can be used to link the
gtkmm items to Meson-built -mm dependencies, which saves one from needing to
manually edit the NMake Makefiles. Note that one must choose to either link
to all -mm dependencies built with Meson or all -mm dependencies built with
NMake.
MSVC_NMake/config-msvc.mak | 47 +++++++++++++++++++++++++---------------------
1 file changed, 26 insertions(+), 21 deletions(-)
---
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index ddbd2903..bef43e47 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -189,34 +189,39 @@ GTKMM_DEMO_CFLAGS = \
# gtkmm-vc$(VSVER)0-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION).dll or
# gtkmm-vc$(VSVER)0-d-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION).dll at least
+!ifdef USE_MESON_LIBS
+LIBSIGC_LIBNAME = sigc-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)
+GLIBMM_LIBNAME = glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
+GIOMM_LIBNAME = giomm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
+CAIROMM_LIBNAME = cairomm-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)
+ATKMM_LIBNAME = atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)
+PANGOMM_LIBNAME = pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)
+LIBSIGC_DLL = $(LIBSIGC_LIBNAME)-0.dll
+GLIBMM_DLL = $(GLIBMM_LIBNAME)-1.dll
+GIOMM_DLL = $(GIOMM_LIBNAME)-1.dll
+CAIROMM_DLL = $(CAIROMM_LIBNAME)-1.dll
+ATKMM_DLL = $(ATKMM_LIBNAME)-1.dll
+PANGOMM_DLL = $(PANGOMM_LIBNAME)-1.dll
+!else
LIBSIGC_LIBNAME = sigc-vc$(VSVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
-
-LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
-LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
-
GLIBMM_LIBNAME = glibmm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
-
-GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
-GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
-
GIOMM_LIBNAME = giomm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
-
-GIOMM_DLL = $(GIOMM_LIBNAME).dll
-GIOMM_LIB = $(GIOMM_LIBNAME).lib
-
CAIROMM_LIBNAME = cairomm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION)
-
-CAIROMM_DLL = $(CAIROMM_LIBNAME).dll
-CAIROMM_LIB = $(CAIROMM_LIBNAME).lib
-
ATKMM_LIBNAME = atkmm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION)
-
-ATKMM_DLL = $(ATKMM_LIBNAME).dll
-ATKMM_LIB = $(ATKMM_LIBNAME).lib
-
PANGOMM_LIBNAME = pangomm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION)
-
+LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
+GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
+GIOMM_DLL = $(GIOMM_LIBNAME).dll
+CAIROMM_DLL = $(CAIROMM_LIBNAME).dll
+ATKMM_DLL = $(ATKMM_LIBNAME).dll
PANGOMM_DLL = $(PANGOMM_LIBNAME).dll
+!endif
+
+LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
+GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
+GIOMM_LIB = $(GIOMM_LIBNAME).lib
+CAIROMM_LIB = $(CAIROMM_LIBNAME).lib
+ATKMM_LIB = $(ATKMM_LIBNAME).lib
PANGOMM_LIB = $(PANGOMM_LIBNAME).lib
GDKMM_LIBNAME = gdkmm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]