[gtkmm/gtkmm-3-24] NMake Makefiles: Standardize on PDB version
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm/gtkmm-3-24] NMake Makefiles: Standardize on PDB version
- Date: Sun, 5 Apr 2020 16:49:03 +0000 (UTC)
commit ab50306ee98ce7d6b5f1aed4414cea324f0e0bf7
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Sun Apr 5 11:29:30 2020 +0800
NMake Makefiles: Standardize on PDB version
Make the default prefix relate to the PDB version, not the Visual Studio
version. This is becuase the dependent C++-11 -mm libraries already did
so.
MSVC_NMake/detectenv-msvc.mak | 2 +-
MSVC_NMake/info-msvc.mak | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
index 9a92c110..634fe684 100644
--- a/MSVC_NMake/detectenv-msvc.mak
+++ b/MSVC_NMake/detectenv-msvc.mak
@@ -8,7 +8,7 @@
# in $(GLIB_PREFIX)\lib.
!if "$(PREFIX)" == ""
-PREFIX = ..\..\vs$(VSVER)\$(PLAT)
+PREFIX = ..\..\vs$(PDBVER)\$(PLAT)
!endif
# Location of the PERL interpreter, for running glib-mkenums. glib-mkenums
diff --git a/MSVC_NMake/info-msvc.mak b/MSVC_NMake/info-msvc.mak
index 34d8bbce..3e7b7813 100644
--- a/MSVC_NMake/info-msvc.mak
+++ b/MSVC_NMake/info-msvc.mak
@@ -22,8 +22,9 @@ help:
@echo.
@echo PREFIX: Optional, the path where dependent libraries and tools may be
@echo found, default is ^$(srcrootdir)\..\vs^$(short_vs_ver)\^$(platform),
- @echo where ^$(short_vs_ver) is 15 for VS 2017 and so on; and
- @echo ^$(platform) is Win32 for 32-bit builds and x64 for x64 builds.
+ @echo where ^$(short_vs_ver) is 12 for VS 2013, and 14 for VS 2015~2019
+ @echo and so on; and ^$(platform) is Win32 for 32-bit builds and x64 for
+ @echo x64 builds.
@echo.
@echo ------
@echo Possible options include the following:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]