Skip to content

Commit

Permalink
NMake Makefiles: Support Meson-built libsigc++
Browse files Browse the repository at this point in the history
Add an option USE_MESON_LIBS for the NMake command line so that we can use
the Meson-built libsigc++ easier, without needing to manually update Makefiles
  • Loading branch information
fanc999-1 committed Feb 27, 2020
1 parent 8d58ba7 commit f3492ee
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
7 changes: 6 additions & 1 deletion MSVC_NMake/config-msvc.mak
Expand Up @@ -50,9 +50,14 @@ LIBPANGOMM_CFLAGS = /DPANGOMM_BUILD $(PANGOMM_BASE_CFLAGS) $(PANGOMM_EXTRA_INCLU
# We build pangomm-vc$(VSVER)0-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION).dll or
# pangomm-vc$(VSVER)0-d-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION).dll at least

!ifdef USE_MESON_LIBS
LIBSIGC_LIBNAME = sigc-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)
LIBSIGC_DLL = $(LIBSIGC_LIBNAME)-0.dll
!else
LIBSIGC_LIBNAME = sigc-vc$(VSVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)

LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
!endif

LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib

GLIBMM_LIBNAME = glibmm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
Expand Down
4 changes: 3 additions & 1 deletion README.win32
Expand Up @@ -52,7 +52,9 @@ all the depedent libraries could be found in $(PREFIX), which is at
$(srcroot)\..\vs15\$(Platform) by default. Run
'nmake /f Makefile.vc CFG=[release|debug]' to build pangomm. If a
different $(PREFIX) is desired rather than the aforementioned default,
pass in PREFIX=$(PATH) into your command line.
pass in PREFIX=$(PATH) into your command line. If using C++
dependencies that are built with Meson, specify USE_MESON_LIBS=1 in your
NMake command line.

A 'clean' target is supported to remove all the built object files and
intermediate files that are generated during the build, while an
Expand Down

0 comments on commit f3492ee

Please sign in to comment.