diff --git a/README.win32 b/README.win32 index df48c6c..f1f220e 100644 --- a/README.win32 +++ b/README.win32 @@ -27,24 +27,29 @@ arguments that work with MSVC. This means -Lfoo will be converted to /libpath:foo, and -lfoo will be converted to foo.lib. Building pkg-config is now supported on Visual Studio/MSVC as well. To -build it, you will need to have a glib installation. Note that MSVC -builds of glib does not have a build-time dependency on pkg-config, -unlike the normal autotools builds. The headers and libs either need to -be found in your default %INCLUDE% and %LIB% respectively, or they need -to be found in $(GLIB_PREFIX)\include and $(GLIB_PREFIX)\lib respectively; -please see Makefile.vc for adjusting $(GLIB_PREFIX) to suit your needs. -To build pkg-config with MSVC, run in a Visual Studio command prompt from -the "nmake" subdirectory: +build it, you can choose to use an existing glib installation, or build +pkg-config with the copy of GLib that is bundled with the pkg-config +sources, by using `HAVE_GLIB=1` in your NMake command line to use an +existing installation of GLib. Building with the bundled GLib will +require an existing installation of gettext-runtime or proxy-libintl. +Note that MSVC builds of glib does not have a build-time dependency on +pkg-config, unlike the normal autotools builds. The headers and libs +either need to be found in your default %INCLUDE% and %LIB% respectively, +or they need to be found in $(GLIB_PREFIX)\include and $(GLIB_PREFIX)\lib +respectively; please see Makefile.vc for adjusting $(GLIB_PREFIX) to suit +your needs. To build pkg-config with MSVC, run in a Visual Studio command +prompt from the "nmake" subdirectory: -"nmake /f Makefile.vc CFG=release" (release builds) -or- -"nmake /f Makefile.vc CFG=debug" (debug builds) +"nmake /f Makefile.vc CFG=release" [HAVE_GLIB=1] (release builds) -or- +"nmake /f Makefile.vc CFG=debug" [HAVE_GLIB=1] (debug builds) The resulting pkg-config.exe will be found in nmake\vsXX\[release|debug]\[win32|x64|arm64], where vsXX stands for the short Visual Studio version, which is 9 for 2008, 10 for 2010, 14 for 2015 and so on; a 'clean' target is supported to clean up the build. MSVC 2008 through 2022 is supported, for the x86, x86_64 (x64) and aarch64 (ARM64) -architectures; older versions may work as well but is not tested. Note -that building with the glib bundled with this source -distribution is not currently supported-the glib DLL and all of its -dependent DLLs are required at runtime. +architectures; older versions may work as well but is not tested. The +GLIib DLL and all of its dependent DLLs are required at runtime if using +an existing installation, if using the GLib that is bundled with +pkg-config; if using the bundled GLib, the built pkg-config-glib.dll is +required along with the gettext-runtime or proxy-libintl DLL.