[gtk+] Visual Studio builds: Include Vulkan sources in GSK
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Visual Studio builds: Include Vulkan sources in GSK
- Date: Thu, 29 Dec 2016 17:15:56 +0000 (UTC)
commit 391ea68671d594ed4a1ee5f1f885e17d9eadc6dd
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Dec 30 01:08:07 2016 +0800
Visual Studio builds: Include Vulkan sources in GSK
...but disable them for now. Configs will be added for the projects to
support Vulkan-enabled builds which will then enable the builds of these
sources. Extra commands and items will be needed for the GSK resources
along with ensuring GSK_RENDERER_GSK being defined for the build of GDK,
GDK-Win32 and GSK so that the builds of Vulkan-enabled builds can be done
properly.
Filter out the Vulkan sources from the 'dist hook' rules in
gsk/Makefile.am as we don't want to in turn include them twice in the
projects when the 'make dist' is performed on a system with Vulkan
builds enabled.
build/win32/vs12/gsk-4.vcxproj.filtersin | 14 +++++++
build/win32/vs12/gsk-4.vcxprojin | 56 ++++++++++++++++++++++++++++++
gsk/Makefile.am | 2 +-
3 files changed, 71 insertions(+), 1 deletions(-)
---
diff --git a/build/win32/vs12/gsk-4.vcxproj.filtersin b/build/win32/vs12/gsk-4.vcxproj.filtersin
index 6b1f1c3..2cd5a45 100755
--- a/build/win32/vs12/gsk-4.vcxproj.filtersin
+++ b/build/win32/vs12/gsk-4.vcxproj.filtersin
@@ -20,5 +20,19 @@
</ItemGroup>
<ItemGroup>
#include "gsk-4.vs12.sourcefiles.filters"
+ <ClCompile Include="..\..\..\gsk\gskvulkanblendpipeline.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanbuffer.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanclip.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkancolorpipeline.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkancommandpool.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanlineargradientpipeline.c"><Filter>Source
Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanimage.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanmemory.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanpipeline.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanpushconstants.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanrender.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanrenderer.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanrenderpass.c"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanshader.c"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
diff --git a/build/win32/vs12/gsk-4.vcxprojin b/build/win32/vs12/gsk-4.vcxprojin
index 7206216..0e32c2e 100755
--- a/build/win32/vs12/gsk-4.vcxprojin
+++ b/build/win32/vs12/gsk-4.vcxprojin
@@ -154,6 +154,62 @@
</ItemGroup>
<ItemGroup>
#include "gsk-4.vs12.sourcefiles"
+ <ClCompile Include="..\..\..\gsk\gskvulkanblendpipeline.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanbuffer.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanclip.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkancolorpipeline.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkancommandpool.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanlineargradientpipeline.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanimage.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanmemory.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanpipeline.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanpushconstants.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanrender.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanrenderer.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanrenderpass.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\gsk\gskvulkanshader.c">
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
+ </ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/gsk/Makefile.am b/gsk/Makefile.am
index 31dc094..922c727 100644
--- a/gsk/Makefile.am
+++ b/gsk/Makefile.am
@@ -211,7 +211,7 @@ endif
MSVCPROJS = gsk-4
gsk_4_FILES = $(all_sources) $(gsk_built_source_c)
-gsk_4_EXCLUDES = dummy
+gsk_4_EXCLUDES = gskvulkan*.c
gsk_4_HEADERS_DIR = $(gskincludedir)
gsk_4_HEADERS_INST = $(gskinclude_HEADERS)
gsk_4_HEADERS_EXCLUDES = dummy
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]