[gtksourceview] Visual Studio builds: Prepare for 4.x
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] Visual Studio builds: Prepare for 4.x
- Date: Wed, 9 Nov 2016 06:31:16 +0000 (UTC)
commit a6f76fafa71fe93263b0f6aa5eef8ce96a89229d
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Nov 8 16:18:47 2016 +0800
Visual Studio builds: Prepare for 4.x
Rename the projects and update things as necessary so that these projects
can be used in parallel with the 3.x projects, and make sure the autotools
items for generating the complete projects and scripts are made up-to-date
as a result. This attempts to not hardcode version info in the autotools
items as well.
https://bugzilla.gnome.org/show_bug.cgi?id=774093
build/win32/Makefile.am | 2 +-
...c.mak => gtksourceview4-introspection-msvc.mak} | 2 +-
build/win32/vs10/Makefile.am | 38 +++++-----
.../{gtksourceview.sln => gtksourceview-4.sln} | 72 +++++++++---------
...filtersin => gtksourceview-4.vcxproj.filtersin} | 2 +-
...rceview.vcxprojin => gtksourceview-4.vcxprojin} | 18 ++--
...es.props => gtksourceview4-build-defines.props} | 10 +-
...s.props.in => gtksourceview4-gen-srcs.props.in} | 4 +-
...tall.propsin => gtksourceview4-install.propsin} | 4 +-
...tall.vcxproj => gtksourceview4-install.vcxproj} | 10 +-
...hs.props => gtksourceview4-version-paths.props} | 8 +-
build/win32/vs11/Makefile.am | 18 ++--
build/win32/vs12/Makefile.am | 18 ++--
build/win32/vs14/Makefile.am | 18 ++--
build/win32/vs9/Makefile.am | 28 ++++----
.../vs9/{gtksourceview.sln => gtksourceview-4.sln} | 78 ++++++++++----------
...ourceview.vcprojin => gtksourceview-4.vcprojin} | 22 +++---
...sprops => gtksourceview4-build-defines.vsprops} | 10 +-
...props.in => gtksourceview4-gen-srcs.vsprops.in} | 4 +-
...nstall.vcproj => gtksourceview4-install.vcproj} | 12 ++--
....vspropsin => gtksourceview4-install.vspropsin} | 6 +-
...sprops => gtksourceview4-version-paths.vsprops} | 8 +-
configure.ac | 4 +-
gtksourceview/Makefile.am | 22 +++---
24 files changed, 209 insertions(+), 209 deletions(-)
---
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 76d2ea4..67e20c6 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -26,7 +26,7 @@ endif
EXTRA_DIST = \
replace.py \
detectenv-msvc.mak \
- gtksourceview-introspection-msvc.mak \
+ gtksourceview4-introspection-msvc.mak \
introspection-msvc.mak \
gen-enums.batin \
$(GENERATED_ITEMS)
diff --git a/build/win32/gtksourceview-introspection-msvc.mak
b/build/win32/gtksourceview4-introspection-msvc.mak
similarity index 97%
rename from build/win32/gtksourceview-introspection-msvc.mak
rename to build/win32/gtksourceview4-introspection-msvc.mak
index e38353b..4c29266 100644
--- a/build/win32/gtksourceview-introspection-msvc.mak
+++ b/build/win32/gtksourceview4-introspection-msvc.mak
@@ -4,7 +4,7 @@
APIVERSION = 4
-CHECK_PACKAGE = gtk+-3.0
+CHECK_PACKAGE = gtk+-4.0
built_install_girs = GtkSource-$(APIVERSION).gir
built_install_typelibs = GtkSource-$(APIVERSION).typelib
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 93cc36d..e144435 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -1,28 +1,28 @@
-GENERATED_ITEMS = \
- gtksourceview.vcxproj \
- gtksourceview.vcxproj.filters \
- gtksourceview-install.props \
+GENERATED_ITEMS = \
+ gtksourceview-@GSV_API_VERSION@.vcxproj \
+ gtksourceview-@GSV_API_VERSION@.vcxproj.filters \
+ gtksourceview@GSV_API_VERSION@-install.props \
math.h
MSVC10_HEADERS_LISTS = \
- gtksourceview.vs10.headers
+ gtksourceview-@GSV_API_VERSION@.vs10.headers
-EXTRA_DIST = \
- gtksourceview.sln \
- gtksourceview-build-defines.props \
- gtksourceview-gen-srcs.props \
- gtksourceview-install.propsin \
- gtksourceview-version-paths.props \
- gtksourceview.vcxprojin \
- gtksourceview.vcxproj.filtersin \
- gtksourceview-install.vcxproj \
+EXTRA_DIST = \
+ gtksourceview-@GSV_API_VERSION@.sln \
+ gtksourceview@GSV_API_VERSION@-build-defines.props \
+ gtksourceview@GSV_API_VERSION@-gen-srcs.props \
+ gtksourceview@GSV_API_VERSION@-install.propsin \
+ gtksourceview@GSV_API_VERSION@-version-paths.props \
+ gtksourceview-@GSV_API_VERSION@.vcxprojin \
+ gtksourceview-@GSV_API_VERSION@.vcxproj.filtersin \
+ gtksourceview@GSV_API_VERSION@-install.vcxproj \
$(GENERATED_ITEMS)
-gtksourceview-install.props: $(top_srcdir)/build/win32/vs10/gtksourceview-install.propsin
$(MSVC10_HEADERS_LISTS)
- -$(RM) $(top_builddir)/build/win32/vs11/gtksourceview-install.props
- -$(RM) $(top_builddir)/build/win32/vs12/gtksourceview-install.props
- -$(RM) $(top_builddir)/build/win32/vs14/gtksourceview-install.props
- $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtksourceview-install.propsin >$@
+gtksourceview@GSV_API_VERSION@-install.props:
$(top_srcdir)/build/win32/vs10/gtksourceview@GSV_API_VERSION@-install.propsin $(MSVC10_HEADERS_LISTS)
+ -$(RM) $(top_builddir)/build/win32/vs11/gtksourceview@GSV_API_VERSION@-install.props
+ -$(RM) $(top_builddir)/build/win32/vs12/gtksourceview@GSV_API_VERSION@-install.props
+ -$(RM) $(top_builddir)/build/win32/vs14/gtksourceview@GSV_API_VERSION@-install.props
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtksourceview@GSV_API_VERSION@-install.propsin >$@
$(RM) $(MSVC10_HEADERS_LISTS)
math.h: $(top_srcdir)/build/win32/vs9/math.h
diff --git a/build/win32/vs10/gtksourceview.sln b/build/win32/vs10/gtksourceview-4.sln
similarity index 90%
rename from build/win32/vs10/gtksourceview.sln
rename to build/win32/vs10/gtksourceview-4.sln
index 1114d4f..4ae9ae4 100644
--- a/build/win32/vs10/gtksourceview.sln
+++ b/build/win32/vs10/gtksourceview-4.sln
@@ -1,36 +1,36 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtksourceview", "gtksourceview.vcxproj",
"{B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtksourceview-install",
"gtksourceview-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|Win32.ActiveCfg = Debug|Win32
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|Win32.Build.0 = Debug|Win32
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|x64.ActiveCfg = Debug|x64
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|x64.Build.0 = Debug|x64
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|Win32.ActiveCfg = Release|Win32
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|Win32.Build.0 = Release|Win32
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|x64.ActiveCfg = Release|x64
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|x64.Build.0 = Release|x64
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtksourceview-4", "gtksourceview-4.vcxproj",
"{B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtksourceview4-install",
"gtksourceview4-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|Win32.Build.0 = Debug|Win32
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|x64.ActiveCfg = Debug|x64
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|x64.Build.0 = Debug|x64
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|Win32.ActiveCfg = Release|Win32
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|Win32.Build.0 = Release|Win32
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|x64.ActiveCfg = Release|x64
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|x64.Build.0 = Release|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/build/win32/vs10/gtksourceview.vcxproj.filtersin
b/build/win32/vs10/gtksourceview-4.vcxproj.filtersin
similarity index 96%
rename from build/win32/vs10/gtksourceview.vcxproj.filtersin
rename to build/win32/vs10/gtksourceview-4.vcxproj.filtersin
index 88d250e..afa60ca 100644
--- a/build/win32/vs10/gtksourceview.vcxproj.filtersin
+++ b/build/win32/vs10/gtksourceview-4.vcxproj.filtersin
@@ -15,7 +15,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
-#include "gtksourceview.vs10.sourcefiles.filters"
+#include "gtksourceview-4.vs10.sourcefiles.filters"
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
diff --git a/build/win32/vs10/gtksourceview.vcxprojin b/build/win32/vs10/gtksourceview-4.vcxprojin
similarity index 96%
rename from build/win32/vs10/gtksourceview.vcxprojin
rename to build/win32/vs10/gtksourceview-4.vcxprojin
index 1c7f668..18f3a48 100644
--- a/build/win32/vs10/gtksourceview.vcxprojin
+++ b/build/win32/vs10/gtksourceview-4.vcxprojin
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtksourceview-gen-srcs.props" />
+ <Import Project="gtksourceview4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtksourceview-gen-srcs.props" />
+ <Import Project="gtksourceview4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtksourceview-gen-srcs.props" />
+ <Import Project="gtksourceview4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtksourceview-gen-srcs.props" />
+ <Import Project="gtksourceview4-gen-srcs.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -88,7 +88,7 @@
<OutputFile>$(OutDir)$(GtkSourceviewDllPrefix)$(ProjectName)$(GtkSourceviewDllSuffix).dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -110,7 +110,7 @@
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -133,7 +133,7 @@
<OutputFile>$(OutDir)$(GtkSourceviewDllPrefix)$(ProjectName)$(GtkSourceviewDllSuffix).dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
@@ -158,12 +158,12 @@
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
-#include "gtksourceview.vs10.sourcefiles"
+#include "gtksourceview-4.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\config.h.win32">
diff --git a/build/win32/vs10/gtksourceview-build-defines.props
b/build/win32/vs10/gtksourceview4-build-defines.props
similarity index 75%
rename from build/win32/vs10/gtksourceview-build-defines.props
rename to build/win32/vs10/gtksourceview4-build-defines.props
index 3f7c41e..1217576 100644
--- a/build/win32/vs10/gtksourceview-build-defines.props
+++ b/build/win32/vs10/gtksourceview4-build-defines.props
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ImportGroup Label="PropertySheets">
- <Import Project="gtksourceview-version-paths.props" />
+ <Import Project="gtksourceview4-version-paths.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
-
<GtkSourceBuildDefines>G_LOG_DOMAIN="GtkSourceView";GTK_SOURCE_VERSION_MIN_REQUIRED=GTK_SOURCE_VERSION_3_0</GtkSourceBuildDefines>
+ <GtkSourceBuildDefines>G_LOG_DOMAIN="GtkSourceView";GTK_SOURCE_COMPILATION</GtkSourceBuildDefines>
</PropertyGroup>
<PropertyGroup>
- <_PropertySheetDisplayName>gtksourceviewbuilddefinesprops</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>gtksourceview4builddefinesprops</_PropertySheetDisplayName>
<OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-
<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>
+
<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>
<PreprocessorDefinitions>HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
-
<AdditionalDependencies>gtk-3.0.lib;gdk-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;%(AdditionalDependencies)</AdditionalDependencies>
+
<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>
<AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
diff --git a/build/win32/vs10/gtksourceview-gen-srcs.props.in
b/build/win32/vs10/gtksourceview4-gen-srcs.props.in
similarity index 93%
rename from build/win32/vs10/gtksourceview-gen-srcs.props.in
rename to build/win32/vs10/gtksourceview4-gen-srcs.props.in
index a58a67f..2b1aa6a 100644
--- a/build/win32/vs10/gtksourceview-gen-srcs.props.in
+++ b/build/win32/vs10/gtksourceview4-gen-srcs.props.in
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ImportGroup Label="PropertySheets">
- <Import Project="gtksourceview-build-defines.props" />
+ <Import Project="gtksourceview4-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
<CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
@@ -17,7 +17,7 @@ del ..\..\..\gtksourceview\gtksourceversion.h.tmp1 ..\..\..\gtksourceview\gtksou
</GenGtksourceVersionH>
</PropertyGroup>
<PropertyGroup>
- <_PropertySheetDisplayName>gtksourceviewgensrcsprops</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>gtksourceview4gensrcsprops</_PropertySheetDisplayName>
</PropertyGroup>
<ItemGroup>
<BuildMacro Include="CopyConfigH">
diff --git a/build/win32/vs10/gtksourceview-install.propsin b/build/win32/vs10/gtksourceview4-install.propsin
similarity index 94%
rename from build/win32/vs10/gtksourceview-install.propsin
rename to build/win32/vs10/gtksourceview4-install.propsin
index fcd7c65..d3ebf5c 100644
--- a/build/win32/vs10/gtksourceview-install.propsin
+++ b/build/win32/vs10/gtksourceview4-install.propsin
@@ -11,7 +11,7 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\$(GtkSourceviewDllPrefix)gtk
copy
$(SolutionDir)$(Configuration)\$(Platform)\bin\$(GtkSourceviewDllPrefix)gtksourceview$(GtkSourceviewDllSuffix).pdb
$(CopyDir)\bin
mkdir $(CopyDir)\include\gtksourceview-$(ApiVersion)\gtksourceview\completion-providers\words
-#include "gtksourceview.vs10.headers"
+#include "gtksourceview-4.vs10.headers"
copy ..\..\..\gtksourceview\completion-providers\words\gtksourcecompletionwords.h
$(CopyDir)\include\gtksourceview-$(ApiVersion)\gtksourceview\completion-providers\words
mkdir $(CopyDir)\lib
@@ -30,7 +30,7 @@ copy ..\..\..\data\styles\check-style.sh $(CopyDir)\share\gtksourceview-$(ApiVer
</GtkSourceviewDoInstall>
</PropertyGroup>
<PropertyGroup>
- <_PropertySheetDisplayName>gtksourceviewinstallprops</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>gtksourceview4installprops</_PropertySheetDisplayName>
<OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
<IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
</PropertyGroup>
diff --git a/build/win32/vs10/gtksourceview-install.vcxproj b/build/win32/vs10/gtksourceview4-install.vcxproj
similarity index 95%
rename from build/win32/vs10/gtksourceview-install.vcxproj
rename to build/win32/vs10/gtksourceview4-install.vcxproj
index 45d1dfd..56d764a 100644
--- a/build/win32/vs10/gtksourceview-install.vcxproj
+++ b/build/win32/vs10/gtksourceview4-install.vcxproj
@@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B10}</ProjectGuid>
- <RootNamespace>gtksourceviewinstall</RootNamespace>
+ <RootNamespace>gtksourceview4install</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -51,19 +51,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtksourceview-install.props" />
+ <Import Project="gtksourceview4-install.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtksourceview-install.props" />
+ <Import Project="gtksourceview4-install.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtksourceview-install.props" />
+ <Import Project="gtksourceview4-install.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtksourceview-install.props" />
+ <Import Project="gtksourceview4-install.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
diff --git a/build/win32/vs10/gtksourceview-version-paths.props
b/build/win32/vs10/gtksourceview4-version-paths.props
similarity index 88%
rename from build/win32/vs10/gtksourceview-version-paths.props
rename to build/win32/vs10/gtksourceview4-version-paths.props
index 0a0486a..c61903d 100644
--- a/build/win32/vs10/gtksourceview-version-paths.props
+++ b/build/win32/vs10/gtksourceview4-version-paths.props
@@ -5,17 +5,17 @@
<GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
- <ApiVersion>3.0</ApiVersion>
+ <ApiVersion>4</ApiVersion>
<GtkSourceviewLibtoolCompatibleDllPrefix>lib</GtkSourceviewLibtoolCompatibleDllPrefix>
- <GtkSourceviewLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GtkSourceviewLibtoolCompatibleDllSuffix>
+ <GtkSourceviewLibtoolCompatibleDllSuffix>-$(ApiVersion).0-0</GtkSourceviewLibtoolCompatibleDllSuffix>
<GtkSourceviewSeparateVSDllPrefix />
- <GtkSourceviewSeparateVSDllSuffix>-3-vs$(VSVer)</GtkSourceviewSeparateVSDllSuffix>
+ <GtkSourceviewSeparateVSDllSuffix>-vs$(VSVer)</GtkSourceviewSeparateVSDllSuffix>
<GtkSourceviewDllPrefix>$(GtkSourceviewSeparateVSDllPrefix)</GtkSourceviewDllPrefix>
<GtkSourceviewDllSuffix>$(GtkSourceviewSeparateVSDllSuffix)</GtkSourceviewDllSuffix>
<PythonPath>c:\python27</PythonPath>
</PropertyGroup>
<PropertyGroup>
- <_PropertySheetDisplayName>gtksourceviewversionpathsprops</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>gtksourceview4versionpathsprops</_PropertySheetDisplayName>
</PropertyGroup>
<ItemGroup>
<BuildMacro Include="VSVer">
diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
index a97c432..890e527 100644
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -1,12 +1,12 @@
-EXTRA_DIST = \
- gtksourceview.sln \
- gtksourceview-build-defines.props \
- gtksourceview-gen-srcs.props \
- gtksourceview-install.props \
- gtksourceview-version-paths.props \
- gtksourceview.vcxproj \
- gtksourceview.vcxproj.filters \
- gtksourceview-install.vcxproj \
+EXTRA_DIST = \
+ gtksourceview-@GSV_API_VERSION@.sln \
+ gtksourceview@GSV_API_VERSION@-build-defines.props \
+ gtksourceview@GSV_API_VERSION@-gen-srcs.props \
+ gtksourceview@GSV_API_VERSION@-install.props \
+ gtksourceview@GSV_API_VERSION@-version-paths.props \
+ gtksourceview-@GSV_API_VERSION@.vcxproj \
+ gtksourceview-@GSV_API_VERSION@.vcxproj.filters \
+ gtksourceview@GSV_API_VERSION@-install.vcxproj \
math.h
math.h: $(top_srcdir)/build/win32/vs9/math.h
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index d383ca2..604cb58 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -1,12 +1,12 @@
-EXTRA_DIST = \
- gtksourceview.sln \
- gtksourceview-build-defines.props \
- gtksourceview-gen-srcs.props \
- gtksourceview-install.props \
- gtksourceview-version-paths.props \
- gtksourceview.vcxproj \
- gtksourceview.vcxproj.filters \
- gtksourceview-install.vcxproj
+EXTRA_DIST = \
+ gtksourceview-@GSV_API_VERSION@.sln \
+ gtksourceview@GSV_API_VERSION@-build-defines.props \
+ gtksourceview@GSV_API_VERSION@-gen-srcs.props \
+ gtksourceview@GSV_API_VERSION@-install.props \
+ gtksourceview@GSV_API_VERSION@-version-paths.props \
+ gtksourceview-@GSV_API_VERSION@.vcxproj \
+ gtksourceview-@GSV_API_VERSION@.vcxproj.filters \
+ gtksourceview@GSV_API_VERSION@-install.vcxproj
DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
index b692e60..8f66906 100644
--- a/build/win32/vs14/Makefile.am
+++ b/build/win32/vs14/Makefile.am
@@ -1,12 +1,12 @@
-EXTRA_DIST = \
- gtksourceview.sln \
- gtksourceview-build-defines.props \
- gtksourceview-gen-srcs.props \
- gtksourceview-install.props \
- gtksourceview-version-paths.props \
- gtksourceview.vcxproj \
- gtksourceview.vcxproj.filters \
- gtksourceview-install.vcxproj
+EXTRA_DIST = \
+ gtksourceview-@GSV_API_VERSION@.sln \
+ gtksourceview@GSV_API_VERSION@-build-defines.props \
+ gtksourceview@GSV_API_VERSION@-gen-srcs.props \
+ gtksourceview@GSV_API_VERSION@-install.props \
+ gtksourceview@GSV_API_VERSION@-version-paths.props \
+ gtksourceview-@GSV_API_VERSION@.vcxproj \
+ gtksourceview-@GSV_API_VERSION@.vcxproj.filters \
+ gtksourceview@GSV_API_VERSION@-install.vcxproj
DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 8c98ffa..37ab80c 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,23 +1,23 @@
GENERATED_ITEMS = \
- gtksourceview.vcproj \
- gtksourceview-install.vsprops
+ gtksourceview-@GSV_API_VERSION@.vcproj \
+ gtksourceview@GSV_API_VERSION@-install.vsprops
MSVC_HEADERS_LISTS = \
- gtksourceview.headers
+ gtksourceview-@GSV_API_VERSION@.headers
-EXTRA_DIST = \
- gtksourceview.sln \
- gtksourceview-build-defines.vsprops \
- gtksourceview-gen-srcs.vsprops \
- gtksourceview-install.vspropsin \
- gtksourceview-version-paths.vsprops \
- gtksourceview.vcprojin \
- gtksourceview-install.vcproj \
- $(GENERATED_ITEMS) \
+EXTRA_DIST = \
+ gtksourceview-@GSV_API_VERSION@.sln \
+ gtksourceview@GSV_API_VERSION@-build-defines.vsprops \
+ gtksourceview@GSV_API_VERSION@-gen-srcs.vsprops \
+ gtksourceview@GSV_API_VERSION@-install.vspropsin \
+ gtksourceview@GSV_API_VERSION@-version-paths.vsprops \
+ gtksourceview-@GSV_API_VERSION@.vcprojin \
+ gtksourceview@GSV_API_VERSION@-install.vcproj \
+ $(GENERATED_ITEMS) \
math.h
-gtksourceview-install.vsprops: $(top_srcdir)/build/win32/vs9/gtksourceview-install.vspropsin
$(MSVC_HEADERS_LISTS)
- $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtksourceview-install.vspropsin >$@
+gtksourceview@GSV_API_VERSION@-install.vsprops:
$(top_srcdir)/build/win32/vs9/gtksourceview@GSV_API_VERSION@-install.vspropsin $(MSVC_HEADERS_LISTS)
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtksourceview@GSV_API_VERSION@-install.vspropsin >$@
$(RM) $(MSVC_HEADERS_LISTS)
DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/build/win32/vs9/gtksourceview.sln b/build/win32/vs9/gtksourceview-4.sln
similarity index 91%
rename from build/win32/vs9/gtksourceview.sln
rename to build/win32/vs9/gtksourceview-4.sln
index d6cd23b..2ea1f47 100644
--- a/build/win32/vs9/gtksourceview.sln
+++ b/build/win32/vs9/gtksourceview-4.sln
@@ -1,39 +1,39 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtksourceview", "gtksourceview.vcproj",
"{B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtksourceview-install", "gtksourceview-install.vcproj",
"{2093D218-190E-4194-9421-3BA7CBF33B10}"
- ProjectSection(ProjectDependencies) = postProject
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8} = {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|Win32.ActiveCfg = Debug|Win32
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|Win32.Build.0 = Debug|Win32
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|x64.ActiveCfg = Debug|x64
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|x64.Build.0 = Debug|x64
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|Win32.ActiveCfg = Release|Win32
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|Win32.Build.0 = Release|Win32
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|x64.ActiveCfg = Release|x64
- {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|x64.Build.0 = Release|x64
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
- {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtksourceview-4", "gtksourceview-4.vcproj",
"{B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtksourceview4-install",
"gtksourceview4-install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"
+ ProjectSection(ProjectDependencies) = postProject
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8} = {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|Win32.Build.0 = Debug|Win32
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|x64.ActiveCfg = Debug|x64
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Debug|x64.Build.0 = Debug|x64
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|Win32.ActiveCfg = Release|Win32
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|Win32.Build.0 = Release|Win32
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|x64.ActiveCfg = Release|x64
+ {B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}.Release|x64.Build.0 = Release|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
+ {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/build/win32/vs9/gtksourceview.vcprojin b/build/win32/vs9/gtksourceview-4.vcprojin
similarity index 93%
rename from build/win32/vs9/gtksourceview.vcprojin
rename to build/win32/vs9/gtksourceview-4.vcprojin
index 1f2a4f7..9862a0a 100644
--- a/build/win32/vs9/gtksourceview.vcprojin
+++ b/build/win32/vs9/gtksourceview-4.vcprojin
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="gtksourceview"
+ Name="gtksourceview-4"
ProjectGUID="{B95C0A8D-2528-40C4-8ADE-1FDE8B6E50E8}"
- RootNamespace="gtksourceview"
+ RootNamespace="gtksourceview4"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
@@ -22,7 +22,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\gtksourceview-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtksourceview4-gen-srcs.vsprops"
CharacterSet="2"
>
<Tool
@@ -45,14 +45,14 @@
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName).lib"
TargetMachine="1"
/>
</Configuration>
<Configuration
Name="Debug|x64"
ConfigurationType="2"
- InheritedPropertySheets=".\gtksourceview-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtksourceview4-gen-srcs.vsprops"
CharacterSet="2"
>
<Tool
@@ -79,14 +79,14 @@
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName).lib"
TargetMachine="17"
/>
</Configuration>
<Configuration
Name="Release|Win32"
ConfigurationType="2"
- InheritedPropertySheets=".\gtksourceview-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtksourceview4-gen-srcs.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -112,14 +112,14 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName).lib"
TargetMachine="1"
/>
</Configuration>
<Configuration
Name="Release|x64"
ConfigurationType="2"
- InheritedPropertySheets=".\gtksourceview-gen-srcs.vsprops"
+ InheritedPropertySheets=".\gtksourceview4-gen-srcs.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
@@ -149,7 +149,7 @@
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName).lib"
TargetMachine="17"
/>
</Configuration>
@@ -162,7 +162,7 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
-#include "gtksourceview.sourcefiles"
+#include "gtksourceview-4.sourcefiles"
</Filter>
<Filter
Name="Headers"
diff --git a/build/win32/vs9/gtksourceview-build-defines.vsprops
b/build/win32/vs9/gtksourceview4-build-defines.vsprops
similarity index 67%
rename from build/win32/vs9/gtksourceview-build-defines.vsprops
rename to build/win32/vs9/gtksourceview4-build-defines.vsprops
index 5d28be3..0fdcb18 100644
--- a/build/win32/vs9/gtksourceview-build-defines.vsprops
+++ b/build/win32/vs9/gtksourceview4-build-defines.vsprops
@@ -2,25 +2,25 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="gtksourceviewbuilddefinesprops"
+ Name="gtksourceview4builddefinesprops"
OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
- InheritedPropertySheets=".\gtksourceview-version-paths.vsprops"
+ InheritedPropertySheets=".\gtksourceview4-version-paths.vsprops"
>
<Tool
Name="VCCLCompilerTool"
-
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="..\..\..;..\..\..\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"
PreprocessorDefinitions="HAVE_CONFIG_H"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
AdditionalOptions="/MP"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="gtk-3.0.lib gdk-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"
+ 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"
AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
/>
<UserMacro
Name="GtkSourceBuildDefines"
-
Value="G_LOG_DOMAIN=\"GtkSourceView\";GTK_SOURCE_VERSION_MIN_REQUIRED=GTK_SOURCE_VERSION_3_0"
+ Value="G_LOG_DOMAIN=\"GtkSourceView\";GTK_SOURCE_COMPILATION"
/>
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtksourceview-gen-srcs.vsprops.in
b/build/win32/vs9/gtksourceview4-gen-srcs.vsprops.in
similarity index 94%
rename from build/win32/vs9/gtksourceview-gen-srcs.vsprops.in
rename to build/win32/vs9/gtksourceview4-gen-srcs.vsprops.in
index 332d10e..d586f5b 100644
--- a/build/win32/vs9/gtksourceview-gen-srcs.vsprops.in
+++ b/build/win32/vs9/gtksourceview4-gen-srcs.vsprops.in
@@ -2,8 +2,8 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="gtksourceviewgensrcsprops"
- InheritedPropertySheets=".\gtksourceview-build-defines.vsprops"
+ Name="gtksourceview4gensrcsprops"
+ InheritedPropertySheets=".\gtksourceview4-build-defines.vsprops"
>
<UserMacro
Name="CopyConfigH"
diff --git a/build/win32/vs9/gtksourceview-install.vcproj b/build/win32/vs9/gtksourceview4-install.vcproj
similarity index 82%
rename from build/win32/vs9/gtksourceview-install.vcproj
rename to build/win32/vs9/gtksourceview4-install.vcproj
index 7a20852..ba4fd12 100644
--- a/build/win32/vs9/gtksourceview-install.vcproj
+++ b/build/win32/vs9/gtksourceview4-install.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="gtksourceview-install"
+ Name="gtksourceview4-install"
ProjectGUID="{2093D218-190E-4194-9421-3BA7CBF33B10}"
- RootNamespace="gtksourceviewinstall"
+ RootNamespace="gtksourceview4install"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\gtksourceview-install.vsprops"
+ InheritedPropertySheets=".\gtksourceview4-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -34,7 +34,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\gtksourceview-install.vsprops"
+ InheritedPropertySheets=".\gtksourceview4-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -47,7 +47,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\gtksourceview-install.vsprops"
+ InheritedPropertySheets=".\gtksourceview4-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -61,7 +61,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\gtksourceview-install.vsprops"
+ InheritedPropertySheets=".\gtksourceview4-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
diff --git a/build/win32/vs9/gtksourceview-install.vspropsin
b/build/win32/vs9/gtksourceview4-install.vspropsin
similarity index 92%
rename from build/win32/vs9/gtksourceview-install.vspropsin
rename to build/win32/vs9/gtksourceview4-install.vspropsin
index 1c489bb..86d99a3 100644
--- a/build/win32/vs9/gtksourceview-install.vspropsin
+++ b/build/win32/vs9/gtksourceview4-install.vspropsin
@@ -2,8 +2,8 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="gtksourceviewinstallprops"
- InheritedPropertySheets=".\gtksourceview-build-defines.vsprops"
+ Name="gtksource4viewinstallprops"
+ InheritedPropertySheets=".\gtksourceview4-build-defines.vsprops"
>
<UserMacro
Name="GtkSourceviewDoInstall"
@@ -14,7 +14,7 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GtkSourceviewDllPr
copy
$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GtkSourceviewDllPrefix)gtksourceview$(GtkSourceviewDllSuffix).pdb
$(CopyDir)\bin

mkdir $(CopyDir)\include\gtksourceview-$(ApiVersion)\gtksourceview\completion-providers\words

-#include "gtksourceview.headers"
+#include "gtksourceview-4.headers"
copy ..\..\..\gtksourceview\completion-providers\words\gtksourcecompletionwords.h
$(CopyDir)\include\gtksourceview-$(ApiVersion)\gtksourceview\completion-providers\words

mkdir $(CopyDir)\lib

diff --git a/build/win32/vs9/gtksourceview-version-paths.vsprops
b/build/win32/vs9/gtksourceview4-version-paths.vsprops
similarity index 92%
rename from build/win32/vs9/gtksourceview-version-paths.vsprops
rename to build/win32/vs9/gtksourceview4-version-paths.vsprops
index 8dc97da..f06fde9 100644
--- a/build/win32/vs9/gtksourceview-version-paths.vsprops
+++ b/build/win32/vs9/gtksourceview4-version-paths.vsprops
@@ -2,11 +2,11 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="gtksourceviewversionpathsprops"
+ Name="gtksourceview4versionpathsprops"
>
<UserMacro
Name="ApiVersion"
- Value="3.0"
+ Value="4"
/>
<UserMacro
Name="VSVer"
@@ -34,7 +34,7 @@
/>
<UserMacro
Name="GtkSourceviewLibtoolCompatibleDllSuffix"
- Value="-$(ApiVersion)-0"
+ Value="-$(ApiVersion).0-0"
/>
<UserMacro
Name="GtkSourceviewSeparateVSDllPrefix"
@@ -42,7 +42,7 @@
/>
<UserMacro
Name="GtkSourceviewSeparateVSDllSuffix"
- Value="-3-vs$(VSVer)"
+ Value="-vs$(VSVer)"
/>
<!-- Change these two to GtkSourceviewLibtoolCompatibleDllPrefix and
GtkSourceviewLibtoolCompatibleDllSuffix if that is what you want -->
diff --git a/configure.ac b/configure.ac
index eef5fa7..426393b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -226,9 +226,9 @@ config.h.win32
build/Makefile
build/win32/Makefile
build/win32/vs9/Makefile
-build/win32/vs9/gtksourceview-gen-srcs.vsprops
+build/win32/vs9/gtksourceview${GSV_API_VERSION}-gen-srcs.vsprops
build/win32/vs10/Makefile
-build/win32/vs10/gtksourceview-gen-srcs.props
+build/win32/vs10/gtksourceview${GSV_API_VERSION}-gen-srcs.props
build/win32/vs11/Makefile
build/win32/vs12/Makefile
build/win32/vs14/Makefile
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 886c94d..caf449c 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -353,21 +353,21 @@ gtksource_win32_more_sources = \
completion-providers/words/gtksourcecompletionwordsproposal.c \
completion-providers/words/gtksourcecompletionwordsutils.c
-MSVCPROJS = gtksourceview
+MSVCPROJS = gtksourceview-@GSV_API_VERSION@
-gtksourceview_FILES = \
+gtksourceview_@GSV_API_VERSION@_FILES = \
$(libgtksourceview_public_c_files) \
$(libgtksourceview_private_c_files) \
$(nodist_libgtksourceview_core_la_SOURCES) \
$(gtksource_win32_more_sources)
-gtksourceview_EXCLUDES = dummy
-gtksourceview_HEADERS_DIR = $(libgtksourceview_@GSV_API_VERSION@_includedir)
-gtksourceview_HEADERS_INST = \
+gtksourceview_@GSV_API_VERSION@_EXCLUDES = dummy
+gtksourceview_@GSV_API_VERSION@_HEADERS_DIR = $(libgtksourceview_@GSV_API_VERSION@_includedir)
+gtksourceview_@GSV_API_VERSION@_HEADERS_INST = \
$(libgtksourceview_public_headers) \
$(nodist_libgtksourceview_@GSV_API_VERSION@_include_HEADERS)
-gtksourceview_HEADERS_EXCLUDES = dummy
+gtksourceview_@GSV_API_VERSION@_HEADERS_EXCLUDES = dummy
include $(top_srcdir)/build/Makefile.msvcproj
@@ -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-3.0 Gdk-3.0
-GtkSource_@GSV_API_VERSION@_gir_MSVC_PACKAGES = gtk+-3.0 gdk-3.0
+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_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..\\..
@@ -414,9 +414,9 @@ NMAKE_INTROSPECTION_FILES =
endif
dist-hook: \
- $(top_builddir)/build/win32/enums.headers \
- $(top_builddir)/build/win32/vs9/gtksourceview.vcproj \
- $(top_builddir)/build/win32/vs9/gtksourceview.headers \
+ $(top_builddir)/build/win32/enums.headers \
+ $(top_builddir)/build/win32/vs9/gtksourceview-@GSV_API_VERSION@.vcproj \
+ $(top_builddir)/build/win32/vs9/gtksourceview-@GSV_API_VERSION@.headers \
$(NMAKE_INTROSPECTION_FILES)
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
