[gtkmm] MSVC Builds: Fix gtkmm3-demo Build

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtkmm] MSVC Builds: Fix gtkmm3-demo Build
Date: Fri, 11 Sep 2015 03:17:07 +0000 (UTC)
commit 1ce3e0e4b19564631e834bd78f72835cfb17d15a
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Sep 11 11:17:02 2015 +0800

    MSVC Builds: Fix gtkmm3-demo Build
    
    We are now using GResource to bundle the data files for gtkmm3-demo, so we
    need to adjust the build process for it, and stop copying the data files as
    a result.  Also update the projects so that the added demo sources can be
    included in the build.

 MSVC_Net2013/filelist.am                 |    1 +
 MSVC_Net2013/gtkmm-gen-srcs.props        |   17 +++++++++++++++++
 MSVC_Net2013/gtkmm-install.props         |    7 -------
 MSVC_Net2013/gtkmm3-demo.vcxproj         |   28 +++++++++++++++++++++++-----
 MSVC_Net2013/gtkmm3-demo.vcxproj.filters |    6 ++++++
 5 files changed, 47 insertions(+), 12 deletions(-)
---
diff --git a/MSVC_Net2013/filelist.am b/MSVC_Net2013/filelist.am
index 90acca4..12928c0 100644
--- a/MSVC_Net2013/filelist.am
+++ b/MSVC_Net2013/filelist.am
@@ -4,6 +4,7 @@ msvc_net2013_data =                             \
        README                                  \
        gtkmm.sln                               \
        gtkmm-build-defines.props               \
+       gtkmm-gen-srcs.props                    \
        gtkmm-version-paths.props               \
        gtkmm-install.props                     \
        gendef.vcxproj                          \
diff --git a/MSVC_Net2013/gtkmm-gen-srcs.props b/MSVC_Net2013/gtkmm-gen-srcs.props
new file mode 100644
index 0000000..15e3d54
--- /dev/null
+++ b/MSVC_Net2013/gtkmm-gen-srcs.props
@@ -0,0 +1,17 @@
+<?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="gtkmm-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <GenerateDemoRsrcSrc>$(GlibEtcInstallRoot)\bin\glib-compile-resources 
--target=..\demos\gtk-demo\demo_resources.c --sourcedir=..\demos\gtk-demo --generate-source 
..\demos\gtk-demo\demo.gresource.xml</GenerateDemoRsrcSrc>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>glibmmbuilddefinesprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="GenerateDemoRsrcSrc">
+      <Value>$(GenerateDemoRsrcSrc)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/MSVC_Net2013/gtkmm-install.props b/MSVC_Net2013/gtkmm-install.props
index 59b9e9b..75c2221 100644
--- a/MSVC_Net2013/gtkmm-install.props
+++ b/MSVC_Net2013/gtkmm-install.props
@@ -538,13 +538,6 @@ copy ..\gtk\gtkmm\private\windowgroup_p.h $(CopyDir)\include\gtkmm-$(ApiMajorVer
 
 copy .\gdkmm\gdkmmconfig.h $(CopyDir)\lib\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\include
 copy .\gtkmm\gtkmmconfig.h $(CopyDir)\lib\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\include
-
-mkdir $(CopyDir)\share\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\demo
-copy ..\demos\gtk-demo\*.cc $(CopyDir)\share\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\demo
-copy ..\demos\gtk-demo\*.h $(CopyDir)\share\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\demo
-copy /b ..\demos\gtk-demo\*.gif $(CopyDir)\share\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\demo
-copy /b ..\demos\gtk-demo\*.jpg $(CopyDir)\share\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\demo
-copy /b ..\demos\gtk-demo\*.png $(CopyDir)\share\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\demo
 </GtkmmDoInstall>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/MSVC_Net2013/gtkmm3-demo.vcxproj b/MSVC_Net2013/gtkmm3-demo.vcxproj
index e9f52bc..f4b845e 100644
--- a/MSVC_Net2013/gtkmm3-demo.vcxproj
+++ b/MSVC_Net2013/gtkmm3-demo.vcxproj
@@ -50,19 +50,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=".\gtkmm-build-defines.props" />
+    <Import Project=".\gtkmm-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=".\gtkmm-build-defines.props" />
+    <Import Project=".\gtkmm-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=".\gtkmm-build-defines.props" />
+    <Import Project=".\gtkmm-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=".\gtkmm-build-defines.props" />
+    <Import Project=".\gtkmm-gen-srcs.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -189,6 +189,7 @@
     <ClCompile Include="..\demos\gtk-demo\demo_resources.c" />
     <ClCompile Include="..\demos\gtk-demo\demowindow.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_appwindow.cc" />
+    <ClCompile Include="..\demos\gtk-demo\example_builder.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_buttonbox.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_change_display.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_colorsel.cc" />
@@ -198,7 +199,7 @@
     <ClCompile Include="..\demos\gtk-demo\example_gestures.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_glarea.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_headerbar.cc" />
-    <ClCompile Include="..\demos\gtk-demo\example_icontheme.cc" />
+    <ClCompile Include="..\demos\gtk-demo\example_iconbrowser.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_iconview.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_images.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_menus.cc" />
@@ -207,6 +208,7 @@
     <ClCompile Include="..\demos\gtk-demo\example_pixbufs.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_sizegroup.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_stack.cc" />
+    <ClCompile Include="..\demos\gtk-demo\example_stacksidebar.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_textview.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_treeview_editable_cells.cc" />
     <ClCompile Include="..\demos\gtk-demo\example_treeview_liststore.cc" />
@@ -220,6 +222,22 @@
     <ClInclude Include="..\demos\gtk-demo\textwidget.h" />
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="..\demos\gtk-demo\demo.gresource.xml">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Demo Resource 
Source...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateDemoRsrcSrc)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\demos\gtk-demo\demo_resources.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Demo Resource 
Source...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateDemoRsrcSrc)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\demos\gtk-demo\demo_resources.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Demo Resource 
Source...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateDemoRsrcSrc)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\demos\gtk-demo\demo_resources.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Demo Resource 
Source...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateDemoRsrcSrc)</Command>
+      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\demos\gtk-demo\demo_resources.c;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="gdkmm.vcxproj">
       <Project>{976c8f9c-1a1d-4e23-b79e-ec9091bbea0e}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/MSVC_Net2013/gtkmm3-demo.vcxproj.filters b/MSVC_Net2013/gtkmm3-demo.vcxproj.filters
index 460d4a4..1423ad3 100644
--- a/MSVC_Net2013/gtkmm3-demo.vcxproj.filters
+++ b/MSVC_Net2013/gtkmm3-demo.vcxproj.filters
@@ -18,6 +18,7 @@
     <ClCompile Include="..\demos\gtk-demo\demo_resources.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\demowindow.cc"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_appwindow.cc"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\demos\gtk-demo\example_builder.cc"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_buttonbox.cc"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_change_display.cc"><Filter>Source 
Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_colorsel.cc"><Filter>Source Files</Filter></ClCompile>
@@ -27,6 +28,7 @@
     <ClCompile Include="..\demos\gtk-demo\example_gestures.cc"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_glarea.cc"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_headerbar.cc"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\demos\gtk-demo\example_iconbrowser.cc"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_iconview.cc"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_images.cc"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_menus.cc"><Filter>Source Files</Filter></ClCompile>
@@ -35,6 +37,7 @@
     <ClCompile Include="..\demos\gtk-demo\example_pixbufs.cc"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_sizegroup.cc"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_stack.cc"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\demos\gtk-demo\example_stacksidebar.cc"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_textview.cc"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_treeview_editable_cells.cc"><Filter>Source 
Files</Filter></ClCompile>
     <ClCompile Include="..\demos\gtk-demo\example_treeview_liststore.cc"><Filter>Source 
Files</Filter></ClCompile>
@@ -47,4 +50,7 @@
     <ClInclude Include="..\demos\gtk-demo\demowindow.h"><Filter>Header Files</Filter></ClInclude>
     <ClInclude Include="..\demos\gtk-demo\textwidget.h"><Filter>Header Files</Filter></ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\demos\gtk-demo\demo.gresource.xml"><Filter>Resource Files</Filter></CustomBuild>
+  </ItemGroup>
 </Project>
\ No newline at end of file
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]