GNOME.org
 

[gtkmm] NMake Makefiles: Remove mentions of ATK/ATKMM

commit 9c48c0f2a66d8c642fc364458ecc11531209ca5b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Aug 5 16:15:46 2020 +0800

    NMake Makefiles: Remove mentions of ATK/ATKMM
    
    They are no longer required by gtkmm, so drop them from the required libraries.
    
    Also update the README file to reflect on this

 MSVC_NMake/README               |  8 ++++----
 MSVC_NMake/build-rules-msvc.mak |  4 ++--
 MSVC_NMake/config-msvc.mak      | 16 ----------------
 MSVC_NMake/generate-msvc.mak    |  1 -
 MSVC_NMake/info-msvc.mak        | 15 ++++++---------
 5 files changed, 12 insertions(+), 32 deletions(-)
---
diff --git a/MSVC_NMake/README b/MSVC_NMake/README
index 88fb8cda..26dfc39b 100644
--- a/MSVC_NMake/README
+++ b/MSVC_NMake/README
@@ -2,20 +2,20 @@ Building gtkmm-4.0 with Visual Studio 2017
 
 * You will need Visual Studio 2017 (MSVC 15.0). Earlier versions of the compiler, including 14.0 and
   earlier will not work.  The build can be carried out using the NMake Makefiles supplied in this
-  directory, or via using Meson.  Meson is only supported if libsigc++, glibmm, cairomm, atkmm and pangomm
+  directory, or via using Meson.  Meson is only supported if libsigc++, glibmm, cairomm and pangomm
   are built with Meson as well.
 * Install the latest Win32 GTK+ 4.x Development files.
-* Build libsigc++, glibmm, cairomm, atkmm and pangomm from source, with the same compiler version, even if
+* Build libsigc++, glibmm, cairomm and pangomm from source, with the same compiler version, even if
   on Visual Studio 2017 or 2019.  If there are strange linker errors, they are likely caused by mixing
   different compiler versions.
 * Use the Visual Studio command prompt that is appropriate for your build and navigate to this directory.
 * Run nmake /f Makefile.vc CFG=[debug|release].  Also pass in PREFIX=<path> to this command line if
-  GTK+, libsigc++, glibmm, cairomm, atkmm and pangomm are not in $(srcroot)\..\vs15\$(platform).  You
+  GTK+, libsigc++, glibmm, cairomm and pangomm are not in $(srcroot)\..\vs15\$(platform).  You
   may also need to pass in VULKAN_SDK_DIR=<path_to_base_installation_directory_to_the_LunarG_Vulkan_SDK>
   if the GTK+-4.x build that is being used is built with Vulkan support, so that Vulkan's headers and
   libraries can be found.  Pass in DISABLE_DEPRECATED to disable building deprecated gtkmm APIs into the
   final DLL.
-* If you have built libsigc++, glibmm, cairomm, atkmm and pangomm on Visual Studio using the Meson build
+* If you have built libsigc++, glibmm, cairomm and pangomm on Visual Studio using the Meson build
   system instead   of using NMake, you can pass in `USE_MESON_LIBS=1` to the NMake command line to link to
   these libraries.  Note that mixing dependent -mm libraries built from NMake Makefiles and Meson is not
   recommended nor supported directly, and one is responsible to ensure gtkmm and the dependent -mm libraries
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
index 342a8f32..7c5c1d0e 100644
--- a/MSVC_NMake/build-rules-msvc.mak
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -32,7 +32,7 @@ $<
 
 {..\gdk\src\}.ccg{vs$(VSVER)\$(CFG)\$(PLAT)\gdkmm\}.obj:
        @if not exist $(@D)\private\ md $(@D)\private
-       @for %%s in ($(<D)\*.ccg) do @if not exist ..\untracked\gdk\gdkmm\%%~ns.cc if not exist 
..\gdk\gdkmm\%%~ns.cc if not exist $(@D)\%%~ns.cc $(PERL) -- $(GMMPROC_DIR)/gmmproc -I ../tools/m4 -I 
$(GMMPROC_PANGO_DIR) -I $(GMMPROC_ATK_DIR) --defs $(<D:\=/) %%~ns $(<D:\=/) $(@D)
+       @for %%s in ($(<D)\*.ccg) do @if not exist ..\untracked\gdk\gdkmm\%%~ns.cc if not exist 
..\gdk\gdkmm\%%~ns.cc if not exist $(@D)\%%~ns.cc $(PERL) -- $(GMMPROC_DIR)/gmmproc -I ../tools/m4 -I 
$(GMMPROC_PANGO_DIR) --defs $(<D:\=/) %%~ns $(<D:\=/) $(@D)
        @if exist $(@D)\$(<B).cc $(CXX) $(LIBGDKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c 
$(@D)\$(<B).cc
        @if exist ..\gdk\gdkmm\$(<B).cc $(CXX) $(LIBGDKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c 
..\gdk\gdkmm\$(<B).cc
        @if exist ..\untracked\gdk\gdkmm\$(<B).cc $(CXX) $(LIBGDKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ 
/Fd$(@D)\ /c ..\untracked\gdk\gdkmm\$(<B).cc
@@ -56,7 +56,7 @@ $<
 
 {..\gtk\src\}.ccg{vs$(VSVER)\$(CFG)\$(PLAT)\gtkmm\}.obj:
        @if not exist $(@D)\private\ md $(@D)\private
-       @for %%s in ($(<D)\*.ccg) do @if not exist ..\untracked\gtk\gtkmm\%%~ns.cc if not exist 
..\gtk\gtkmm\%%~ns.cc if not exist $(@D)\%%~ns.cc $(PERL) -- $(GMMPROC_DIR)/gmmproc -I ../tools/m4 -I 
$(GMMPROC_PANGO_DIR) -I $(GMMPROC_ATK_DIR) --defs $(<D:\=/) %%~ns $(<D:\=/) $(@D)
+       @for %%s in ($(<D)\*.ccg) do @if not exist ..\untracked\gtk\gtkmm\%%~ns.cc if not exist 
..\gtk\gtkmm\%%~ns.cc if not exist $(@D)\%%~ns.cc $(PERL) -- $(GMMPROC_DIR)/gmmproc -I ../tools/m4 -I 
$(GMMPROC_PANGO_DIR) --defs $(<D:\=/) %%~ns $(<D:\=/) $(@D)
        @if exist $(@D)\$(<B).cc $(CXX) $(LIBGTKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c 
$(@D)\$(<B).cc
        @if exist ..\gtk\gtkmm\$(<B).cc $(CXX) $(LIBGTKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c 
..\gtk\gtkmm\$(<B).cc
        @if exist ..\untracked\gtk\gtkmm\$(<B).cc $(CXX) $(LIBGTKMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ 
/Fd$(@D)\ /c ..\untracked\gtk\gtkmm\$(<B).cc
diff --git a/MSVC_NMake/config-msvc.mak b/MSVC_NMake/config-msvc.mak
index 2e687e6c..0bb7df5d 100644
--- a/MSVC_NMake/config-msvc.mak
+++ b/MSVC_NMake/config-msvc.mak
@@ -41,14 +41,9 @@ GMMPROC_DIR=$(PREFIX)\share\glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSIO
 GMMPROC_PANGO_DIR=$(GMMPROC_DIR)\..\..\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\proc\m4
 !endif
 
-!ifndef GMMPROC_ATK_DIR
-GMMPROC_ATK_DIR=$(GMMPROC_DIR)\..\..\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\proc\m4
-!endif
-
 # Dependencies
 
 GLIB_API_VERSION = 2.0
-ATK_API_VERSION = 1.0
 PANGO_API_VERSION = 1.0
 GDK_PIXBUF_API_VERSION = 2.0
 GRAPHENE_API_VERSION = 1.0
@@ -60,8 +55,6 @@ CAIROMM_MAJOR_VERSION = 1
 CAIROMM_MINOR_VERSION = 16
 GLIBMM_MAJOR_VERSION = 2
 GLIBMM_MINOR_VERSION = 66
-ATKMM_MAJOR_VERSION = 2
-ATKMM_MINOR_VERSION = 30
 PANGOMM_MAJOR_VERSION = 2
 PANGOMM_MINOR_VERSION = 44
 GTKMM_MAJOR_VERSION = 4
@@ -70,8 +63,6 @@ GTKMM_MINOR_VERSION = 0
 GTKMM_CXX_INCLUDES =   \
        /I$(PREFIX)\include\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)   \
        /I$(PREFIX)\lib\pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)\include       \
-       /I$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION) \
-       /I$(PREFIX)\lib\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\include     \
        /I$(PREFIX)\include\giomm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)       \
        /I$(PREFIX)\lib\giomm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)\include   \
        /I$(PREFIX)\include\glibmm-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)      \
@@ -86,7 +77,6 @@ GTKMM_C_INCLUDES =    \
        /I$(PREFIX)\include\gdk-pixbuf-$(GDK_PIXBUF_API_VERSION)        \
        /I$(PREFIX)\include\graphene-$(GRAPHENE_API_VERSION)    \
        /I$(PREFIX)\lib\graphene-$(GRAPHENE_API_VERSION)\include        \
-       /I$(PREFIX)\include\atk-$(ATK_API_VERSION)      \
        /I$(PREFIX)\include\pango-$(PANGO_API_VERSION)  \
        /I$(PREFIX)\include\glib-$(GLIB_API_VERSION)    \
        /I$(PREFIX)\lib\glib-$(GLIB_API_VERSION)\include        \
@@ -115,7 +105,6 @@ VULKAN_LIB =
 GOBJECT_LIBS = gobject-$(GLIB_API_VERSION).lib gmodule-$(GLIB_API_VERSION).lib glib-$(GLIB_API_VERSION).lib
 GIO_LIBS = gio-$(GLIB_API_VERSION).lib $(GOBJECT_LIBS)
 
-ATK_LIB = atk-$(ATK_API_VERSION).lib
 CAIRO_LIBS = cairo-gobject.lib cairo.lib
 EPOXY_LIB = epoxy.lib
 GDK_PIXBUF_LIB = gdk_pixbuf-$(GDK_PIXBUF_API_VERSION).lib
@@ -144,13 +133,11 @@ GTKMM_LIBS_C =    \
        $(GTK_LIB)      \
        $(GRAPHENE_LIB) \
        $(PANGO_LIBS)   \
-       $(ATK_LIB)      \
        $(GTKMM_LIBS_C_BASE)
 
 GDKMM_DEP_LIBS = $(GDKMM_LIBS_CXX) $(GDKMM_LIBS_C)
 
 GTKMM_DEP_LIBS =       \
-       $(ATKMM_LIB)    \
        $(PANGOMM_LIB)  \
        $(GDKMM_LIBS_CXX)       \
        $(GTKMM_LIBS_C)
@@ -202,7 +189,6 @@ LIBSIGC_LIBNAME = sigc-$(LIBSIGC_MAJOR_VERSION).$(LIBSIGC_MINOR_VERSION)
 GLIBMM_LIBNAME = glibmm$(MESON_VERVER_LIB)-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
 GIOMM_LIBNAME = giomm$(MESON_VERVER_LIB)-$(GLIBMM_MAJOR_VERSION).$(GLIBMM_MINOR_VERSION)
 CAIROMM_LIBNAME = cairomm$(MESON_VERVER_LIB)-$(CAIROMM_MAJOR_VERSION).$(CAIROMM_MINOR_VERSION)
-ATKMM_LIBNAME = atkmm$(MESON_VERVER_LIB)-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)
 PANGOMM_LIBNAME = pangomm$(MESON_VERVER_LIB)-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)
 GTKMM_LIBNAME = gtkmm$(MESON_VERVER_LIB)-$(GTKMM_MAJOR_VERSION).$(GTKMM_MINOR_VERSION)
 GTKMM_DLLNAME = $(GTKMM_LIBNAME)-1
@@ -211,7 +197,6 @@ LIBSIGC_LIBNAME = sigc-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(LIBSIGC_MAJOR_VERSION)_$(
 GLIBMM_LIBNAME = glibmm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(GLIBMM_MAJOR_VERSION)_$(GLIBMM_MINOR_VERSION)
 GIOMM_LIBNAME = giomm-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)
-ATKMM_LIBNAME = atkmm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(ATKMM_MAJOR_VERSION)_$(ATKMM_MINOR_VERSION)
 PANGOMM_LIBNAME = pangomm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(PANGOMM_MAJOR_VERSION)_$(PANGOMM_MINOR_VERSION)
 GTKMM_LIBNAME = gtkmm-vc$(VSVER_LIB)$(DEBUG_SUFFIX)-$(GTKMM_MAJOR_VERSION)_$(GTKMM_MINOR_VERSION)
 GTKMM_DLLNAME = $(GTKMM_LIBNAME)
@@ -221,7 +206,6 @@ LIBSIGC_LIB = $(LIBSIGC_LIBNAME).lib
 GLIBMM_LIB = $(GLIBMM_LIBNAME).lib
 GIOMM_LIB = $(GIOMM_LIBNAME).lib
 CAIROMM_LIB = $(CAIROMM_LIBNAME).lib
-ATKMM_LIB = $(ATKMM_LIBNAME).lib
 PANGOMM_LIB = $(PANGOMM_LIBNAME).lib
 GTKMM_LIB = $(GTKMM_LIBNAME).lib
 
diff --git a/MSVC_NMake/generate-msvc.mak b/MSVC_NMake/generate-msvc.mak
index c595bd64..fbfdb402 100644
--- a/MSVC_NMake/generate-msvc.mak
+++ b/MSVC_NMake/generate-msvc.mak
@@ -54,7 +54,6 @@ gtkmm\gtkmmconfig.h: ..\configure.ac ..\gtk\gtkmmconfig.h.in
        @if not exist pkg-ver.mak $(MAKE) /f Makefile.vc CFG=$(CFG) prep-git-build
        @if "$(DO_REAL_GEN)" == "1" echo Generating $@...
        @if "$(DO_REAL_GEN)" == "1" copy ..\gtk\$(@F).in $@
-       @if "$(DO_REAL_GEN)" == "1" $(PERL) -pi.bak -e "s/\#undef GTKMM_ATKMM_ENABLED/\#define 
GTKMM_ATKMM_ENABLED 1/g" $@
        @if "$(DO_REAL_GEN)" == "1" $(PERL) -pi.bak -e "s/\#undef GTKMM_DISABLE_DEPRECATED/\/\* \#undef 
GTKMM_DISABLE_DEPRECATED \*\//g" $@
        @if "$(DO_REAL_GEN)" == "1" $(PERL) -pi.bak -e "s/\#undef GTKMM_STATIC_LIB/\/\* \#undef 
GTKMM_STATIC_LIB \*\//g" $@
        @if "$(DO_REAL_GEN)" == "1" $(PERL) -pi.bak -e "s/\#undef GTKMM_MAJOR_VERSION/\#define 
GTKMM_MAJOR_VERSION $(PKG_MAJOR_VERSION)/g" $@
diff --git a/MSVC_NMake/info-msvc.mak b/MSVC_NMake/info-msvc.mak
index 096716b5..b3fcf6f4 100644
--- a/MSVC_NMake/info-msvc.mak
+++ b/MSVC_NMake/info-msvc.mak
@@ -27,20 +27,17 @@ help:
        @echo.
        @echo USE_MESON_LIBS: Use this if linking to Meson-built
        @echo variants of glibmm, pangomm and libsigc++ is desired.
-       @echo By using this option, pangomm, atkmm and cairomm
-       @echo should be linked to the Meson-built variants of
-       @echo glibmm and libsigc++ as well.
+       @echo By using this option, pangomm and cairomm should be linked to the
+       @echo Meson-built variants of glibmm and libsigc++ as well.
        @echo.
-       @echo GMMPROC_DIR, GMMPROC_PANGO_DIR, GMMPROC_ATK_DIR:
+       @echo GMMPROC_DIR, GMMPROC_PANGO_DIR:
        @echo Required if building directly from a GIT checkout,
        @echo or re-generating the source files from the .hg/.ccg
-       @echo files.  GMMPROC_PANGO_DIR and GMMPROC_ATK_DIR are by
-       @echo default in 
^$(GMMPROC_DIR)/../../pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)/proc/m4
-       @echo and ^$(GMMPROC_DIR)/../../atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)/proc/m4 
respectively.
+       @echo files.  GMMPROC_PANGO_DIR is by default in
+       @echo ^$(GMMPROC_DIR)/../../pangomm-$(PANGOMM_MAJOR_VERSION).$(PANGOMM_MINOR_VERSION)/proc/m4.
        @echo PERL with XML::Parser and some common *nix  commands
        @echo are required, as well as the .m4 and PERL files from
-       @echo glibmm, atkmm and pangomm, which will be used by
-       @echo gmmproc.
+       @echo glibmm and pangomm, which will be used by gmmproc.
        @echo ------
        @echo Possible options include the following:
        @echo.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]