[pangomm/pangomm-2-42] NMake Makefiles: Distinguish between MSVC 2015, 2017 and 2019

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [pangomm/pangomm-2-42] NMake Makefiles: Distinguish between MSVC 2015, 2017 and 2019
Date: Tue, 16 Jun 2020 09:21:34 +0000 (UTC)
commit 5bc81169ce70e06f299b8d02809516c923a97489
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jun 16 17:20:04 2020 +0800

    NMake Makefiles: Distinguish between MSVC 2015, 2017 and 2019
    
    It was found that we cannot rely on the fact that Visual Studio
    2015~2019 tried very hard to be binary compatible, as there can be
    corner cases when linking against pangomm built with Visual Studio 2015
    with builds done by Visual Studio 2017 and 2019 where the code will fail to
    link and the DLLs are therefore not ABI-compatible.  Note that the
    libsigc++ DLLs, however, are ABI compatible between these 3 Visual
    Studio versions.
    
    As a result, for the DLL and LIB names, use 'vc140' for Visual Studio
    2015 builds, 'vc141' for Visual Studio 2017 builds and 'vc142' for
    Visual Studio 2019 builds, according to the toolset versions as defined
    by Microsoft.
    
    For people that may have previously built pangomm with Visual Studio 2017
    or 2019, which had 'vc140' in the built .lib and DLL, an NMake option
    'USE_COMPAT_LIBS' is added to make building such binaries with 'vc140'
    easier, if needed.

 MSVC_NMake/build-rules-msvc.mak  | 56 ++++++++++++++++++++--------------------
 MSVC_NMake/config-msvc.mak       | 18 ++++++-------
 MSVC_NMake/create-lists-msvc.mak | 14 +++++-----
 MSVC_NMake/detectenv-msvc.mak    | 43 ++++++++++++++++++------------
 MSVC_NMake/generate-msvc.mak     | 12 ++++-----
 MSVC_NMake/install.mak           | 10 +++----
 6 files changed, 82 insertions(+), 71 deletions(-)
---
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
index 3e7174b..4c2471e 100644
--- a/MSVC_NMake/build-rules-msvc.mak
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -13,29 +13,29 @@
 #      $(CC)|$(CXX) $(cflags) /Fo$(destdir) /c @<<
 # $<
 # <<
-{vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\}.cc{vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\}.obj::
-       $(CXX) $(PANGOMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\ 
/Fdvs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\ /c @<<
+{vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\}.obj::
+       $(CXX) $(PANGOMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\pangomm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\pangomm\ /c @<<
 $<
 <<
 
-{..\untracked\pango\pangomm\}.cc{vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\}.obj::
-       $(CXX) $(PANGOMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\ 
/Fdvs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\ /c @<<
+{..\untracked\pango\pangomm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\}.obj::
+       $(CXX) $(PANGOMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\pangomm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\pangomm\ /c @<<
 $<
 <<
 
-{..\pango\pangomm\}.cc{vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\}.obj::
-       $(CXX) $(PANGOMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\ 
/Fdvs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\ /c @<<
+{..\pango\pangomm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\}.obj::
+       $(CXX) $(PANGOMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\pangomm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\pangomm\ /c @<<
 $<
 <<
 
-{..\pango\src\}.ccg{vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\}.obj:
+{..\pango\src\}.ccg{vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\}.obj:
        @if not exist $(@D)\private\ $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)\private
        @for %%s in ($(<D)\*.ccg) do @if not exist ..\pango\pangomm\%%~ns.cc if not exist 
..\untracked\pango\pangomm\%%~ns.cc if not exist $(@D)\%%~ns.cc $(PERL) -- $(GMMPROC_DIR)/gmmproc -I 
../tools/m4 --defs $(<D:\=/) %%~ns $(<D:\=/) $(@D)
        @if exist $(@D)\$(<B).cc $(CXX) $(PANGOMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c $(@D)\$(<B).cc
        @if exist ..\pango\pangomm\$(<B).cc $(CXX) $(PANGOMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c 
..\pango\pangomm\$(<B).cc
        @if exist ..\untracked\pango\pangomm\$(<B).cc $(CXX) $(PANGOMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ 
/Fd$(@D)\ /c ..\pango\pangomm\$(<B).cc
 
-{.\pangomm\}.rc{vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\}.res:
+{.\pangomm\}.rc{vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\}.res:
        rc /fo$@ $<
 
 # Rules for building .lib files
@@ -63,28 +63,28 @@ $(pangomm_OBJS)
 #      @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
 
 # For the gendef tool
-{.\gendef\}.cc{vs$(PDBVER)\$(CFG)\$(PLAT)\}.exe:
-       @if not exist vs$(PDBVER)\$(CFG)\$(PLAT)\gendef\ $(MAKE) -f Makefile.vc CFG=$(CFG) 
vs$(PDBVER)\$(CFG)\$(PLAT)\gendef
+{.\gendef\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\}.exe:
+       @if not exist vs$(VSVER)\$(CFG)\$(PLAT)\gendef\ $(MAKE) -f Makefile.vc CFG=$(CFG) 
vs$(VSVER)\$(CFG)\$(PLAT)\gendef
        $(CXX) $(PANGOMM_BASE_CFLAGS) $(CFLAGS) /Fo$(@D)\gendef\ /Fd$(@D)\gendef\ $< /link $(LDFLAGS) /out:$@
 
 clean:
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\*.exe
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\*.dll
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\*.pdb
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\*.ilk
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\*.exp
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\*.lib
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\*.def
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\*.res
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\*.pdb
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\*.obj
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\private\*.h
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\*.h
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\*.cc
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\gendef\*.pdb
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\gendef\*.obj
-       @-rd vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\private
-       @-rd vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm
-       @-rd vs$(PDBVER)\$(CFG)\$(PLAT)\gendef
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\*.exe
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\*.dll
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\*.pdb
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\*.ilk
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\*.exp
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\*.lib
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\*.def
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\*.res
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\*.pdb
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\*.obj
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\private\*.h
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\*.h
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\*.cc
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gendef\*.pdb
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gendef\*.obj
+       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\private
+       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\pangomm
+       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\gendef
 
 .SUFFIXES: .cc .h .ccg .hg .obj
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 7517736..ba71599 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -30,7 +30,7 @@ GMMPROC_DIR=$(PREFIX)\share\glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSIO
 !endif
 
 PANGOMM_BASE_CFLAGS =                  \
-       /Ivs$(PDBVER)\$(CFG)\$(PLAT)    \
+       /Ivs$(VSVER)\$(CFG)\$(PLAT)     \
        /I..\untracked\pango    \
        /I..\pango      \
        /I..\untracked\pango\pangomm    \
@@ -52,8 +52,8 @@ PANGOMM_EXTRA_INCLUDES =      \
 
 PANGOMM_CFLAGS = /DPANGOMM_BUILD $(PANGOMM_BASE_CFLAGS) $(PANGOMM_EXTRA_INCLUDES)
 
-# We build pangomm-vc$(PDBVER)0-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION).dll or
-#          pangomm-vc$(PDBVER)0-d-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION).dll at least
+# We build pangomm-vc$(VSVER_LIB)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION).dll or
+#          pangomm-vc$(VSVER_LIB)-d-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION).dll at least
 
 !ifdef USE_MESON_LIBS
 LIBSIGC_LIBNAME = sigc-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)
@@ -64,8 +64,8 @@ GLIBMM_DLL = $(GLIBMM_LIBNAME)-1.dll
 CAIROMM_DLL = $(CAIROMM_LIBNAME)-1.dll
 !else
 LIBSIGC_LIBNAME = sigc-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(LIBSIGC_MINOR_VERSION)
-GLIBMM_LIBNAME = glibmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
-CAIROMM_LIBNAME = cairomm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION)
+GLIBMM_LIBNAME = glibmm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
+CAIROMM_LIBNAME = cairomm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(CAIROMM_MAJOR_VERSION)_$(CAIROMM_MINOR_VERSION)
 LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
 GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
 CAIROMM_DLL = $(CAIROMM_LIBNAME).dll
@@ -75,12 +75,12 @@ LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
 GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
 CAIROMM_LIB = $(CAIROMM_LIBNAME).lib
 
-PANGOMM_LIBNAME = pangomm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION)
+PANGOMM_LIBNAME = pangomm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION)
 
-PANGOMM_DLL = vs$(PDBVER)\$(CFG)\$(PLAT)\$(PANGOMM_LIBNAME).dll
-PANGOMM_LIB = vs$(PDBVER)\$(CFG)\$(PLAT)\$(PANGOMM_LIBNAME).lib
+PANGOMM_DLL = vs$(VSVER)\$(CFG)\$(PLAT)\$(PANGOMM_LIBNAME).dll
+PANGOMM_LIB = vs$(VSVER)\$(CFG)\$(PLAT)\$(PANGOMM_LIBNAME).lib
 
-GENDEF = vs$(PDBVER)\$(CFG)\$(PLAT)\gendef.exe
+GENDEF = vs$(VSVER)\$(CFG)\$(PLAT)\gendef.exe
 GOBJECT_LIBS = gobject-$(GLIB_API_VERSION).lib glib-$(GLIB_API_VERSION).lib
 
 PANGO_LIBS = pangocairo-$(PANGO_API_VERSION).lib pango-$(PANGO_API_VERSION).lib $(GOBJECT_LIBS) cairo.lib
diff --git a/MSVC_NMake/create-lists-msvc.mak b/MSVC_NMake/create-lists-msvc.mak
index 989db43..30f798c 100644
--- a/MSVC_NMake/create-lists-msvc.mak
+++ b/MSVC_NMake/create-lists-msvc.mak
@@ -42,13 +42,13 @@ files_extra_ph_int = $(files_extra_ph:/=\)
 !if [call create-lists.bat header pangomm.mak pangomm_OBJS]
 !endif
 
-!if [for %c in ($(files_built_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file pangomm.mak 
vs^$(PDBVER)\^$(CFG)\^$(PLAT)\pangomm\%~nc.obj]
+!if [for %c in ($(files_built_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file pangomm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\pangomm\%~nc.obj]
 !endif
 
-!if [for %c in ($(files_extra_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file pangomm.mak 
vs^$(PDBVER)\^$(CFG)\^$(PLAT)\pangomm\%~nc.obj]
+!if [for %c in ($(files_extra_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file pangomm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\pangomm\%~nc.obj]
 !endif
 
-!if [@call create-lists.bat file pangomm.mak vs^$(PDBVER)\^$(CFG)\^$(PLAT)\pangomm\pangomm.res]
+!if [@call create-lists.bat file pangomm.mak vs^$(VSVER)\^$(CFG)\^$(PLAT)\pangomm\pangomm.res]
 !endif
 
 !if [call create-lists.bat footer pangomm.mak]
@@ -63,10 +63,10 @@ files_extra_ph_int = $(files_extra_ph:/=\)
 !if [call create-lists.bat footer pangomm.mak]
 !endif
 
-!if [for %f in (pangomm\attributes.h) do @if not exist ..\pango\%f if not exist ..\untracked\pango\%f if not 
exist vs$(PDBVER)\$(CFG)\$(PLAT)\%f (md vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\private) & ($(PERL) -- 
$(GMMPROC_DIR)/gmmproc -I ../tools/m4 --defs ../pango/src attributes ../pango/src 
vs$(PDBVER)/$(CFG)/$(PLAT)/pangomm)]
+!if [for %f in (pangomm\attributes.h) do @if not exist ..\pango\%f if not exist ..\untracked\pango\%f if not 
exist vs$(VSVER)\$(CFG)\$(PLAT)\%f (md vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\private) & ($(PERL) -- 
$(GMMPROC_DIR)/gmmproc -I ../tools/m4 --defs ../pango/src attributes ../pango/src 
vs$(VSVER)/$(CFG)/$(PLAT)/pangomm)]
 !endif
 
-!if [for %d in (vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm ..\pango\pangomm ..\untracked\pango\pangomm) do @if exist 
%d\attributes.h call get-gmmproc-ver %d\attributes.h>>pangomm.mak]
+!if [for %d in (vs$(VSVER)\$(CFG)\$(PLAT)\pangomm ..\pango\pangomm ..\untracked\pango\pangomm) do @if exist 
%d\attributes.h call get-gmmproc-ver %d\attributes.h>>pangomm.mak]
 !endif
 
 !include pangomm.mak
@@ -75,10 +75,10 @@ files_extra_ph_int = $(files_extra_ph:/=\)
 !endif
 
 !if "$(GMMPROC_VER)" >= "2.64.3"
-PANGOMM_INT_TARGET = vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm
+PANGOMM_INT_TARGET = vs$(VSVER)\$(CFG)\$(PLAT)\pangomm
 PANGOMM_DEF_LDFLAG =
 !else
-PANGOMM_INT_TARGET = vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\pangomm.def
+PANGOMM_INT_TARGET = vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\pangomm.def
 PANGOMM_DEF_LDFLAG = /def:$(PANGOMM_INT_TARGET)
 PANGOMM_BASE_CFLAGS = $(PANGOMM_BASE_CFLAGS) /DPANGOMM_USE_GENDEF
 !endif
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
index 634fe68..38bc704 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$(PDBVER)\$(PLAT)
+PREFIX = ..\..\vs$(VSVER)\$(PLAT)
 !endif
 
 # Location of the PERL interpreter, for running glib-mkenums.  glib-mkenums
@@ -79,34 +79,45 @@ _HASH=^#
 !if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
 !endif
 
+VSVER = 0
+PDBVER = 0
+VSVER_SUFFIX = 0
+
 !if $(VCVERSION) > 1499 && $(VCVERSION) < 1600
-VSVER = 9
+PDBVER = 9
 !elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700
-VSVER = 10
+PDBVER = 10
 !elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800
-VSVER = 11
+PDBVER = 11
 !elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900
-VSVER = 12
-!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
-VSVER = 14
-!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000
+PDBVER = 12
+!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 2000
+PDBVER = 14
+!if $(VCVERSION) > 1909 && $(VCVERSION) < 1920
+VSVER_SUFFIX = 1
 VSVER = 15
+!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000
+VSVER_SUFFIX = 2
+VSVER = 16
 !else
-VSVER = 0
+VSVER = $(PDBVER)
+!endif
+!else
+VSVER = $(PDBVER)
+!endif
+
+!if $(VSVER) > 14 && "$(USE_COMPAT_LIBS)" != ""
+VSVER_LIB = $(PDBVER)0
+!else
+VSVER_LIB = $(PDBVER)$(VSVER_SUFFIX)
 !endif
 
 !if "$(VSVER)" == "0"
 MSG = ^
 This NMake Makefile set supports Visual Studio^
-9 (2008) through 15 (2017).  Your Visual Studio^
+9 (2008) through 16 (2019).  Your Visual Studio^
 version is not supported.
 !error $(MSG)
-!else
-!if $(VSVER) < 15
-PDBVER = $(VSVER)
-!else
-PDBVER = 14
-!endif
 !endif
 
 VALID_CFGSET = FALSE
diff --git a/MSVC_NMake/generate-msvc.mak b/MSVC_NMake/generate-msvc.mak
index 3a0c11d..53991a6 100644
--- a/MSVC_NMake/generate-msvc.mak
+++ b/MSVC_NMake/generate-msvc.mak
@@ -4,17 +4,17 @@
 # one is maintaining the NMake build files.
 
 # Create the build directories
-vs$(PDBVER)\$(CFG)\$(PLAT)\gendef      \
-vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm     \
-vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\private:
+vs$(VSVER)\$(CFG)\$(PLAT)\gendef       \
+vs$(VSVER)\$(CFG)\$(PLAT)\pangomm      \
+vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\private:
        @-md $@
 
 # Generate .def files
-vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\pangomm.def: $(GENDEF) vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm $(pangomm_OBJS)
-       vs$(PDBVER)\$(CFG)\$(PLAT)\gendef.exe $@ $(PANGOMM_LIBNAME) vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\*.obj
+vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\pangomm.def: $(GENDEF) vs$(VSVER)\$(CFG)\$(PLAT)\pangomm $(pangomm_OBJS)
+       vs$(VSVER)\$(CFG)\$(PLAT)\gendef.exe $@ $(PANGOMM_LIBNAME) vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\*.obj
 
 # Generate wrap_init.cc files
-vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\wrap_init.cc: $(pangomm_real_hg)
+vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\wrap_init.cc: $(pangomm_real_hg)
        @if not exist ..\pango\pangomm\wrap_init.cc $(PERL) -- "$(GMMPROC_DIR)/generate_wrap_init.pl" 
--namespace=Pango --parent_dir=pangomm $(pangomm_real_hg:\=/)>$@
 
 # Generate pre-generated resources and configuration headers (builds from GIT)
diff --git a/MSVC_NMake/install.mak b/MSVC_NMake/install.mak
index aa8b2a5..bf6228f 100644
--- a/MSVC_NMake/install.mak
+++ b/MSVC_NMake/install.mak
@@ -6,16 +6,16 @@ install: all
        @if not exist $(PREFIX)\lib\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\include\ mkdir 
$(PREFIX)\lib\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\include
        @if not exist 
$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\private\ @mkdir 
$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\private
        @if not exist $(PREFIX)\share\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\proc\m4\ 
@mkdir $(PREFIX)\share\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\proc\m4
-       @copy /b vs$(PDBVER)\$(CFG)\$(PLAT)\$(PANGOMM_LIBNAME).dll $(PREFIX)\bin
-       @copy /b vs$(PDBVER)\$(CFG)\$(PLAT)\$(PANGOMM_LIBNAME).pdb $(PREFIX)\bin
-       @copy /b vs$(PDBVER)\$(CFG)\$(PLAT)\$(PANGOMM_LIBNAME).lib $(PREFIX)\lib
+       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(PANGOMM_LIBNAME).dll $(PREFIX)\bin
+       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(PANGOMM_LIBNAME).pdb $(PREFIX)\bin
+       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(PANGOMM_LIBNAME).lib $(PREFIX)\lib
        @copy ..\pango\pangomm.h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\"
        @for %h in ($(files_extra_h)) do @copy ..\pango\pangomm\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\%h"
        @for %h in ($(files_built_h)) do @if exist ..\untracked\pango\pangomm\%h copy 
..\untracked\pango\pangomm\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\%h"
        @for %h in ($(files_built_h)) do @if exist ..\pango\pangomm\%h if not exist 
..\untracked\pango\pangomm\%h copy ..\pango\pangomm\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\%h"
-       @for %h in ($(files_built_h)) do @if exist vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\%h copy 
vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\%h"
+       @for %h in ($(files_built_h)) do @if exist vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\%h copy 
vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\%h"
        @for %h in ($(files_built_h)) do @if exist ..\untracked\pango\pangomm\private\%h copy 
..\untracked\pango\pangomm\private\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\private\%h"
        @for %h in ($(PANGOMM_BUILD_PRIVATE_HEADERS)) do @if exist ..\pango\pangomm\private\%h if not exist 
..\untracked\pango\pangomm\private\%h copy ..\pango\pangomm\private\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\private\%h"
-       @for %h in ($(PANGOMM_BUILD_PRIVATE_HEADERS)) do @if exist 
vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\private\%h copy vs$(PDBVER)\$(CFG)\$(PLAT)\pangomm\private\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\private\%h"
+       @for %h in ($(PANGOMM_BUILD_PRIVATE_HEADERS)) do @if exist 
vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\private\%h copy vs$(VSVER)\$(CFG)\$(PLAT)\pangomm\private\%h 
"$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\pangomm\private\%h"
        @copy ".\pangomm\pangommconfig.h" 
"$(PREFIX)\lib\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\include\"
        @copy ..\tools\m4\*.m4 
$(PREFIX)\share\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\proc\m4
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]