NMake Makefiles: Make things more configurable

fanc999-1 · fanc999-1 · commit 99e6ed1b1aff · 2022-08-16T23:50:35.000+08:00
Add the INCLUDEDIR and LIBDIR options, so that we can set where we find
dependent headers and libraries, if they are not in %INCLUDE% and/or %LIB%
and are not in $(PREFIX)\include and $(PREFIX)\lib.

Also mention about the PREFIX and PERL options, so that one can use them when
necessary.
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
@@ -1,7 +1,14 @@
 # NMake Makefile portion for enabling features for Windows builds
 
 # These are the base minimum libraries required for building glibmm.
-BASE_INCLUDES =	/I$(PREFIX)\include
+!ifndef INCLUDEDIR
+INCLUDEDIR = $(PREFIX)\include
+!endif
+!ifndef LIBDIR
+LIBDIR = $(PREFIX)\lib
+!endif
+
+BASE_INCLUDES = /I$(INCLUDEDIR)
 
 # Please do not change anything beneath this line unless maintaining the NMake Makefiles
 LIBXMLXX_MAJOR_VERSION = 5
@@ -19,8 +26,8 @@ LIBXMLXX_BASE_CFLAGS =			\
 	/std:c++17
 
 LIBXMLXX_EXTRA_INCLUDES =	\
-	/I$(PREFIX)\include\libxml2	\
-	/I$(PREFIX)\include
+	/I$(INCLUDEDIR)\libxml2	\
+	/I$(INCLUDEDIR)
 
 LIBXMLXX_CFLAGS = /DLIBXMLPP_BUILD $(LIBXMLXX_BASE_CFLAGS) $(LIBXMLXX_EXTRA_INCLUDES)
 LIBXMLXX_EX_CFLAGS = $(LIBXMLXX_BASE_CFLAGS) $(LIBXMLXX_EXTRA_INCLUDES)
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
@@ -160,7 +160,7 @@ LDFLAGS_ARCH = /machine:x86
 CFLAGS_NOGL = $(CFLAGS_ADD_NO_GL) /W3 /Zi
 CFLAGS = $(CFLAGS_ADD) /W3 /Zi
 
-LDFLAGS_BASE = $(LDFLAGS_ARCH) /libpath:$(PREFIX)\lib /DEBUG
+LDFLAGS_BASE = $(LDFLAGS_ARCH) /libpath:$(LIBDIR) /DEBUG
 
 !if "$(CFG)" == "debug" || "$(CFG)" == "Debug"
 ARFLAGS_NOLTCG = $(LDFLAGS_ARCH)
diff --git a/MSVC_NMake/info-msvc.mak b/MSVC_NMake/info-msvc.mak
@@ -32,6 +32,19 @@ help:
 	@echo.
 	@echo USE_MESON_LIBS: Use DLLs and LIBs of C++ dependencies that are built with Meson,
 	@echo as applicable.
+	@echo.
+	@echo PERL: Full path to PERL interpreter, if not already in PATH, needed to generate
+	@echo libxml++config.h and libxml++.rc if not already present in .\libxml++.
+	@echo.
+	@echo PREFIX: Base directory to look for dependencies and location for where the
+	@echo build results are copied, default is in ..\..\^$(short_vs_ver)\^$(platform)
+	@echo.
+	@echo INCLUDEDIR: Base include directory to look for dependenct headers,
+	@echo such as libxml2, default is in ^$(PREFIX)\include.
+	@echo.
+	@echo LIBDIR: Base directory to look for dependent libraries, such as libxml2,
+	@echo default is in ^$(PREFIX)\lib.
+	@echo.
 	@echo ======
 	@echo A 'clean' target is supported to remove all generated files, intermediate
 	@echo object files and binaries for the specified configuration.
