[glibmm/glibmm-2-62] NMake Makefiles: Use PDBVER instead of VSVER for toolset

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [glibmm/glibmm-2-62] NMake Makefiles: Use PDBVER instead of VSVER for toolset
Date: Mon, 24 Feb 2020 11:10:30 +0000 (UTC)
commit 1203a12e46271d0c1fcd8fcd18b5a79a8f3683f0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Feb 24 19:07:19 2020 +0800

    NMake Makefiles: Use PDBVER instead of VSVER for toolset
    
    Since this is the C++-11 series of glibmm, and Visual Studio 2015~2019
    share the same CRTs, let them all use the PDB version (v14) as binaries
    in this case should be interchangeable.  For Visual Studio 2013, the PDB
    version is the same as VSVER (v12), so 2013 builds will remain separate.

 MSVC_NMake/build-rules-msvc.mak  | 324 +++++++++++++++++++--------------------
 MSVC_NMake/config-msvc.mak       |  12 +-
 MSVC_NMake/create-lists-msvc.mak |  26 ++--
 MSVC_NMake/detectenv-msvc.mak    |   2 +-
 MSVC_NMake/generate-msvc.mak     |  28 ++--
 MSVC_NMake/install.mak           |  12 +-
 6 files changed, 202 insertions(+), 202 deletions(-)
---
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
index e42024b8..d52d284f 100644
--- a/MSVC_NMake/build-rules-msvc.mak
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -13,34 +13,34 @@
 #      $(CC)|$(CXX) $(cflags) /Fo$(destdir) /c @<<
 # $<
 # <<
-{..\glib\glibmm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\glibmm\}.obj::
-       $(CXX) $(LIBGLIBMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\glibmm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\glibmm\ /c @<<
+{..\glib\glibmm\}.cc{vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm\}.obj::
+       $(CXX) $(LIBGLIBMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(PDBVER)\$(CFG)\$(PLAT)\glibmm\ 
/Fdvs$(PDBVER)\$(CFG)\$(PLAT)\glibmm\ /c @<<
 $<
 <<
 
-{..\gio\giomm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\giomm\}.obj::
-       $(CXX) $(LIBGIOMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\giomm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\giomm\ /c @<<
+{..\gio\giomm\}.cc{vs$(PDBVER)\$(CFG)\$(PLAT)\giomm\}.obj::
+       $(CXX) $(LIBGIOMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(PDBVER)\$(CFG)\$(PLAT)\giomm\ 
/Fdvs$(PDBVER)\$(CFG)\$(PLAT)\giomm\ /c @<<
 $<
 <<
 
-{..\tools\extra_defs_gen\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\}.obj::
-       @if not exist vs$(VSVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\ $(MAKE) /f Makefile.vc CFG=$(CFG) 
vs$(VSVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen
-       $(CXX) $(GLIBMM_BASE_CFLAGS) $(GLIBMM_EXTRA_INCLUDES) $(CFLAGS_NOGL) 
/Fovs$(VSVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\ /Fdvs$(VSVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\ /c @<<
+{..\tools\extra_defs_gen\}.cc{vs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\}.obj::
+       @if not exist vs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\ $(MAKE) /f Makefile.vc CFG=$(CFG) 
vs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen
+       $(CXX) $(GLIBMM_BASE_CFLAGS) $(GLIBMM_EXTRA_INCLUDES) $(CFLAGS_NOGL) 
/Fovs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\ /Fdvs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\ /c @<<
 $<
 <<
 
-{.\glibmm\}.rc{vs$(VSVER)\$(CFG)\$(PLAT)\glibmm\}.res:
+{.\glibmm\}.rc{vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm\}.res:
        rc /fo$@ $<
 
-{.\giomm\}.rc{vs$(VSVER)\$(CFG)\$(PLAT)\giomm\}.res:
+{.\giomm\}.rc{vs$(PDBVER)\$(CFG)\$(PLAT)\giomm\}.res:
        rc /fo$@ $<
 
-vs$(VSVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\generate_extra_defs.obj:  
..\tools\extra_defs_gen\generate_extra_defs.cc  ..\tools\extra_defs_gen\generate_extra_defs.h
+vs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\generate_extra_defs.obj:  
..\tools\extra_defs_gen\generate_extra_defs.cc  ..\tools\extra_defs_gen\generate_extra_defs.h
 # Rules for building .lib files
 $(GLIBMM_LIB): $(GLIBMM_DLL)
 $(GIOMM_LIB): $(GIOMM_DLL)
 
-$(GLIBMM_EXTRA_DEFS_GEN_LIB): vs$(VSVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\generate_extra_defs.obj
+$(GLIBMM_EXTRA_DEFS_GEN_LIB): vs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\generate_extra_defs.obj
        lib $(ARFLAGS_NOLTCG) /out:$@ $**
 
 
@@ -51,14 +51,14 @@ $(GLIBMM_EXTRA_DEFS_GEN_LIB): vs$(VSVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\gene
 # $(dependent_objects)
 # <<
 #      @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
-$(GLIBMM_DLL): vs$(VSVER)\$(CFG)\$(PLAT)\glibmm\glibmm.def $(glibmm_OBJS)
-       link /DLL $(LDFLAGS_NOLTCG) $(GOBJECT_LIBS) $(LIBSIGC_LIB) /implib:$(GLIBMM_LIB) 
/def:vs$(VSVER)\$(CFG)\$(PLAT)\glibmm\glibmm.def -out:$@ @<<
+$(GLIBMM_DLL): vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm\glibmm.def $(glibmm_OBJS)
+       link /DLL $(LDFLAGS_NOLTCG) $(GOBJECT_LIBS) $(LIBSIGC_LIB) /implib:$(GLIBMM_LIB) 
/def:vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm\glibmm.def -out:$@ @<<
 $(glibmm_OBJS)
 <<
 
        @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
-$(GIOMM_DLL): $(GLIBMM_LIB) vs$(VSVER)\$(CFG)\$(PLAT)\giomm\giomm.def $(giomm_OBJS)
-       link /DLL $(LDFLAGS_NOLTCG) $(GLIBMM_LIB) $(GIO_LIBS) $(LIBSIGC_LIB) /implib:$(GIOMM_LIB) 
/def:vs$(VSVER)\$(CFG)\$(PLAT)\giomm\giomm.def -out:$@ @<<
+$(GIOMM_DLL): $(GLIBMM_LIB) vs$(PDBVER)\$(CFG)\$(PLAT)\giomm\giomm.def $(giomm_OBJS)
+       link /DLL $(LDFLAGS_NOLTCG) $(GLIBMM_LIB) $(GIO_LIBS) $(LIBSIGC_LIB) /implib:$(GIOMM_LIB) 
/def:vs$(PDBVER)\$(CFG)\$(PLAT)\giomm\giomm.def -out:$@ @<<
 $(giomm_OBJS)
 <<
        @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
@@ -72,166 +72,166 @@ $(giomm_OBJS)
 #      @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
 
 # For the gendef tool
-{.\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
+{.\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
        $(CXX) $(GLIBMM_BASE_CFLAGS) $(CFLAGS) /Fo$(@D)\gendef\ /Fd$(@D)\gendef\ $< /link $(LDFLAGS) /out:$@
 
 # For the buildable glibmm examples
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-compose.exe: ..\examples\compose\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-dispatcher2.exe: ..\examples\thread\dispatcher2.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-keyfile.exe: ..\examples\keyfile\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-markup.exe: ..\examples\markup\parser.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-options.exe: ..\examples\options\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-properties.exe: ..\examples\properties\properties_example.cc 
$(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-regex.exe: ..\examples\regex\main.cc $(GLIBMM_LIB)
-
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-compose.exe        \
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-dispatcher2.exe    \
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-keyfile.exe        \
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-markup.exe \
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-options.exe        \
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-properties.exe     \
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex-regex.exe:
-       @if not exist vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex $(MAKE) -f Makefile.vc CFG=$(CFG) 
vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-compose.exe: ..\examples\compose\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-dispatcher2.exe: ..\examples\thread\dispatcher2.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-keyfile.exe: ..\examples\keyfile\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-markup.exe: ..\examples\markup\parser.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-options.exe: ..\examples\options\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-properties.exe: ..\examples\properties\properties_example.cc 
$(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-regex.exe: ..\examples\regex\main.cc $(GLIBMM_LIB)
+
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-compose.exe       \
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-dispatcher2.exe   \
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-keyfile.exe       \
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-markup.exe        \
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-options.exe       \
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-properties.exe    \
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex-regex.exe:
+       @if not exist vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex $(MAKE) -f Makefile.vc CFG=$(CFG) 
vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex
        $(CXX) $(GLIBMM_EX_CFLAGS) $(CFLAGS) /Fo$(@D)\glibmm-ex\ /Fd$(@D)\glibmm-ex\ $** /link $(LDFLAGS) 
$(GLIBMM_EX_LIBS) /out:$@
 
 # For the buildable giomm examples
 
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-dbus-client_bus_listnames.exe: ..\examples\dbus\client_bus_listnames.cc 
$(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-dbus-session_bus_service.exe: ..\examples\dbus\session_bus_service.cc 
$(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-dbus-server_without_bus.exe: ..\examples\dbus\server_without_bus.cc 
$(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-network-resolver.exe: ..\examples\network\resolver.cc $(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-network-socket-client.exe: ..\examples\network\socket-client.cc 
$(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-network-socket-server.exe: ..\examples\network\socket-server.cc 
$(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-settings.exe: ..\examples\settings\settings.cc $(GIOMM_LIB)
-
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-dbus-client_bus_listnames.exe       \
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-dbus-session_bus_service.exe        \
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-dbus-server_without_bus.exe \
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-network-resolver.exe        \
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-network-socket-client.exe   \
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-network-socket-server.exe   \
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-settings.exe:
-       @if not exist vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex $(MAKE) -f Makefile.vc CFG=$(CFG) 
vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex
-       @if "$@" == "vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex-settings.exe" $(MAKE) -f Makefile.vc CFG=$(CFG) 
vs$(VSVER)\$(CFG)\$(PLAT)\gschema.compiled
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-dbus-client_bus_listnames.exe: ..\examples\dbus\client_bus_listnames.cc 
$(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-dbus-session_bus_service.exe: ..\examples\dbus\session_bus_service.cc 
$(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-dbus-server_without_bus.exe: ..\examples\dbus\server_without_bus.cc 
$(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-network-resolver.exe: ..\examples\network\resolver.cc $(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-network-socket-client.exe: ..\examples\network\socket-client.cc 
$(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-network-socket-server.exe: ..\examples\network\socket-server.cc 
$(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-settings.exe: ..\examples\settings\settings.cc $(GIOMM_LIB)
+
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-dbus-client_bus_listnames.exe      \
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-dbus-session_bus_service.exe       \
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-dbus-server_without_bus.exe        \
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-network-resolver.exe       \
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-network-socket-client.exe  \
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-network-socket-server.exe  \
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-settings.exe:
+       @if not exist vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex $(MAKE) -f Makefile.vc CFG=$(CFG) 
vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex
+       @if "$@" == "vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex-settings.exe" $(MAKE) -f Makefile.vc CFG=$(CFG) 
vs$(PDBVER)\$(CFG)\$(PLAT)\gschema.compiled
        $(CXX) $(GIOMM_EX_CFLAGS) $(CFLAGS) /Fo$(@D)\giomm-ex\ /Fd$(@D)\giomm-ex\ $** /link $(LDFLAGS) 
$(GIOMM_EX_LIBS) /out:$@
 
 # For building the glibmm tests
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_base64.exe: ..\tests\glibmm_base64\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_binding.exe: ..\tests\glibmm_binding\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_bool_arrayhandle.exe: ..\tests\glibmm_bool_arrayhandle\main.cc 
$(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_bool_vector.exe: ..\tests\glibmm_bool_vector\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_btree.exe: ..\tests\glibmm_btree\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_buildfilename.exe: ..\tests\glibmm_buildfilename\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_bytearray.exe: ..\tests\glibmm_bytearray\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_date.exe: ..\tests\glibmm_date\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_mainloop.exe: ..\tests\glibmm_mainloop\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_nodetree.exe: ..\tests\glibmm_nodetree\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_object.exe: ..\tests\glibmm_object\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_objectbase.exe: ..\tests\glibmm_objectbase\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_objectbase_move.exe: ..\tests\glibmm_objectbase_move\main.cc 
$(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_object_move.exe: ..\tests\glibmm_object_move\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_refptr.exe: ..\tests\glibmm_refptr\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_refptr_sigc_bind.exe: ..\tests\glibmm_refptr_sigc_bind\main.cc 
$(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_compose.exe: ..\tests\glibmm_ustring_compose\main.cc 
$(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_format.exe: ..\tests\glibmm_ustring_format\main.cc 
$(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_make_valid.exe: ..\tests\glibmm_ustring_make_valid\main.cc 
$(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_sprintf.exe: ..\tests\glibmm_ustring_sprintf\main.cc 
$(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_value.exe: ..\tests\glibmm_value\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_valuearray.exe: ..\tests\glibmm_valuearray\main.cc $(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_variant.exe: ..\tests\glibmm_variant\main.cc $(GLIBMM_LIB)
-
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_base64.exe       \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_binding.exe      \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_bool_arrayhandle.exe     \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_bool_vector.exe  \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_btree.exe        \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_buildfilename.exe        \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_bytearray.exe    \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_date.exe \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_interface_move.exe       \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_mainloop.exe     \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_nodetree.exe     \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_object.exe       \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_objectbase.exe   \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_objectbase_move.exe      \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_object_move.exe  \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_refptr.exe       \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_refptr_sigc_bind.exe     \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_compose.exe      \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_format.exe       \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_make_valid.exe   \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_sprintf.exe      \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_value.exe        \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_valuearray.exe   \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_variant.exe:
-       @if not exist vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-tests $(MAKE) -f Makefile.vc CFG=$(CFG) 
vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-tests
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_base64.exe: ..\tests\glibmm_base64\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_binding.exe: ..\tests\glibmm_binding\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_bool_arrayhandle.exe: ..\tests\glibmm_bool_arrayhandle\main.cc 
$(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_bool_vector.exe: ..\tests\glibmm_bool_vector\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_btree.exe: ..\tests\glibmm_btree\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_buildfilename.exe: ..\tests\glibmm_buildfilename\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_bytearray.exe: ..\tests\glibmm_bytearray\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_date.exe: ..\tests\glibmm_date\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_mainloop.exe: ..\tests\glibmm_mainloop\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_nodetree.exe: ..\tests\glibmm_nodetree\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_object.exe: ..\tests\glibmm_object\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_objectbase.exe: ..\tests\glibmm_objectbase\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_objectbase_move.exe: ..\tests\glibmm_objectbase_move\main.cc 
$(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_object_move.exe: ..\tests\glibmm_object_move\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_refptr.exe: ..\tests\glibmm_refptr\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_refptr_sigc_bind.exe: ..\tests\glibmm_refptr_sigc_bind\main.cc 
$(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_compose.exe: ..\tests\glibmm_ustring_compose\main.cc 
$(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_format.exe: ..\tests\glibmm_ustring_format\main.cc 
$(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_make_valid.exe: ..\tests\glibmm_ustring_make_valid\main.cc 
$(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_sprintf.exe: ..\tests\glibmm_ustring_sprintf\main.cc 
$(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_value.exe: ..\tests\glibmm_value\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_valuearray.exe: ..\tests\glibmm_valuearray\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_variant.exe: ..\tests\glibmm_variant\main.cc $(GLIBMM_LIB)
+
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_base64.exe      \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_binding.exe     \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_bool_arrayhandle.exe    \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_bool_vector.exe \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_btree.exe       \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_buildfilename.exe       \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_bytearray.exe   \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_date.exe        \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_interface_move.exe      \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_mainloop.exe    \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_nodetree.exe    \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_object.exe      \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_objectbase.exe  \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_objectbase_move.exe     \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_object_move.exe \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_refptr.exe      \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_refptr_sigc_bind.exe    \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_compose.exe     \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_format.exe      \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_make_valid.exe  \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_ustring_sprintf.exe     \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_value.exe       \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_valuearray.exe  \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_variant.exe:
+       @if not exist vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-tests $(MAKE) -f Makefile.vc CFG=$(CFG) 
vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-tests
        $(CXX) $(GLIBMM_EX_CFLAGS) $(CFLAGS) /Fo$(@D)\glibmm-tests\ /Fd$(@D)\glibmm-tests\ $** /link 
$(LDFLAGS) $(GLIBMM_EX_LIBS) /out:$@
 
 # For giomm tests
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_asyncresult_sourceobject.exe: 
..\tests\giomm_asyncresult_sourceobject\main.cc $(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_ioerror.exe: ..\tests\giomm_ioerror\main.cc $(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_ioerror_and_iodbuserror.exe: 
..\tests\giomm_ioerror_and_iodbuserror\main.cc $(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_listmodel.exe: ..\tests\giomm_listmodel\main.cc $(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_memoryinputstream.exe: ..\tests\giomm_memoryinputstream\main.cc 
$(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_simple.exe: ..\tests\giomm_simple\main.cc $(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_stream_vfuncs.exe: ..\tests\giomm_stream_vfuncs\main.cc $(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_tls_client.exe: ..\tests\giomm_tls_client\main.cc $(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_interface_implementation.exe: 
..\tests\glibmm_interface_implementation\main.cc $(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_null_containerhandle.exe: ..\tests\glibmm_null_containerhandle\main.cc 
$(GLIBMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_null_vectorutils.exe: ..\tests\glibmm_null_vectorutils\main.cc 
$(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_vector.exe: ..\tests\glibmm_vector\main.cc $(GIOMM_LIB)
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_weakref.exe: ..\tests\glibmm_weakref\main.cc $(GLIBMM_LIB)
-
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_asyncresult_sourceobject.exe      \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_ioerror.exe       \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_ioerror_and_iodbuserror.exe       \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_listmodel.exe     \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_memoryinputstream.exe     \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_simple.exe        \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_stream_vfuncs.exe \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-giomm_tls_client.exe    \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_interface_implementation.exe     \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_null_containerhandle.exe \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_null_vectorutils.exe     \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_vector.exe       \
-vs$(VSVER)\$(CFG)\$(PLAT)\test-glibmm_weakref.exe:
-       @if not exist vs$(VSVER)\$(CFG)\$(PLAT)\giomm-tests $(MAKE) -f Makefile.vc CFG=$(CFG) 
vs$(VSVER)\$(CFG)\$(PLAT)\giomm-tests
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_asyncresult_sourceobject.exe: 
..\tests\giomm_asyncresult_sourceobject\main.cc $(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_ioerror.exe: ..\tests\giomm_ioerror\main.cc $(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_ioerror_and_iodbuserror.exe: 
..\tests\giomm_ioerror_and_iodbuserror\main.cc $(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_listmodel.exe: ..\tests\giomm_listmodel\main.cc $(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_memoryinputstream.exe: ..\tests\giomm_memoryinputstream\main.cc 
$(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_simple.exe: ..\tests\giomm_simple\main.cc $(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_stream_vfuncs.exe: ..\tests\giomm_stream_vfuncs\main.cc $(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_tls_client.exe: ..\tests\giomm_tls_client\main.cc $(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_interface_implementation.exe: 
..\tests\glibmm_interface_implementation\main.cc $(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_null_containerhandle.exe: 
..\tests\glibmm_null_containerhandle\main.cc $(GLIBMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_null_vectorutils.exe: ..\tests\glibmm_null_vectorutils\main.cc 
$(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_vector.exe: ..\tests\glibmm_vector\main.cc $(GIOMM_LIB)
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_weakref.exe: ..\tests\glibmm_weakref\main.cc $(GLIBMM_LIB)
+
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_asyncresult_sourceobject.exe     \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_ioerror.exe      \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_ioerror_and_iodbuserror.exe      \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_listmodel.exe    \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_memoryinputstream.exe    \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_simple.exe       \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_stream_vfuncs.exe        \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-giomm_tls_client.exe   \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_interface_implementation.exe    \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_null_containerhandle.exe        \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_null_vectorutils.exe    \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_vector.exe      \
+vs$(PDBVER)\$(CFG)\$(PLAT)\test-glibmm_weakref.exe:
+       @if not exist vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-tests $(MAKE) -f Makefile.vc CFG=$(CFG) 
vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-tests
        $(CXX) $(GIOMM_EX_CFLAGS) $(CFLAGS) /Fo$(@D)\giomm-tests\ /Fd$(@D)\giomm-tests\ $** /link $(LDFLAGS) 
$(GIOMM_EX_LIBS) /out:$@
 
 clean:
-       @-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)\gschemas.compiled
-       @-del vs$(VSVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\*.pdb
-       @-del vs$(VSVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\*.obj
-       @-if exist vs$(VSVER)\$(CFG)\$(PLAT)\giomm-tests del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\giomm-tests\*.obj
-       @-if exist vs$(VSVER)\$(CFG)\$(PLAT)\giomm-tests del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\giomm-tests\*.pdb
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex\*.obj
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex\*.pdb
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\giomm\*.def
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\giomm\*.res
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\giomm\*.obj
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\giomm\*.pdb
-       @-if exist vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-tests del /f /q 
vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-tests\*.obj
-       @-if exist vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-tests del /f /q 
vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-tests\*.pdb
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex\*.obj
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex\*.pdb
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\glibmm\*.def
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\glibmm\*.res
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\glibmm\*.obj
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\glibmm\*.pdb
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gendef\*.obj
-       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gendef\*.pdb
-       @-if exist vs$(VSVER)\$(CFG)\$(PLAT)\giomm-tests rd vs$(VSVER)\$(CFG)\$(PLAT)\giomm-tests
-       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen
-       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex
-       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\giomm
-       @-if exist vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-tests rd vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-tests
-       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex
-       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\glibmm
-       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\gendef
+       @-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)\gschemas.compiled
+       @-del vs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\*.pdb
+       @-del vs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen\*.obj
+       @-if exist vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-tests del /f /q 
vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-tests\*.obj
+       @-if exist vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-tests del /f /q 
vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-tests\*.pdb
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex\*.obj
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex\*.pdb
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\giomm\*.def
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\giomm\*.res
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\giomm\*.obj
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\giomm\*.pdb
+       @-if exist vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-tests del /f /q 
vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-tests\*.obj
+       @-if exist vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-tests del /f /q 
vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-tests\*.pdb
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex\*.obj
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex\*.pdb
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm\*.def
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm\*.res
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm\*.obj
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm\*.pdb
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\gendef\*.obj
+       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\gendef\*.pdb
+       @-if exist vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-tests rd vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-tests
+       @-rd vs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen
+       @-rd vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex
+       @-rd vs$(PDBVER)\$(CFG)\$(PLAT)\giomm
+       @-if exist vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-tests rd vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-tests
+       @-rd vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex
+       @-rd vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm
+       @-rd vs$(PDBVER)\$(CFG)\$(PLAT)\gendef
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 3210daf1..b876d386 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -54,16 +54,16 @@ LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
 
 GLIBMM_LIBNAME = glibmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
 
-GLIBMM_DLL = vs$(VSVER)\$(CFG)\$(PLAT)\$(GLIBMM_LIBNAME).dll
-GLIBMM_LIB = vs$(VSVER)\$(CFG)\$(PLAT)\$(GLIBMM_LIBNAME).lib
-GLIBMM_EXTRA_DEFS_GEN_LIB = vs$(VSVER)\$(CFG)\$(PLAT)\glibmm_generate_extra_defs-2.4.lib
+GLIBMM_DLL = vs$(PDBVER)\$(CFG)\$(PLAT)\$(GLIBMM_LIBNAME).dll
+GLIBMM_LIB = vs$(PDBVER)\$(CFG)\$(PLAT)\$(GLIBMM_LIBNAME).lib
+GLIBMM_EXTRA_DEFS_GEN_LIB = vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm_generate_extra_defs-2.4.lib
 
 GIOMM_LIBNAME = giomm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
 
-GIOMM_DLL = vs$(VSVER)\$(CFG)\$(PLAT)\$(GIOMM_LIBNAME).dll
-GIOMM_LIB = vs$(VSVER)\$(CFG)\$(PLAT)\$(GIOMM_LIBNAME).lib
+GIOMM_DLL = vs$(PDBVER)\$(CFG)\$(PLAT)\$(GIOMM_LIBNAME).dll
+GIOMM_LIB = vs$(PDBVER)\$(CFG)\$(PLAT)\$(GIOMM_LIBNAME).lib
 
-GENDEF = vs$(VSVER)\$(CFG)\$(PLAT)\gendef.exe
+GENDEF = vs$(PDBVER)\$(CFG)\$(PLAT)\gendef.exe
 GOBJECT_LIBS = gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib
 GIO_LIBS = gio-2.0.lib $(GOBJECT_LIBS)
 
diff --git a/MSVC_NMake/create-lists-msvc.mak b/MSVC_NMake/create-lists-msvc.mak
index d2f6d7b5..2ade91ad 100644
--- a/MSVC_NMake/create-lists-msvc.mak
+++ b/MSVC_NMake/create-lists-msvc.mak
@@ -46,13 +46,13 @@ glibmm_files_extra_ph_int = $(glibmm_files_extra_ph:/=\)
 !if [call create-lists.bat header glibmm.mak glibmm_OBJS]
 !endif
 
-!if [for %c in ($(glibmm_files_built_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file glibmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\glibmm\%~nc.obj]
+!if [for %c in ($(glibmm_files_built_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file glibmm.mak 
vs^$(PDBVER)\^$(CFG)\^$(PLAT)\glibmm\%~nc.obj]
 !endif
 
-!if [for %c in ($(glibmm_files_extra_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file glibmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\glibmm\%~nc.obj]
+!if [for %c in ($(glibmm_files_extra_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file glibmm.mak 
vs^$(PDBVER)\^$(CFG)\^$(PLAT)\glibmm\%~nc.obj]
 !endif
 
-!if [@call create-lists.bat file glibmm.mak vs^$(VSVER)\^$(CFG)\^$(PLAT)\glibmm\glibmm.res]
+!if [@call create-lists.bat file glibmm.mak vs^$(PDBVER)\^$(CFG)\^$(PLAT)\glibmm\glibmm.res]
 !endif
 
 !if [call create-lists.bat footer glibmm.mak]
@@ -63,13 +63,13 @@ glibmm_files_extra_ph_int = $(glibmm_files_extra_ph:/=\)
 !if [call create-lists.bat header glibmm.mak giomm_OBJS]
 !endif
 
-!if [for %c in ($(giomm_generated_sources)) do @if "%~xc" == ".cc" @call create-lists.bat file glibmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\giomm\%~nc.obj]
+!if [for %c in ($(giomm_generated_sources)) do @if "%~xc" == ".cc" @call create-lists.bat file glibmm.mak 
vs^$(PDBVER)\^$(CFG)\^$(PLAT)\giomm\%~nc.obj]
 !endif
 
-!if [for %c in ($(giomm_files_extra_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file glibmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\giomm\%~nc.obj]
+!if [for %c in ($(giomm_files_extra_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file glibmm.mak 
vs^$(PDBVER)\^$(CFG)\^$(PLAT)\giomm\%~nc.obj]
 !endif
 
-!if [@call create-lists.bat file glibmm.mak vs^$(VSVER)\^$(CFG)\^$(PLAT)\giomm\giomm.res]
+!if [@call create-lists.bat file glibmm.mak vs^$(PDBVER)\^$(CFG)\^$(PLAT)\giomm\giomm.res]
 !endif
 
 !if [call create-lists.bat footer glibmm.mak]
@@ -81,7 +81,7 @@ glibmm_files_extra_ph_int = $(glibmm_files_extra_ph:/=\)
 # We skip building the following examples:
 # child_watch, iochannel_stream: Builds on *NIX only
 # thread\dispatcher.cc: Not C++-17 compliant
-!if [for %e in (compose dispatcher2 keyfile markup options properties regex) do @call create-lists.bat file 
glibmm.mak vs^$(VSVER)\^$(CFG)\^$(PLAT)\glibmm-ex-%e.exe]
+!if [for %e in (compose dispatcher2 keyfile markup options properties regex) do @call create-lists.bat file 
glibmm.mak vs^$(PDBVER)\^$(CFG)\^$(PLAT)\glibmm-ex-%e.exe]
 !endif
 
 !if [call create-lists.bat footer glibmm.mak]
@@ -90,13 +90,13 @@ glibmm_files_extra_ph_int = $(glibmm_files_extra_ph:/=\)
 !if [call create-lists.bat header glibmm.mak giomm_ex]
 !endif
 
-!if [for %e in (resolver socket-client socket-server) do @call create-lists.bat file glibmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\giomm-ex-network-%e.exe]
+!if [for %e in (resolver socket-client socket-server) do @call create-lists.bat file glibmm.mak 
vs^$(PDBVER)\^$(CFG)\^$(PLAT)\giomm-ex-network-%e.exe]
 !endif
 
-!if [for %e in (settings) do @call create-lists.bat file glibmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\giomm-ex-%e.exe]
+!if [for %e in (settings) do @call create-lists.bat file glibmm.mak 
vs^$(PDBVER)\^$(CFG)\^$(PLAT)\giomm-ex-%e.exe]
 !endif
 
-!if [for %e in (client_bus_listnames session_bus_service server_without_bus) do @call create-lists.bat file 
glibmm.mak vs^$(VSVER)\^$(CFG)\^$(PLAT)\giomm-ex-dbus-%e.exe]
+!if [for %e in (client_bus_listnames session_bus_service server_without_bus) do @call create-lists.bat file 
glibmm.mak vs^$(PDBVER)\^$(CFG)\^$(PLAT)\giomm-ex-dbus-%e.exe]
 !endif
 
 !if [call create-lists.bat footer glibmm.mak]
@@ -108,7 +108,7 @@ glibmm_files_extra_ph_int = $(glibmm_files_extra_ph:/=\)
 # Skip the following:
 # glibmm_interface_implementation, glibmm_null_vectorutils, glibmm_vector: Are actually using giomm
 # glibmm_interface_move: Relies on g_autoptr_*()
-!if [for /f %d in ('dir /ad /b ..\tests\glibmm_*') do @if not "%d" == "glibmm_interface_implementation" if 
not "%d" == "glibmm_interface_move" if not "%d" == "glibmm_null_vectorutils" if not "%d" == "glibmm_vector" 
@call create-lists.bat file glibmm.mak vs^$(VSVER)\^$(CFG)\^$(PLAT)\test-%d.exe]
+!if [for /f %d in ('dir /ad /b ..\tests\glibmm_*') do @if not "%d" == "glibmm_interface_implementation" if 
not "%d" == "glibmm_interface_move" if not "%d" == "glibmm_null_vectorutils" if not "%d" == "glibmm_vector" 
@call create-lists.bat file glibmm.mak vs^$(PDBVER)\^$(CFG)\^$(PLAT)\test-%d.exe]
 !endif
 
 !if [call create-lists.bat footer glibmm.mak]
@@ -117,10 +117,10 @@ glibmm_files_extra_ph_int = $(glibmm_files_extra_ph:/=\)
 !if [call create-lists.bat header glibmm.mak giomm_tests]
 !endif
 
-!if [for /f %d in ('dir /ad /b ..\tests\giomm_*') do @call create-lists.bat file glibmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\test-%d.exe]
+!if [for /f %d in ('dir /ad /b ..\tests\giomm_*') do @call create-lists.bat file glibmm.mak 
vs^$(PDBVER)\^$(CFG)\^$(PLAT)\test-%d.exe]
 !endif
 
-!if [for %d in (interface_implementation null_vectorutils vector) do @call create-lists.bat file glibmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\test-glibmm_%d.exe]
+!if [for %d in (interface_implementation null_vectorutils vector) do @call create-lists.bat file glibmm.mak 
vs^$(PDBVER)\^$(CFG)\^$(PLAT)\test-glibmm_%d.exe]
 !endif
 
 !if [call create-lists.bat footer glibmm.mak]
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
index 754080ad..848887e1 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/generate-msvc.mak b/MSVC_NMake/generate-msvc.mak
index 221ba87f..1ca9a7ab 100644
--- a/MSVC_NMake/generate-msvc.mak
+++ b/MSVC_NMake/generate-msvc.mak
@@ -4,23 +4,23 @@
 # one is maintaining the NMake build files.
 
 # Create the build directories
-vs$(VSVER)\$(CFG)\$(PLAT)\gendef       \
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm       \
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm        \
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-ex    \
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-ex     \
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm-tests \
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm-tests  \
-vs$(VSVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen:
+vs$(PDBVER)\$(CFG)\$(PLAT)\gendef      \
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm      \
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm       \
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-ex   \
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-ex    \
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm-tests        \
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm-tests \
+vs$(PDBVER)\$(CFG)\$(PLAT)\glib-extra-defs-gen:
        @-mkdir $@
 
 # Generate .def files
-vs$(VSVER)\$(CFG)\$(PLAT)\glibmm\glibmm.def: $(GENDEF) vs$(VSVER)\$(CFG)\$(PLAT)\glibmm $(glibmm_OBJS)
-       vs$(VSVER)\$(CFG)\$(PLAT)\gendef.exe $@ $(GLIBMM_LIBNAME) vs$(VSVER)\$(CFG)\$(PLAT)\glibmm\*.obj
+vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm\glibmm.def: $(GENDEF) vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm $(glibmm_OBJS)
+       vs$(PDBVER)\$(CFG)\$(PLAT)\gendef.exe $@ $(GLIBMM_LIBNAME) vs$(PDBVER)\$(CFG)\$(PLAT)\glibmm\*.obj
 
-vs$(VSVER)\$(CFG)\$(PLAT)\giomm\giomm.def: $(GENDEF) vs$(VSVER)\$(CFG)\$(PLAT)\giomm $(giomm_OBJS)
-       vs$(VSVER)\$(CFG)\$(PLAT)\gendef.exe $@ $(GIOMM_LIBNAME) vs$(VSVER)\$(CFG)\$(PLAT)\giomm\*.obj
+vs$(PDBVER)\$(CFG)\$(PLAT)\giomm\giomm.def: $(GENDEF) vs$(PDBVER)\$(CFG)\$(PLAT)\giomm $(giomm_OBJS)
+       vs$(PDBVER)\$(CFG)\$(PLAT)\gendef.exe $@ $(GIOMM_LIBNAME) vs$(PDBVER)\$(CFG)\$(PLAT)\giomm\*.obj
 
 # Compile schema for giomm settings example
-vs$(VSVER)\$(CFG)\$(PLAT)\gschema.compiled: ..\examples\settings\org.gtkmm.demo.gschema.xml
-       $(GLIB_COMPILE_SCHEMAS) --targetdir=vs$(VSVER)\$(CFG)\$(PLAT) ..\examples\settings
\ No newline at end of file
+vs$(PDBVER)\$(CFG)\$(PLAT)\gschema.compiled: ..\examples\settings\org.gtkmm.demo.gschema.xml
+       $(GLIB_COMPILE_SCHEMAS) --targetdir=vs$(PDBVER)\$(CFG)\$(PLAT) ..\examples\settings
\ No newline at end of file
diff --git a/MSVC_NMake/install.mak b/MSVC_NMake/install.mak
index 9158a61e..227ee8eb 100644
--- a/MSVC_NMake/install.mak
+++ b/MSVC_NMake/install.mak
@@ -8,12 +8,12 @@ install: all
        @if not exist 
$(PREFIX)\include\glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)\glibmm_generate_extra_defs\ @mkdir 
$(PREFIX)\include\glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)\glibmm_generate_extra_defs
        @if not exist $(PREFIX)\lib\giomm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)\include\ mkdir 
$(PREFIX)\lib\giomm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)\include
        @if not exist $(PREFIX)\include\giomm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)\giomm\private\ 
@mkdir $(PREFIX)\include\giomm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)\giomm\private
-       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(GLIBMM_LIBNAME).dll $(PREFIX)\bin
-       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(GLIBMM_LIBNAME).pdb $(PREFIX)\bin
-       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(GLIBMM_LIBNAME).lib $(PREFIX)\lib
-       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(GIOMM_LIBNAME).dll $(PREFIX)\bin
-       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(GIOMM_LIBNAME).pdb $(PREFIX)\bin
-       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(GIOMM_LIBNAME).lib $(PREFIX)\lib
+       @copy /b vs$(PDBVER)\$(CFG)\$(PLAT)\$(GLIBMM_LIBNAME).dll $(PREFIX)\bin
+       @copy /b vs$(PDBVER)\$(CFG)\$(PLAT)\$(GLIBMM_LIBNAME).pdb $(PREFIX)\bin
+       @copy /b vs$(PDBVER)\$(CFG)\$(PLAT)\$(GLIBMM_LIBNAME).lib $(PREFIX)\lib
+       @copy /b vs$(PDBVER)\$(CFG)\$(PLAT)\$(GIOMM_LIBNAME).dll $(PREFIX)\bin
+       @copy /b vs$(PDBVER)\$(CFG)\$(PLAT)\$(GIOMM_LIBNAME).pdb $(PREFIX)\bin
+       @copy /b vs$(PDBVER)\$(CFG)\$(PLAT)\$(GIOMM_LIBNAME).lib $(PREFIX)\lib
        @copy /b $(GLIBMM_EXTRA_DEFS_GEN_LIB) $(PREFIX)\lib
        @copy ..\glib\glibmm.h "$(PREFIX)\include\glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)\"
        @copy ..\gio\giomm.h "$(PREFIX)\include\giomm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)\"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]