[gtksourceview] Visual Studio builds: Go back to using GTK+-3.x

[Chun-wei Fan <fanchunwei src gnome org>]

commit e41c922eebf9ae1fa85ae2b73ce5518a5197688a
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Nov 15 11:27:52 2016 +0800

    Visual Studio builds: Go back to using GTK+-3.x
    
    GtkSourceview-4.x depends on GTK+-3.x, not GTK+-4.x, so change the project
    files do do so.  5.x will then depend on GTK+-4.x.

 .../win32/vs10/gtksourceview4-build-defines.props  |    4 ++--
 .../win32/vs9/gtksourceview4-build-defines.vsprops |    4 ++--
 gtksourceview/Makefile.am                          |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/build/win32/vs10/gtksourceview4-build-defines.props 
b/build/win32/vs10/gtksourceview4-build-defines.props
index 1217576..ec86189 100644
--- a/build/win32/vs10/gtksourceview4-build-defines.props
+++ b/build/win32/vs10/gtksourceview4-build-defines.props
@@ -13,14 +13,14 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      
<AdditionalIncludeDirectories>..\..\..;..\..\..\gtksourceview;.\;$(GlibEtcInstallRoot)\include\gtk-4.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>..\..\..;..\..\..\gtksourceview;.\;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      
<AdditionalDependencies>gtk-4.lib;gdk_pixbuf-2.0.lib;pangocairo-1.0.lib;pango-1.0.lib;atk-1.0.lib;gio-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;gthread-2.0.lib;glib-2.0.lib;intl.lib;cairo.lib;libxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>gtk-3.lib;gdk_pixbuf-2.0.lib;pangocairo-1.0.lib;pango-1.0.lib;atk-1.0.lib;gio-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;gthread-2.0.lib;glib-2.0.lib;intl.lib;cairo.lib;libxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
       
<AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
diff --git a/build/win32/vs9/gtksourceview4-build-defines.vsprops 
b/build/win32/vs9/gtksourceview4-build-defines.vsprops
index 0fdcb18..e733b42 100644
--- a/build/win32/vs9/gtksourceview4-build-defines.vsprops
+++ b/build/win32/vs9/gtksourceview4-build-defines.vsprops
@@ -9,14 +9,14 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               
AdditionalIncludeDirectories="..\..\..;..\..\..\gtksourceview;.\;$(GlibEtcInstallRoot)\include\gtk-4.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include"
+               
AdditionalIncludeDirectories="..\..\..;..\..\..\gtksourceview;.\;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include"
                PreprocessorDefinitions="HAVE_CONFIG_H"
                ForcedIncludeFiles="msvc_recommended_pragmas.h"
                AdditionalOptions="/MP"
        />
        <Tool
                Name="VCLinkerTool"
-               AdditionalDependencies="gtk-4.lib gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib 
atk-1.0.lib gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib gthread-2.0.lib glib-2.0.lib intl.lib cairo.lib 
libxml2.lib"
+               AdditionalDependencies="gtk-3.0.lib gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib 
atk-1.0.lib gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib gthread-2.0.lib glib-2.0.lib intl.lib cairo.lib 
libxml2.lib"
                AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
        />
        <UserMacro
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index caf449c..5e04d0e 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -397,8 +397,8 @@ GtkSource_@GSV_API_VERSION@_gir_MSVC_FILES =        \
        $(libgtksourceview_public_c_files)      \
        $(BUILT_SOURCES)
 
-GtkSource_@GSV_API_VERSION@_gir_MSVC_INCLUDE_GIRS = Gtk-4.0
-GtkSource_@GSV_API_VERSION@_gir_MSVC_PACKAGES = gtk+-4.0
+GtkSource_@GSV_API_VERSION@_gir_MSVC_INCLUDE_GIRS = $(GtkSource_@GSV_API_VERSION@_gir_INCLUDES)
+GtkSource_@GSV_API_VERSION@_gir_MSVC_PACKAGES = $(GtkSource_@GSV_API_VERSION@_gir_PACKAGES)
 GtkSource_@GSV_API_VERSION@_gir_MSVC_EXPORT_PACKAGES = gtksourceview-@GSV_API_VERSION@
 GtkSource_@GSV_API_VERSION@_gir_MSVC_LIBS = gtksourceview-@GSV_API_VERSION@
 GtkSource_@GSV_API_VERSION@_gir_MSVC_CFLAGS = -I..\\..