[gtk+] Visual Studio builds: Drop the Broadway projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Visual Studio builds: Drop the Broadway projects
- Date: Fri, 30 Dec 2016 03:14:15 +0000 (UTC)
commit ee2f5779914711160d9df653009e79eb01fc7d1a
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Dec 30 11:09:46 2016 +0800
Visual Studio builds: Drop the Broadway projects
Since the status of the GDK broadway backend is more or less unsupported,
drop the projects that build gtk4-broadwayd and gdk-broadway, and update
the projects to not to refer to them.
However, keep the Broadway configs for now as we will later transform
them to become configs for Vulkan, so bascially besides "installation"
parts and output settings, they will do the same as their Release|Debug
counterparts with no support for Broadway.
build/win32/vs12/Makefile.am | 11 ---
build/win32/vs12/gdk-4.vcxprojin | 8 +-
build/win32/vs12/gtk+-4.sln | 28 -------
build/win32/vs12/gtk-4.vcxprojin | 52 +++++++------
build/win32/vs12/gtk4-build-defines.props | 4 +
build/win32/vs12/gtk4-install.propsin | 123 +++++++++++++----------------
build/win32/vs14/Makefile.am | 6 --
gdk/broadway/Makefile.am | 21 -----
gdk/gdkconfig.h.win32_broadway | 2 +-
9 files changed, 93 insertions(+), 162 deletions(-)
---
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index bb64db2..dee68b9 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -3,16 +3,12 @@ include $(top_srcdir)/Makefile.decl
GENERATED_ITEMS = \
gdk4-win32.vcxproj \
gdk4-win32.vcxproj.filters \
- gdk4-broadway.vcxproj \
- gdk4-broadway.vcxproj.filters \
gdk-4.vcxproj \
gdk-4.vcxproj.filters \
gsk-4.vcxproj \
gsk-4.vcxproj.filters \
gtk-4.vcxproj \
gtk-4.vcxproj.filters \
- gtk4-broadwayd.vcxproj \
- gtk4-broadwayd.vcxproj.filters \
gtk4-demo.vcxproj \
gtk4-demo.vcxproj.filters \
gtk4-demo-application.vcxproj \
@@ -24,7 +20,6 @@ GENERATED_ITEMS = \
MSVC12_HEADERS_LISTS = \
gdk4-win32.vs12.headers \
- gdk4-broadway.vs12.headers \
gdk-4.vs12.headers \
gsk-4.vs12.headers \
gtk-4.vs12.headers
@@ -36,16 +31,12 @@ EXTRA_DIST += \
gtk4-prebuild.vcxproj.filters \
gdk4-win32.vcxprojin \
gdk4-win32.vcxproj.filtersin \
- gdk4-broadway.vcxprojin \
- gdk4-broadway.vcxproj.filtersin \
gdk-4.vcxprojin \
gdk-4.vcxproj.filtersin \
gsk-4.vcxprojin \
gsk-4.vcxproj.filtersin \
gtk-4.vcxprojin \
gtk-4.vcxproj.filtersin \
- gtk4-broadwayd.vcxprojin \
- gtk4-broadwayd.vcxproj.filtersin \
gtk4-builder-tool.vcxproj \
gtk4-builder-tool.vcxproj.filters \
gtk4-encode-symbolic-svg.vcxproj \
@@ -63,9 +54,7 @@ EXTRA_DIST += \
gtk4-install.vcxproj \
gtk4-install.vcxproj.filters \
gtk4-build-defines.props \
- gtk4-copy-gtk-broadway.props \
gtk4-gen-srcs.props \
- gtk4-ignore-broadway.props \
gtk4-install.propsin \
gtk4-version-paths.props.in \
$(GENERATED_ITEMS)
diff --git a/build/win32/vs12/gdk-4.vcxprojin b/build/win32/vs12/gdk-4.vcxprojin
index 8a9775c..96e16f5 100644
--- a/build/win32/vs12/gdk-4.vcxprojin
+++ b/build/win32/vs12/gdk-4.vcxprojin
@@ -147,7 +147,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -171,7 +171,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -197,7 +197,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -221,7 +221,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
diff --git a/build/win32/vs12/gtk+-4.sln b/build/win32/vs12/gtk+-4.sln
index 0c94a77..cdadd0b 100644
--- a/build/win32/vs12/gtk+-4.sln
+++ b/build/win32/vs12/gtk+-4.sln
@@ -4,10 +4,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-prebuild", "gtk4-prebu
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk4-win32", "gdk4-win32.vcxproj",
"{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk4-broadway", "gdk4-broadway.vcxproj",
"{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-broadwayd", "gtk4-broadwayd.vcxproj",
"{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-4", "gdk-4.vcxproj",
"{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsk-4", "gsk-4.vcxproj",
"{5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}"
@@ -74,30 +70,6 @@ Global
{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|Win32.Build.0 = Release|Win32
{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|x64.ActiveCfg = Release|x64
{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|x64.Build.0 = Release|x64
- {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
- {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
- {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
- {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
- {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug|Win32.ActiveCfg = Debug_Broadway|Win32
- {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug|x64.ActiveCfg = Debug_Broadway|x64
- {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|Win32.ActiveCfg =
Release_Broadway|Win32
- {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
- {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
- {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
- {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release|Win32.ActiveCfg = Release_Broadway|Win32
- {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release|x64.ActiveCfg = Release_Broadway|x64
- {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32
- {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32
- {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64
- {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64
- {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug|Win32.ActiveCfg = Debug_Broadway|Win32
- {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug|x64.ActiveCfg = Debug_Broadway|x64
- {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|Win32.ActiveCfg =
Release_Broadway|Win32
- {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32
- {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64
- {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|x64.Build.0 = Release_Broadway|x64
- {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release|Win32.ActiveCfg = Release_Broadway|Win32
- {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release|x64.ActiveCfg = Release_Broadway|x64
{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|Win32.ActiveCfg = Debug|Win32
{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|Win32.Build.0 = Debug|Win32
{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/build/win32/vs12/gtk-4.vcxprojin b/build/win32/vs12/gtk-4.vcxprojin
index e62ae94..0af1112 100644
--- a/build/win32/vs12/gtk-4.vcxprojin
+++ b/build/win32/vs12/gtk-4.vcxprojin
@@ -89,35 +89,35 @@
</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="gtk4-ignore-broadway.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk4-copy-gtk-broadway.props" />
+ <Import Project="gtk4-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="gtk4-ignore-broadway.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk4-copy-gtk-broadway.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</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="gtk4-ignore-broadway.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk4-copy-gtk-broadway.props" />
+ <Import Project="gtk4-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="gtk4-ignore-broadway.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="gtk4-copy-gtk-broadway.props" />
+ <Import Project="gtk4-gen-srcs.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -149,6 +149,7 @@
<ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+ <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
@@ -168,10 +169,11 @@
</ClCompile>
<Link>
<AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
- <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+
<OutputFile>$(SolutionDir)Debug\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+ <ImportLibrary>$(SolutionDir)Debug\$(Platform)\bin\$(ProjectName).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+
<ProgramDatabaseFile>$(SolutionDir)Debug\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+ <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
@@ -192,6 +194,7 @@
<ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+ <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -210,10 +213,11 @@
</ClCompile>
<Link>
<AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
- <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+
<OutputFile>$(SolutionDir)Release\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+ <ImportLibrary>$(SolutionDir)Release\$(Platform)\bin\$(ProjectName).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+
<ProgramDatabaseFile>$(SolutionDir)Release\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+ <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -239,6 +243,7 @@
<ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+ <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
</Link>
@@ -258,10 +263,11 @@
</ClCompile>
<Link>
<AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
- <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+
<OutputFile>$(SolutionDir)Debug\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+ <ImportLibrary>$(SolutionDir)Debug\$(Platform)\bin\$(ProjectName).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+
<ProgramDatabaseFile>$(SolutionDir)Debug\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+ <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
</Link>
@@ -282,6 +288,7 @@
<ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+ <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -300,10 +307,11 @@
</ClCompile>
<Link>
<AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
- <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+
<OutputFile>$(SolutionDir)Release\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+ <ImportLibrary>$(SolutionDir)Release\$(Platform)\bin\$(ProjectName).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+
<ProgramDatabaseFile>$(SolutionDir)Release\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
+ <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -417,10 +425,6 @@
<Manifest Include="..\..\..\gtk\libgtk4.manifest" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="gdk4-broadway.vcxproj">
- <Project>{1df4c475-4472-4ee4-ac2b-3ab5a4c1a453}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
<ProjectReference Include="gdk4-win32.vcxproj">
<Project>{aba7685a-7cbb-4626-b5e5-6eeea5b489ef}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/build/win32/vs12/gtk4-build-defines.props b/build/win32/vs12/gtk4-build-defines.props
index f46f7f2..d16ec2b 100644
--- a/build/win32/vs12/gtk4-build-defines.props
+++ b/build/win32/vs12/gtk4-build-defines.props
@@ -15,6 +15,7 @@
<GdkAdditionalLibs>winmm.lib;dwmapi.lib;setupapi.lib;$(GtkGdkCommonLibs)</GdkAdditionalLibs>
<GdkBroadwayAdditionalLibs>ws2_32.lib</GdkBroadwayAdditionalLibs>
<GtkAdditionalLibs>atk-1.0.lib;pangowin32-1.0.lib;winspool.lib;comctl32.lib;$(GdkAdditionalLibs)</GtkAdditionalLibs>
+ <GtkExportGdkWin32DisplayMgr>/EXPORT:gdk_win32_display_manager_get_type</GtkExportGdkWin32DisplayMgr>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>gtk4builddefinesprops</_PropertySheetDisplayName>
@@ -65,5 +66,8 @@
<BuildMacro Include="GtkAdditionalLibs">
<Value>$(GtkAdditionalLibs)</Value>
</BuildMacro>
+ <BuildMacro Include="GtkExportGdkWin32DisplayMgr">
+ <Value>$(GtkExportGdkWin32DisplayMgr)</Value>
+ </BuildMacro>
</ItemGroup>
</Project>
diff --git a/build/win32/vs12/gtk4-install.propsin b/build/win32/vs12/gtk4-install.propsin
index bc843fc..2a6ea09 100644
--- a/build/win32/vs12/gtk4-install.propsin
+++ b/build/win32/vs12/gtk4-install.propsin
@@ -9,77 +9,71 @@
mkdir $(CopyDir)\bin
mkdir $(CopyDir)\lib\pkgconfig
-if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN
-if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN
-copy "$(BinDir)\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll" $(CopyDir)\bin
-copy "$(BinDir)\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk-$(ApiVersionShort).lib" $(CopyDir)\lib
-copy "$(BinDir)\gtk4-demo.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-demo.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-demo-application.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-demo-application.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-icon-browser.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-icon-browser.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-encode-symbolic-svg.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-encode-symbolic-svg.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-update-icon-cache.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-update-icon-cache.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-query-settings.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-query-settings.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-builder-tool.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk4-builder-tool.pdb" $(CopyDir)\bin
-goto DONE_BIN
-
-:DO_BROADWAY_BIN
-copy "$(BinDir)\broadwayd.exe" $(CopyDir)\bin
-copy "$(BinDir)\broadwayd.pdb" $(CopyDir)\bin
-
if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_RELEASE
if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG
+
+copy "$(BinDir)\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).dll" $(CopyDir)\bin
+copy "$(BinDir)\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk-$(ApiVersionShort).lib" $(CopyDir)\lib
+copy "$(BinDir)\gtk$(ApiVersionShort)-demo.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-demo.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-demo-application.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-demo-application.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-icon-browser.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-icon-browser.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-encode-symbolic-svg.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-encode-symbolic-svg.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-update-icon-cache.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-update-icon-cache.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-query-settings.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-query-settings.pdb" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-builder-tool.exe" $(CopyDir)\bin
+copy "$(BinDir)\gtk$(ApiVersionShort)-builder-tool.pdb" $(CopyDir)\bin
+
:DO_BROADWAY_RELEASE
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).dll $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).pdb $(CopyDir)\bin
copy .\Release\$(Platform)\bin\gtk-$(ApiVersionShort).lib $(CopyDir)\lib
-copy .\Release\$(Platform)\bin\gtk4-demo.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-demo.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-demo-application.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-demo-application.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-icon-browser.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-icon-browser.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-encode-symbolic-svg.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-encode-symbolic-svg.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-update-icon-cache.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-update-icon-cache.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-query-settings.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-query-settings.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-builder-tool.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk4-builder-tool.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-demo.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-demo.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-demo-application.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-demo-application.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-icon-browser.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-icon-browser.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-encode-symbolic-svg.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-encode-symbolic-svg.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-update-icon-cache.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-update-icon-cache.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-query-settings.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-query-settings.pdb $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-builder-tool.exe $(CopyDir)\bin
+copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-builder-tool.pdb $(CopyDir)\bin
goto DONE_BIN
:DO_BROADWAY_DEBUG
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).dll $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).pdb $(CopyDir)\bin
copy .\Debug\$(Platform)\bin\gtk-$(ApiVersionShort).lib $(CopyDir)\lib
-copy .\Debug\$(Platform)\bin\gtk4-demo.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-demo.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-demo-application.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-demo-application.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-icon-browser.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-icon-browser.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-encode-symbolic-svg.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-encode-symbolic-svg.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-update-icon-cache.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-update-icon-cache.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-query-settings.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-query-settings.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-builder-tool.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk4-builder-tool.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-demo.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-demo.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-demo-application.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-demo-application.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-icon-browser.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-icon-browser.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-encode-symbolic-svg.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-encode-symbolic-svg.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-update-icon-cache.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-update-icon-cache.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-query-settings.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-query-settings.pdb $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-builder-tool.exe $(CopyDir)\bin
+copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-builder-tool.pdb $(CopyDir)\bin
:DONE_BIN
-copy "..\gtk+-4.0.pc" $(CopyDir)\lib\pkgconfig
-copy "..\gtk+-4.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-4.0.pc"
+copy "..\gtk+-$(ApiVersion).pc" $(CopyDir)\lib\pkgconfig
+copy "..\gtk+-$(ApiVersion).pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-$(ApiVersion).pc"
</GtkDoInstallBin>
<GtkDoInstall>
echo off
@@ -96,28 +90,23 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
#include "gtk-4.vs12.headers"
-for %%s in (16 22 24 32 48 256) do ((mkdir
$(CopyDir)\share\icons\hicolor\%%sx%%s\apps) & (copy /b
..\..\..\demos\gtk-demo\data\%%sx%%s\gtk4-demo.png
$(CopyDir)\share\icons\hicolor\%%sx%%s\apps))
+for %%s in (16 22 24 32 48 256) do ((mkdir
$(CopyDir)\share\icons\hicolor\%%sx%%s\apps) & (copy /b
..\..\..\demos\gtk-demo\data\%%sx%%s\gtk$(ApiVersionShort)-demo.png
$(CopyDir)\share\icons\hicolor\%%sx%%s\apps))
mkdir $(CopyDir)\share\glib-2.0\schemas
copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas
copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
</GtkDoInstall>
- <GtkDoInstallBroadwayHeaders>
-copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway
-#include "gdk4-broadway.vs12.headers"
- </GtkDoInstallBroadwayHeaders>
<GtkPostInstall>
echo "Compiling gsettings XML Files..."
$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
echo "Generating icon cache......"
-$(CopyDir)\bin\gtk4-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
+$(CopyDir)\bin\gtk$(ApiVersionShort)-update-icon-cache.exe --ignore-theme-index --force
"$(CopyDir)\share\icons\hicolor"
</GtkPostInstall>
<GenerateGtkPC>$(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion)
--host=i686-pc-vs$(VSVer)</GenerateGtkPC>
<GenerateGtkPCX64>$(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion)
--host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
- <GtkPCFiles>..\gtk+-4.0.pc</GtkPCFiles>
+ <GtkPCFiles>..\gtk+-$(ApiVersion).pc</GtkPCFiles>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>gtk4installsprops</_PropertySheetDisplayName>
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
index 4fa7a23..7ffc804 100644
--- a/build/win32/vs14/Makefile.am
+++ b/build/win32/vs14/Makefile.am
@@ -29,14 +29,8 @@ EXTRA_DIST += \
gtk4-icon-browser.vcxproj.filters \
gtk4-install.vcxproj \
gtk4-install.vcxproj.filters \
- gtk4-broadwayd.vcxproj \
- gtk4-broadwayd.vcxproj.filters \
- gdk4-broadway.vcxproj \
- gdk4-broadway.vcxproj.filters \
gtk4-build-defines.props \
- gtk4-copy-gtk-broadway.props \
gtk4-gen-srcs.props \
- gtk4-ignore-broadway.props \
gtk4-install.props \
gtk4-version-paths.props
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index 59c181e..47e6ed3 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -105,25 +105,4 @@ EXTRA_DIST += $(broadway_built_sources)
BUILT_SOURCES = $(broadway_built_sources)
-# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gdk4-broadway gtk4-broadwayd
-
-gdk4_broadway_FILES = $(libgdk_broadway_la_SOURCES)
-gdk4_broadway_EXCLUDES = dummy
-gdk4_broadway_HEADERS_DIR = $(libgdkbroadwayincludedir)
-
-gdk4_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS)
-
-gdk4_broadway_HEADERS_EXCLUDES = dummy
-
-gtk4_broadwayd_FILES = $(gtk4_broadwayd_SOURCES)
-gtk4_broadwayd_EXCLUDES = dummy
-
-include $(top_srcdir)/build/Makefile.msvcproj
-
-dist-hook: \
- $(top_builddir)/build/win32/vs12/gdk4-broadway.vcxproj \
- $(top_builddir)/build/win32/vs12/gtk4-broadwayd.vcxproj \
- $(top_builddir)/build/win32/vs12/gdk4-broadway.vs12.headers
-
-include $(top_srcdir)/git.mk
diff --git a/gdk/gdkconfig.h.win32_broadway b/gdk/gdkconfig.h.win32_broadway
index f5021f9..39be5c7 100644
--- a/gdk/gdkconfig.h.win32_broadway
+++ b/gdk/gdkconfig.h.win32_broadway
@@ -16,7 +16,7 @@ G_BEGIN_DECLS
#define GDK_WINDOWING_WIN32
-#define GDK_WINDOWING_BROADWAY
+/* #define GDK_WINDOWING_BROADWAY */
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]