GNOME.org
 

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

commit 6994ec0d2e45754c59a47e5129a5bc3c56c33a28
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Jun 12 22:27:17 2020 +0800

    NMake Makefiles: Distinguish between MSVC 2015, 2017 and 2019
    
    It was found that we cannot completely rely on the fact that Visual
    Studio 2015~2019 tried very hard to be binary compatible, as there
    could be corner cases when linking against atkmm 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 atkmm (and glibmm) 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  | 58 ++++++++++++++++++++--------------------
 MSVC_NMake/config-msvc.mak       | 18 ++++++-------
 MSVC_NMake/create-lists-msvc.mak | 14 +++++-----
 MSVC_NMake/detectenv-msvc.mak    | 41 +++++++++++++++++-----------
 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 5128d9f..c4366e4 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)\atkmm\}.cc{vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\}.obj::
-       $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\ 
/Fdvs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\ /c @<<
+{vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\}.obj::
+       $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\atkmm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\atkmm\ /c @<<
 $<
 <<
 
-{..\untracked\atk\atkmm\}.cc{vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\}.obj::
-       $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\ 
/Fdvs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\ /c @<<
+{..\untracked\atk\atkmm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\}.obj::
+       $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\atkmm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\atkmm\ /c @<<
 $<
 <<
 
-{..\atk\atkmm\}.cc{vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\}.obj::
-       $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\ 
/Fdvs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\ /c @<<
+{..\atk\atkmm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\}.obj::
+       $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\atkmm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\atkmm\ /c @<<
 $<
 <<
 
-{..\atk\src\}.ccg{vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\}.obj:
+{..\atk\src\}.ccg{vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\}.obj:
        @if not exist $(@D)\private\ $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)\private
        @for %%s in ($(<D)\*.ccg) do @if not exist ..\atk\atkmm\%%~ns.cc if not exist $(@D)\%%~ns.cc $(PERL) 
-- $(GMMPROC_DIR)/gmmproc -I ../codegen/m4 --defs $(<D:\=/) %%~ns $(<D:\=/) $(@D)
        @if exist $(@D)\$(<B).cc $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c $(@D)\$(<B).cc
        @if exist ..\untracked\atk\atkmm\$(<B).cc $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ 
/c ..\untracked\atk\atkmm\$(<B).cc
        @if exist ..\atk\atkmm\$(<B).cc $(CXX) $(ATKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c 
..\atk\atkmm\$(<B).cc
 
-{.\atkmm\}.rc{vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\}.res:
+{.\atkmm\}.rc{vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\}.res:
        rc /fo$@ $<
 
 # Rules for building .lib files
@@ -63,28 +63,28 @@ $(atkmm_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
-       $(CXX) $(ATKMM_BASE_CFLAGS) $(CFLAGS) /Fovs$(PDBVER)\$(CFG)\$(PLAT)\gendef\ 
/Fdvs$(PDBVER)\$(CFG)\$(PLAT)\gendef\ $< /link $(LDFLAGS) /out:$@
+{.\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) $(ATKMM_BASE_CFLAGS) $(CFLAGS) /Fovs$(VSVER)\$(CFG)\$(PLAT)\gendef\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\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)\atkmm\*.def
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\*.pdb
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\*.res
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\*.obj
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\private\*.h
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\*.h
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\*.cc
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\gendef\*.pdb
-       @-del /f /q vs$(PDBVER)\$(CFG)\$(PLAT)\gendef\*.obj
-       @-rd vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\private
-       @-rd vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm
-       @-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)\atkmm\*.def
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\*.pdb
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\*.res
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\*.obj
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\private\*.h
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\*.h
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\*.cc
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gendef\*.pdb
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gendef\*.obj
+       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\private
+       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\atkmm
+       @-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 3d77a5e..c92461c 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -27,13 +27,13 @@ GMMPROC_DIR=$(PREFIX)\share\glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSIO
 !endif
 
 ATKMM_BASE_CFLAGS =                    \
-       /Ivs$(PDBVER)\$(CFG)\$(PLAT)    \
+       /Ivs$(VSVER)\$(CFG)\$(PLAT)     \
        /I..\untracked\atk              \
        /I..\atk /I.\atkmm              \
        /wd4530 /wd4251 /wd4275 /EHsc   \
        /FImsvc_recommended_pragmas.h
 
-!if $(PDBVER) > 12
+!if $(VSVER) > 12
 ATKMM_BASE_CFLAGS = $(ATKMM_BASE_CFLAGS) /utf-8
 !endif
 
@@ -48,8 +48,8 @@ ATKMM_EXTRA_INCLUDES =        \
 
 ATKMM_CFLAGS = /DATKMM_BUILD $(ATKMM_BASE_CFLAGS) $(ATKMM_EXTRA_INCLUDES)
 
-# We build atkmm-vc$(PDBVER)0-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION).dll or
-#          atkmm-vc$(PDBVER)0-d-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION).dll at least
+# We build atkmm-vc$(VSVER_LIB)-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION).dll or
+#          atkmm-vc$(VSVER_LIB)-d-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION).dll at least
 
 
 !ifdef USE_MESON_LIBS
@@ -59,7 +59,7 @@ LIBSIGC_DLL = $(LIBSIGC_LIBNAME)-0.dll
 GLIBMM_DLL = $(GLIBMM_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)
+GLIBMM_LIBNAME = glibmm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
 LIBSIGC_DLL = $(LIBSIGC_LIBNAME).dll
 GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
 !endif
@@ -67,12 +67,12 @@ GLIBMM_DLL = $(GLIBMM_LIBNAME).dll
 LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
 GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
 
-ATKMM_LIBNAME = atkmm-vc$(PDBVER)0$(DEBUG_SUFFIX)-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION)
+ATKMM_LIBNAME = atkmm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION)
 
-ATKMM_DLL = vs$(PDBVER)\$(CFG)\$(PLAT)\$(ATKMM_LIBNAME).dll
-ATKMM_LIB = vs$(PDBVER)\$(CFG)\$(PLAT)\$(ATKMM_LIBNAME).lib
+ATKMM_DLL = vs$(VSVER)\$(CFG)\$(PLAT)\$(ATKMM_LIBNAME).dll
+ATKMM_LIB = vs$(VSVER)\$(CFG)\$(PLAT)\$(ATKMM_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
 
 ATK_LIBS = atk-$(ATK_API_VERSION).lib $(GOBJECT_LIBS)
diff --git a/MSVC_NMake/create-lists-msvc.mak b/MSVC_NMake/create-lists-msvc.mak
index c97a74a..2b9fcdb 100644
--- a/MSVC_NMake/create-lists-msvc.mak
+++ b/MSVC_NMake/create-lists-msvc.mak
@@ -42,13 +42,13 @@ atkmm_files_extra_ph_int = $(atkmm_files_extra_ph:/=\)
 !if [call create-lists.bat header atkmm.mak atkmm_OBJS]
 !endif
 
-!if [for %c in ($(atkmm_files_built_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file atkmm.mak 
vs^$(PDBVER)\^$(CFG)\^$(PLAT)\atkmm\%~nc.obj]
+!if [for %c in ($(atkmm_files_built_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file atkmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\atkmm\%~nc.obj]
 !endif
 
-!if [for %c in ($(atkmm_files_extra_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file atkmm.mak 
vs^$(PDBVER)\^$(CFG)\^$(PLAT)\atkmm\%~nc.obj]
+!if [for %c in ($(atkmm_files_extra_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file atkmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\atkmm\%~nc.obj]
 !endif
 
-!if [@call create-lists.bat file atkmm.mak vs^$(PDBVER)\^$(CFG)\^$(PLAT)\atkmm\atkmm.res]
+!if [@call create-lists.bat file atkmm.mak vs^$(VSVER)\^$(CFG)\^$(PLAT)\atkmm\atkmm.res]
 !endif
 
 !if [call create-lists.bat footer atkmm.mak]
@@ -63,10 +63,10 @@ atkmm_files_extra_ph_int = $(atkmm_files_extra_ph:/=\)
 !if [call create-lists.bat footer atkmm.mak]
 !endif
 
-!if [for %f in (atkmm\action.h) do @if not exist ..\atk\%f if not exist ..\untracked\atk\%f if not exist 
vs$(PDBVER)\$(CFG)\$(PLAT)\%f (md vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\private) & ($(PERL) -- 
$(GMMPROC_DIR)/gmmproc -I ../tools/m4 --defs ../atk/src action ../atk/src vs$(PDBVER)/$(CFG)/$(PLAT)/atkmm)]
+!if [for %f in (atkmm\action.h) do @if not exist ..\atk\%f if not exist ..\untracked\atk\%f if not exist 
vs$(VSVER)\$(CFG)\$(PLAT)\%f (md vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\private) & ($(PERL) -- 
$(GMMPROC_DIR)/gmmproc -I ../tools/m4 --defs ../atk/src action ../atk/src vs$(VSVER)/$(CFG)/$(PLAT)/atkmm)]
 !endif
 
-!if [for %d in (vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm ..\atk\atkmm ..\untracked\atk\atkmm) do @if exist 
%d\action.h call get-gmmproc-ver %d\action.h>>atkmm.mak]
+!if [for %d in (vs$(VSVER)\$(CFG)\$(PLAT)\atkmm ..\atk\atkmm ..\untracked\atk\atkmm) do @if exist 
%d\action.h call get-gmmproc-ver %d\action.h>>atkmm.mak]
 !endif
 
 !include atkmm.mak
@@ -75,10 +75,10 @@ atkmm_files_extra_ph_int = $(atkmm_files_extra_ph:/=\)
 !endif
 
 !if "$(GMMPROC_VER)" >= "2.64.3"
-ATKMM_INT_TARGET = vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm
+ATKMM_INT_TARGET = vs$(VSVER)\$(CFG)\$(PLAT)\atkmm
 ATKMM_DEF_LDFLAG =
 !else
-ATKMM_INT_TARGET = vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\atkmm.def
+ATKMM_INT_TARGET = vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\atkmm.def
 ATKMM_DEF_LDFLAG = /def:$(ATKMM_INT_TARGET)
 ATKMM_BASE_CFLAGS = $(ATKMM_BASE_CFLAGS) /DATKMM_USE_GENDEF
 !endif
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
index 9a92c11..38bc704 100644
--- a/MSVC_NMake/detectenv-msvc.mak
+++ b/MSVC_NMake/detectenv-msvc.mak
@@ -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 a0b5aac..804ea43 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)\atkmm       \
-vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\private:
+vs$(VSVER)\$(CFG)\$(PLAT)\gendef       \
+vs$(VSVER)\$(CFG)\$(PLAT)\atkmm        \
+vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\private:
        @-md $@
 
 # Generate .def files
-vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\atkmm.def: $(GENDEF) vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm $(atkmm_OBJS)
-       vs$(PDBVER)\$(CFG)\$(PLAT)\gendef.exe $@ $(ATKMM_LIBNAME) vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\*.obj
+vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\atkmm.def: $(GENDEF) vs$(VSVER)\$(CFG)\$(PLAT)\atkmm $(atkmm_OBJS)
+       vs$(VSVER)\$(CFG)\$(PLAT)\gendef.exe $@ $(ATKMM_LIBNAME) vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\*.obj
 
 # Generate wrap_init.cc files
-vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\wrap_init.cc: $(atkmm_real_hg)
+vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\wrap_init.cc: $(atkmm_real_hg)
        @if not exist ..\atk\atkmm\wrap_init.cc $(PERL) -- "$(GMMPROC_DIR)/generate_wrap_init.pl" 
--namespace=Atk --parent_dir=atkmm $(atkmm_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 3847c4a..d3ebe44 100644
--- a/MSVC_NMake/install.mak
+++ b/MSVC_NMake/install.mak
@@ -6,14 +6,14 @@ install: all
        @if not exist $(PREFIX)\lib\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\include\ md 
$(PREFIX)\lib\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\include
        @if not exist $(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\private\ 
@md $(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\private
        @if not exist $(PREFIX)\share\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\proc\m4\ md 
$(PREFIX)\share\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\proc\m4
-       @copy /b vs$(PDBVER)\$(CFG)\$(PLAT)\$(ATKMM_LIBNAME).dll $(PREFIX)\bin
-       @copy /b vs$(PDBVER)\$(CFG)\$(PLAT)\$(ATKMM_LIBNAME).pdb $(PREFIX)\bin
-       @copy /b vs$(PDBVER)\$(CFG)\$(PLAT)\$(ATKMM_LIBNAME).lib $(PREFIX)\lib
+       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(ATKMM_LIBNAME).dll $(PREFIX)\bin
+       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(ATKMM_LIBNAME).pdb $(PREFIX)\bin
+       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(ATKMM_LIBNAME).lib $(PREFIX)\lib
        @copy ..\atk\atkmm.h "$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\"
        @for %h in ($(atkmm_files_extra_h)) do @copy ..\atk\atkmm\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\%h"
        @for %h in ($(atkmm_files_built_h)) do @if exist ..\atk\atkmm\%h copy ..\atk\atkmm\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\%h"
-       @for %h in ($(atkmm_files_built_h)) do @if exist vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\%h copy 
vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\%h"
+       @for %h in ($(atkmm_files_built_h)) do @if exist vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\%h copy 
vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\%h"
        @for %h in ($(ATKMM_BUILD_PRIVATE_HEADERS)) do @if exist ..\atk\atkmm\private\%h copy 
..\atk\atkmm\private\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\private\%h"
-       @for %h in ($(ATKMM_BUILD_PRIVATE_HEADERS)) do @if exist vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\private\%h 
copy vs$(PDBVER)\$(CFG)\$(PLAT)\atkmm\private\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\private\%h"
+       @for %h in ($(ATKMM_BUILD_PRIVATE_HEADERS)) do @if exist vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\private\%h 
copy vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\private\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\private\%h"
        @copy ".\atkmm\atkmmconfig.h" 
"$(PREFIX)\lib\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\include\"
        @copy ..\codegen\m4\*.m4 $(PREFIX)\share\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\proc\m4
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]