GNOME.org
 

[gtkmm] NMake Makefiles: Split outdir and intdir by toolset version

commit faac72ed4aa0eb3baf04ed0d1661a4d98cf7cfaf
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Mar 12 15:35:41 2020 +0800

    NMake Makefiles: Split outdir and intdir by toolset version
    
    This reduces the likelihood of builds done by different Visual Studio
    versions, which could lead up to much trouble

 MSVC_NMake/build-rules-msvc.mak  | 133 ++++++++++++++++++++-------------------
 MSVC_NMake/config-msvc.mak       |  12 ++--
 MSVC_NMake/create-lists-msvc.mak |  16 ++---
 MSVC_NMake/generate-msvc.mak     |  42 ++++++-------
 MSVC_NMake/install.mak           |  10 +--
 5 files changed, 108 insertions(+), 105 deletions(-)
---
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
index 3eb93e02..8c7c7af0 100644
--- a/MSVC_NMake/build-rules-msvc.mak
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -13,26 +13,26 @@
 #      $(CC)|$(CXX) $(cflags) /Fo$(destdir) /c @<<
 # $<
 # <<
-{..\gdk\gdkmm\}.cc{$(CFG)\$(PLAT)\gdkmm\}.obj::
-       $(CXX) $(LIBGDKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(CFG)\$(PLAT)\gdkmm\ /c @<<
+{..\gdk\gdkmm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\}.obj::
+       $(CXX) $(LIBGDKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\ /c @<<
 $<
 <<
 
-{..\gtk\gtkmm\}.cc{$(CFG)\$(PLAT)\gtkmm\}.obj::
-       $(CXX) $(LIBGTKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(CFG)\$(PLAT)\gtkmm\ /c @<<
+{..\gtk\gtkmm\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\}.obj::
+       $(CXX) $(LIBGTKMM_CFLAGS) $(CFLAGS_NOGL) /Fovs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\ /c @<<
 $<
 <<
 
-{.\gtkmm\}.rc{$(CFG)\$(PLAT)\gtkmm\}.res:
+{.\gtkmm\}.rc{vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\}.res:
        rc /fo$@ $<
 
-{..\demos\gtk-demo\}.cc{$(CFG)\$(PLAT)\gtkmm4-demo\}.obj::
-       $(CXX) $(GTKMM_DEMO_CFLAGS) $(CFLAGS) /Fo$(CFG)\$(PLAT)\gtkmm4-demo\ /c @<<
+{..\demos\gtk-demo\}.cc{vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo\}.obj::
+       $(CXX) $(GTKMM_DEMO_CFLAGS) $(CFLAGS) /Fovs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo\ /c @<<
 $<
 <<
 
-{$(CFG)\$(PLAT)\gtkmm4-demo\}.c{$(CFG)\$(PLAT)\gtkmm4-demo\}.obj::
-       $(CC) $(GTKMM_DEMO_CFLAGS) $(CFLAGS) /Fo$(CFG)\$(PLAT)\gtkmm4-demo\ /c @<<
+{vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo\}.c{vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo\}.obj::
+       $(CC) $(GTKMM_DEMO_CFLAGS) $(CFLAGS) /Fovs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo\ 
/Fdvs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo\ /c @<<
 $<
 <<
 
@@ -47,8 +47,8 @@ $(GTKMM_LIB): $(GTKMM_DLL)
 # <<
 #      @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
 
-$(GTKMM_DLL): $(CFG)\$(PLAT)\gtkmm\gtkmm.def $(gtkmm_OBJS) $(gdkmm_OBJS)
-       link /DLL $(LDFLAGS_NOLTCG) $(GTKMM_DEP_LIBS) /implib:$(GTKMM_LIB) 
/def:$(CFG)\$(PLAT)\gtkmm\gtkmm.def -out:$@ @<<
+$(GTKMM_DLL): vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\gtkmm.def $(gtkmm_OBJS) $(gdkmm_OBJS)
+       link /DLL $(LDFLAGS_NOLTCG) $(GTKMM_DEP_LIBS) /implib:$(GTKMM_LIB) 
/def:vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\gtkmm.def -out:$@ @<<
 $(gtkmm_OBJS) $(gdkmm_OBJS)
 <<
        @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
@@ -62,70 +62,73 @@ $(gtkmm_OBJS) $(gdkmm_OBJS)
 #      @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
 
 # For the gendef tool
-{.\gendef\}.cc{$(CFG)\$(PLAT)\}.exe:
-       @if not exist $(CFG)\$(PLAT)\gendef\ $(MAKE) -f Makefile.vc CFG=$(CFG) $(CFG)\$(PLAT)\gendef
-       $(CXX) $(GTKMM_BASE_CFLAGS) $(CFLAGS) /Fo$(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) $(GTKMM_BASE_CFLAGS) $(CFLAGS) /Fo$(@D)\gendef\ /Fd$(@D)\gendef\ $< /link $(LDFLAGS) /out:$@
        @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
 
-$(GTKMM4_DEMO): $(GTKMM_LIB) $(CFG)\$(PLAT)\gtkmm4-demo $(gtkmm_demo_OBJS)
+$(GTKMM4_DEMO): $(GTKMM_LIB) vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo $(gtkmm_demo_OBJS)
        link $(LDFLAGS) $(GTKMM_LIB) $(GTKMM_DEMO_DEP_LIBS) -out:$@ @<<
 $(gtkmm_demo_OBJS)
 <<
        @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
 
-$(CFG)\$(PLAT)\gtkmm4-test-builder.exe: ..\tests\builder\main.cc
-$(CFG)\$(PLAT)\gtkmm4-test-child_widget.exe: ..\tests\child_widget\main.cc 
..\tests\child_widget\testwindow.cc
-$(CFG)\$(PLAT)\gtkmm4-test-child_widget2.exe: ..\tests\child_widget2\main.cc
-$(CFG)\$(PLAT)\gtkmm4-test-child_widget_managed.exe: ..\tests\child_widget_managed\main.cc
-$(CFG)\$(PLAT)\gtkmm4-test-delete_cpp_child.exe: ..\tests\delete_cpp_child\main.cc
-$(CFG)\$(PLAT)\gtkmm4-test-dialog_deletethis.exe: ..\tests\dialog_deletethis\main.cc
-$(CFG)\$(PLAT)\gtkmm4-test-main_with_options.exe: ..\tests\main_with_options\main.cc
-$(CFG)\$(PLAT)\gtkmm4-test-menu_destruction.exe: ..\tests\menu_destruction\main.cc
-$(CFG)\$(PLAT)\gtkmm4-test-object_move.exe: ..\tests\object_move\main.cc
-$(CFG)\$(PLAT)\gtkmm4-test-property_notification.exe: ..\tests\property_notification\main.cc
-$(CFG)\$(PLAT)\gtkmm4-test-refcount_dialog.exe: ..\tests\refcount_dialog\main.cc
-$(CFG)\$(PLAT)\gtkmm4-test-scrolledwindow.exe: ..\tests\scrolledwindow\main.cc
-$(CFG)\$(PLAT)\gtkmm4-test-tree_model_iterator.exe: ..\tests\tree_model_iterator\main.cc
-$(CFG)\$(PLAT)\gtkmm4-test-wrap_existing.exe: ..\tests\wrap_existing\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-builder.exe: ..\tests\builder\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-child_widget.exe: ..\tests\child_widget\main.cc 
..\tests\child_widget\testwindow.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-child_widget2.exe: ..\tests\child_widget2\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-child_widget_managed.exe: ..\tests\child_widget_managed\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-delete_cpp_child.exe: ..\tests\delete_cpp_child\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-dialog_deletethis.exe: ..\tests\dialog_deletethis\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-main_with_options.exe: ..\tests\main_with_options\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-menu_destruction.exe: ..\tests\menu_destruction\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-object_move.exe: ..\tests\object_move\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-property_notification.exe: ..\tests\property_notification\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-refcount_dialog.exe: ..\tests\refcount_dialog\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-scrolledwindow.exe: ..\tests\scrolledwindow\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-tree_model_iterator.exe: ..\tests\tree_model_iterator\main.cc
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-wrap_existing.exe: ..\tests\wrap_existing\main.cc
 
-$(CFG)\$(PLAT)\gtkmm4-test-builder.exe \
-$(CFG)\$(PLAT)\gtkmm4-test-child_widget.exe    \
-$(CFG)\$(PLAT)\gtkmm4-test-child_widget2.exe   \
-$(CFG)\$(PLAT)\gtkmm4-test-child_widget_managed.exe    \
-$(CFG)\$(PLAT)\gtkmm4-test-delete_cpp_child.exe        \
-$(CFG)\$(PLAT)\gtkmm4-test-dialog_deletethis.exe       \
-$(CFG)\$(PLAT)\gtkmm4-test-main_with_options.exe       \
-$(CFG)\$(PLAT)\gtkmm4-test-menu_destruction.exe        \
-$(CFG)\$(PLAT)\gtkmm4-test-object_move.exe     \
-$(CFG)\$(PLAT)\gtkmm4-test-property_notification.exe   \
-$(CFG)\$(PLAT)\gtkmm4-test-refcount_dialog.exe \
-$(CFG)\$(PLAT)\gtkmm4-test-scrolledwindow.exe  \
-$(CFG)\$(PLAT)\gtkmm4-test-tree_model_iterator.exe     \
-$(CFG)\$(PLAT)\gtkmm4-test-wrap_existing.exe:
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-builder.exe      \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-child_widget.exe \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-child_widget2.exe        \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-child_widget_managed.exe \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-delete_cpp_child.exe     \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-dialog_deletethis.exe    \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-main_with_options.exe    \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-menu_destruction.exe     \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-object_move.exe  \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-property_notification.exe        \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-refcount_dialog.exe      \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-scrolledwindow.exe       \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-tree_model_iterator.exe  \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-wrap_existing.exe:
        @if not exist $(GTKMM_LIB) $(MAKE) /f Makefile.vc $(SAVED_OPTIONS) $(GTKMM_LIB)
-       @if not exist $(CFG)\$(PLAT)\$(@B) $(MAKE) /f Makefile.vc $(SAVED_OPTIONS) $(CFG)\$(PLAT)\$(@B)
-       $(CXX) $(GTKMM_DEMO_CFLAGS) $(CFLAGS) /Fo$(CFG)\$(PLAT)\$(@B)\ $**      \
+       @if not exist vs$(VSVER)\$(CFG)\$(PLAT)\$(@B) $(MAKE) /f Makefile.vc $(SAVED_OPTIONS) 
vs$(VSVER)\$(CFG)\$(PLAT)\$(@B)
+       $(CXX) $(GTKMM_DEMO_CFLAGS) $(CFLAGS) /Fo$(@D)\$(@B)\ /Fd$(@D)\$(@B)\ $**       \
        /link  $(LDFLAGS) $(GTKMM_LIB) $(GTKMM_DEMO_DEP_LIBS) -out:$@
        @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
 
 clean:
-       @-del /f /q $(CFG)\$(PLAT)\*.exe
-       @-del /f /q $(CFG)\$(PLAT)\*.dll
-       @-del /f /q $(CFG)\$(PLAT)\*.pdb
-       @-del /f /q $(CFG)\$(PLAT)\*.ilk
-       @-del /f /q $(CFG)\$(PLAT)\*.exp
-       @-del /f /q $(CFG)\$(PLAT)\*.lib
-       @-for /f %d in ('dir /ad /b $(CFG)\$(PLAT)\gtkmm4-test-*') do @del /f/q $(CFG)\$(PLAT)\%d\*.obj
-       @-del /f /q $(CFG)\$(PLAT)\gtkmm4-demo\demo_resources.c
-       @-del /f /q $(CFG)\$(PLAT)\gtkmm4-demo\*.obj
-       @-del /f /q $(CFG)\$(PLAT)\gtkmm\*.def
-       @-del /f /q $(CFG)\$(PLAT)\gtkmm\*.res
-       @-del /f /q $(CFG)\$(PLAT)\gtkmm\*.obj
-       @-del /f /q $(CFG)\$(PLAT)\gdkmm\*.obj
-       @-del /f /q $(CFG)\$(PLAT)\gendef\*.obj
-       @-for /f %d in ('dir /ad /b $(CFG)\$(PLAT)\gtkmm4-test-*') do @rd $(CFG)\$(PLAT)\%d
-       @-rd $(CFG)\$(PLAT)\gtkmm4-demo
-       @-rd $(CFG)\$(PLAT)\gtkmm
-       @-rd $(CFG)\$(PLAT)\gdkmm
-       @-rd $(CFG)\$(PLAT)\gendef
-       @-del /f /q vc$(PDBVER)0.pdb
+       @-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
+       @-for /f %d in ('dir /ad /b vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-*') do @del /f/q 
vs$(VSVER)\$(CFG)\$(PLAT)\%d\*.obj vs$(VSVER)\$(CFG)\$(PLAT)\%d\*.pdb
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo\demo_resources.c
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo\*.pdb
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo\*.obj
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\*.def
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\*.res
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\*.pdb
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\*.obj
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\*.pdb
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\*.obj
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gendef\*.pdb
+       @-del /f /q vs$(VSVER)\$(CFG)\$(PLAT)\gendef\*.obj
+       @-for /f %d in ('dir /ad /b vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-*') do @rd 
vs$(VSVER)\$(CFG)\$(PLAT)\%d
+       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo
+       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm
+       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm
+       @-rd vs$(VSVER)\$(CFG)\$(PLAT)\gendef
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 62385f40..f267c534 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -206,17 +206,17 @@ PANGOMM_LIB = $(PANGOMM_LIBNAME).lib
 
 GDKMM_LIBNAME = gdkmm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION)
 
-GDKMM_DLL = $(CFG)\$(PLAT)\$(GDKMM_LIBNAME).dll
-GDKMM_LIB = $(CFG)\$(PLAT)\$(GDKMM_LIBNAME).lib
+GDKMM_DLL = vs$(VSVER)\$(CFG)\$(PLAT)\$(GDKMM_LIBNAME).dll
+GDKMM_LIB = vs$(VSVER)\$(CFG)\$(PLAT)\$(GDKMM_LIBNAME).lib
 
 GTKMM_LIBNAME = gtkmm-vc$(VSVER)0$(DEBUG_SUFFIX)-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION)
 
-GTKMM_DLL = $(CFG)\$(PLAT)\$(GTKMM_LIBNAME).dll
-GTKMM_LIB = $(CFG)\$(PLAT)\$(GTKMM_LIBNAME).lib
+GTKMM_DLL = vs$(VSVER)\$(CFG)\$(PLAT)\$(GTKMM_LIBNAME).dll
+GTKMM_LIB = vs$(VSVER)\$(CFG)\$(PLAT)\$(GTKMM_LIBNAME).lib
 
-GTKMM4_DEMO = $(CFG)\$(PLAT)\gtkmm4-demo$(DEBUG_SUFFIX).exe
+GTKMM4_DEMO = vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo$(DEBUG_SUFFIX).exe
 
-GENDEF = $(CFG)\$(PLAT)\gendef.exe
+GENDEF = vs$(VSVER)\$(CFG)\$(PLAT)\gendef.exe
 
 GDKMM_INT_GENERATED_SOURCES = $(gdkmm_files_any_hg:.hg=.cc)
 GDKMM_INT_GENERATED_HEADERS = $(gdkmm_files_any_hg:.hg=.h)
diff --git a/MSVC_NMake/create-lists-msvc.mak b/MSVC_NMake/create-lists-msvc.mak
index 03ba069e..be7aac13 100644
--- a/MSVC_NMake/create-lists-msvc.mak
+++ b/MSVC_NMake/create-lists-msvc.mak
@@ -40,10 +40,10 @@ gdkmm_generated_private_headers = $(files_hg:.hg=_p.h)
 !if [call create-lists.bat header gtkmm.mak gdkmm_OBJS]
 !endif
 
-!if [for %c in ($(GDKMM_INT_GENERATED_SOURCES)) do @if "%~xc" == ".cc" @call create-lists.bat file gtkmm.mak 
^$(CFG)\^$(PLAT)\gdkmm\%~nc.obj]
+!if [for %c in ($(GDKMM_INT_GENERATED_SOURCES)) do @if "%~xc" == ".cc" @call create-lists.bat file gtkmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\gdkmm\%~nc.obj]
 !endif
 
-!if [for %c in ($(gdkmm_files_extra_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file gtkmm.mak 
^$(CFG)\^$(PLAT)\gdkmm\%~nc.obj]
+!if [for %c in ($(gdkmm_files_extra_cc)) do @if "%~xc" == ".cc" @call create-lists.bat file gtkmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\gdkmm\%~nc.obj]
 !endif
 
 !if [call create-lists.bat footer gtkmm.mak]
@@ -53,13 +53,13 @@ gdkmm_generated_private_headers = $(files_hg:.hg=_p.h)
 !if [call create-lists.bat header gtkmm.mak gtkmm_OBJS]
 !endif
 
-!if [for %c in ($(GTKMM_INT_GENERATED_SOURCES)) do @if "%~xc" == ".cc" @call create-lists.bat file gtkmm.mak 
^$(CFG)\^$(PLAT)\gtkmm\%~nc.obj]
+!if [for %c in ($(GTKMM_INT_GENERATED_SOURCES)) do @if "%~xc" == ".cc" @call create-lists.bat file gtkmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\gtkmm\%~nc.obj]
 !endif
 
-!if [for %c in ($(GTKMM_INT_EXTRA_SOURCES)) do @if "%~xc" == ".cc" @call create-lists.bat file gtkmm.mak 
^$(CFG)\^$(PLAT)\gtkmm\%~nc.obj]
+!if [for %c in ($(GTKMM_INT_EXTRA_SOURCES)) do @if "%~xc" == ".cc" @call create-lists.bat file gtkmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\gtkmm\%~nc.obj]
 !endif
 
-!if [@call create-lists.bat file gtkmm.mak ^$(CFG)\^$(PLAT)\gtkmm\gtkmm.res]
+!if [@call create-lists.bat file gtkmm.mak vs^$(VSVER)\^$(CFG)\^$(PLAT)\gtkmm\gtkmm.res]
 !endif
 
 !if [call create-lists.bat footer gtkmm.mak]
@@ -69,10 +69,10 @@ gdkmm_generated_private_headers = $(files_hg:.hg=_p.h)
 !if [call create-lists.bat header gtkmm.mak gtkmm_demo_OBJS]
 !endif
 
-!if [for %s in (..\demos\gtk-demo\*.cc) do @call create-lists.bat file gtkmm.mak 
^$(CFG)\^$(PLAT)\gtkmm4-demo\%~ns.obj]
+!if [for %s in (..\demos\gtk-demo\*.cc) do @call create-lists.bat file gtkmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\gtkmm4-demo\%~ns.obj]
 !endif
 
-!if [@call create-lists.bat file gtkmm.mak ^$(CFG)\^$(PLAT)\gtkmm4-demo\demo_resources.obj]
+!if [@call create-lists.bat file gtkmm.mak vs^$(VSVER)\^$(CFG)\^$(PLAT)\gtkmm4-demo\demo_resources.obj]
 !endif
 
 !if [call create-lists.bat footer gtkmm.mak]
@@ -114,7 +114,7 @@ gdkmm_generated_private_headers = $(files_hg:.hg=_p.h)
 !if [call create-lists.bat header gtkmm.mak gtkmm_tests]
 !endif
 
-!if [for /f %d in ('dir /ad /b ..\tests\') do @call create-lists.bat file gtkmm.mak 
^$(CFG)\^$(PLAT)\gtkmm4-test-%d.exe]
+!if [for /f %d in ('dir /ad /b ..\tests\') do @call create-lists.bat file gtkmm.mak 
vs^$(VSVER)\^$(CFG)\^$(PLAT)\gtkmm4-test-%d.exe]
 !endif
 
 !if [call create-lists.bat footer gtkmm.mak]
diff --git a/MSVC_NMake/generate-msvc.mak b/MSVC_NMake/generate-msvc.mak
index 7e8bd6cd..2b904bef 100644
--- a/MSVC_NMake/generate-msvc.mak
+++ b/MSVC_NMake/generate-msvc.mak
@@ -4,32 +4,32 @@
 # one is maintaining the NMake build files.
 
 # Create the build directories
-$(CFG)\$(PLAT)\gendef  \
-$(CFG)\$(PLAT)\gdkmm   \
-$(CFG)\$(PLAT)\gtkmm   \
-$(CFG)\$(PLAT)\gtkmm4-demo     \
-$(CFG)\$(PLAT)\gtkmm4-test-builder     \
-$(CFG)\$(PLAT)\gtkmm4-test-child_widget        \
-$(CFG)\$(PLAT)\gtkmm4-test-child_widget2       \
-$(CFG)\$(PLAT)\gtkmm4-test-child_widget_managed        \
-$(CFG)\$(PLAT)\gtkmm4-test-delete_cpp_child    \
-$(CFG)\$(PLAT)\gtkmm4-test-dialog_deletethis   \
-$(CFG)\$(PLAT)\gtkmm4-test-main_with_options   \
-$(CFG)\$(PLAT)\gtkmm4-test-menu_destruction    \
-$(CFG)\$(PLAT)\gtkmm4-test-object_move \
-$(CFG)\$(PLAT)\gtkmm4-test-property_notification       \
-$(CFG)\$(PLAT)\gtkmm4-test-refcount_dialog     \
-$(CFG)\$(PLAT)\gtkmm4-test-scrolledwindow      \
-$(CFG)\$(PLAT)\gtkmm4-test-tree_model_iterator \
-$(CFG)\$(PLAT)\gtkmm4-test-wrap_existing:
+vs$(VSVER)\$(CFG)\$(PLAT)\gendef       \
+vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm        \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm        \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo  \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-builder  \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-child_widget     \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-child_widget2    \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-child_widget_managed     \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-delete_cpp_child \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-dialog_deletethis        \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-main_with_options        \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-menu_destruction \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-object_move      \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-property_notification    \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-refcount_dialog  \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-scrolledwindow   \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-tree_model_iterator      \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-test-wrap_existing:
        @-mkdir $@
 
 # Generate .def files
-$(CFG)\$(PLAT)\gtkmm\gtkmm.def: $(GENDEF) $(CFG)\$(PLAT)\gdkmm $(CFG)\$(PLAT)\gtkmm $(gdkmm_OBJS) 
$(gtkmm_OBJS)
-       $(CFG)\$(PLAT)\gendef.exe $@ $(GTKMM_LIBNAME) $(CFG)\$(PLAT)\gdkmm\*.obj $(CFG)\$(PLAT)\gtkmm\*.obj
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\gtkmm.def: $(GENDEF) vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm 
vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm $(gdkmm_OBJS) $(gtkmm_OBJS)
+       vs$(VSVER)\$(CFG)\$(PLAT)\gendef.exe $@ $(GTKMM_LIBNAME) vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\*.obj 
vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\*.obj
 
 # Generate demo GResource source file
-$(CFG)\$(PLAT)\gtkmm4-demo\demo_resources.c:   \
+vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo\demo_resources.c:        \
 $(gtkmm_demo_example_sources)  \
 $(gtkmm_demo_resources)        \
 ..\demos\gtk-demo\demo.gresource.xml
diff --git a/MSVC_NMake/install.mak b/MSVC_NMake/install.mak
index c446abb8..4b554a78 100644
--- a/MSVC_NMake/install.mak
+++ b/MSVC_NMake/install.mak
@@ -6,11 +6,11 @@ install: all
        @if not exist $(PREFIX)\lib\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\include\ mkdir 
$(PREFIX)\lib\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\include
        @if not exist $(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\private\ 
@mkdir $(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\private
        @if not exist $(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\private\ 
@mkdir $(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gtkmm\private
-       @copy /b $(CFG)\$(PLAT)\gtkmm4-demo.exe $(PREFIX)\bin
-       @copy /b $(CFG)\$(PLAT)\gtkmm4-demo.pdb $(PREFIX)\bin
-       @copy /b $(CFG)\$(PLAT)\$(GTKMM_LIBNAME).dll $(PREFIX)\bin
-       @copy /b $(CFG)\$(PLAT)\$(GTKMM_LIBNAME).pdb $(PREFIX)\bin
-       @copy /b $(CFG)\$(PLAT)\$(GTKMM_LIBNAME).lib $(PREFIX)\lib
+       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo.exe $(PREFIX)\bin
+       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm4-demo.pdb $(PREFIX)\bin
+       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(GTKMM_LIBNAME).dll $(PREFIX)\bin
+       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(GTKMM_LIBNAME).pdb $(PREFIX)\bin
+       @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(GTKMM_LIBNAME).lib $(PREFIX)\lib
        @copy ..\gdk\gdkmm.h "$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\"
        @for %h in ($(GDKMM_INT_GENERATED_HEADERS) $(gdkmm_files_extra_h)) do @copy ..\gdk\gdkmm\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\%h"
        @for %h in ($(GDKMM_INT_GENERATED_HEADERS_P)) do @copy ..\gdk\gdkmm\private\%h 
"$(PREFIX)\include\gtkmm-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)\gdkmm\private\%h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]