From 8d7c93ba472fdc1391b97d319cad496103e8c317 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 16 May 2014 17:32:29 +0800 Subject: [PATCH] Visual Studio Builds: Build GtkInspector Add project files to build the GtkInspector sources, as gtk-inspector is a required portion for GTK+. "Install" the org.gtk.Settings.Debug.gschema.xml gsettings schema file as well, so that people can trigger GtkInspector as they develop and test their GTK+-based programs. --- build/win32/vs10/Makefile.am | 2 + build/win32/vs10/gtk+.sln | 18 +++ build/win32/vs10/gtk-inspector.vcxproj | 149 ++++++++++++++++++ .../win32/vs10/gtk-inspector.vcxproj.filters | 38 +++++ build/win32/vs10/gtk-install.props | 2 + build/win32/vs10/gtk.vcxprojin | 4 + build/win32/vs9/Makefile.am | 1 + build/win32/vs9/gtk+.sln | 22 +++ build/win32/vs9/gtk-inspector.vcproj | 148 +++++++++++++++++ build/win32/vs9/gtk-install.vsprops | 1 + 10 files changed, 385 insertions(+) create mode 100644 build/win32/vs10/gtk-inspector.vcxproj create mode 100644 build/win32/vs10/gtk-inspector.vcxproj.filters create mode 100644 build/win32/vs9/gtk-inspector.vcproj diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 6f0c38353b..54ca65debf 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -22,6 +22,8 @@ EXTRA_DIST += \ gtka11y.vcxproj.filters \ gtka11y.vcxprojin \ gtka11y.vcxproj.filtersin \ + gtk-inspector.vcxproj \ + gtk-inspector.vcxproj.filters \ gailutil.vcxproj \ gailutil.vcxproj.filters \ install.vcxproj \ diff --git a/build/win32/vs10/gtk+.sln b/build/win32/vs10/gtk+.sln index 505c6a3d0a..911816fd49 100644 --- a/build/win32/vs10/gtk+.sln +++ b/build/win32/vs10/gtk+.sln @@ -12,6 +12,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5A EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-inspector", "gtk-inspector.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}" @@ -122,6 +124,22 @@ Global {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|Win32.Build.0 = Release|Win32 {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.ActiveCfg = Release|x64 {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release_Broadway|x64.Build.0 = Release|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.ActiveCfg = Debug|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.Build.0 = Debug|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.ActiveCfg = Debug|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.Build.0 = Debug|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.ActiveCfg = Release|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.Build.0 = Release|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.ActiveCfg = Release|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.Build.0 = Release|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.Build.0 = Debug|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.ActiveCfg = Debug|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.Build.0 = Debug|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.ActiveCfg = Release|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.Build.0 = Release|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.ActiveCfg = Release|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.Build.0 = Release|x64 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/build/win32/vs10/gtk-inspector.vcxproj b/build/win32/vs10/gtk-inspector.vcxproj new file mode 100644 index 0000000000..b97c515b5f --- /dev/null +++ b/build/win32/vs10/gtk-inspector.vcxproj @@ -0,0 +1,149 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD} + gtkinspector + Win32Proj + + + + StaticLibrary + MultiByte + true + v100 + + + StaticLibrary + MultiByte + v100 + + + StaticLibrary + MultiByte + true + v100 + + + StaticLibrary + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + + Disabled + ..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + + + ..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories) + $(GtkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + + + Disabled + ..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + + + ..\..\..\gtk;..\..\..\gdk;%(AdditionalIncludeDirectories) + $(GtkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + + + + + + + + + + + + + + + + + + + + + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff} + false + + + + + + diff --git a/build/win32/vs10/gtk-inspector.vcxproj.filters b/build/win32/vs10/gtk-inspector.vcxproj.filters new file mode 100644 index 0000000000..7913b08fdc --- /dev/null +++ b/build/win32/vs10/gtk-inspector.vcxproj.filters @@ -0,0 +1,38 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + + diff --git a/build/win32/vs10/gtk-install.props b/build/win32/vs10/gtk-install.props index 7678b2112e..4711dd73de 100644 --- a/build/win32/vs10/gtk-install.props +++ b/build/win32/vs10/gtk-install.props @@ -772,6 +772,8 @@ copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib 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 diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin index 0f56406f29..215bc31136 100644 --- a/build/win32/vs10/gtk.vcxprojin +++ b/build/win32/vs10/gtk.vcxprojin @@ -204,6 +204,10 @@ {f756b0db-40a1-4e9f-be1f-8f02cb86ea46} false + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fd} + false + diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 47eb5066e8..5e93e61041 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -13,6 +13,7 @@ EXTRA_DIST += \ gtk3-demo-application.vcproj \ gtka11y.vcproj \ gtka11y.vcprojin \ + gtk-inspector.vcproj \ gailutil.vcproj \ install.vcproj \ broadwayd.vcproj \ diff --git a/build/win32/vs9/gtk+.sln b/build/win32/vs9/gtk+.sln index 164b76d22a..38063b63e9 100644 --- a/build/win32/vs9/gtk+.sln +++ b/build/win32/vs9/gtk+.sln @@ -28,10 +28,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcproj", {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-inspector", "gtk-inspector.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}" + ProjectSection(ProjectDependencies) = postProject + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}" ProjectSection(ProjectDependencies) = postProject {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46} = {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46} + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}" @@ -138,6 +144,22 @@ Global {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.ActiveCfg = Debug|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|Win32.Build.0 = Debug|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.ActiveCfg = Debug|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug|x64.Build.0 = Debug|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.ActiveCfg = Release|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|Win32.Build.0 = Release|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.ActiveCfg = Release|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release|x64.Build.0 = Release|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|Win32.Build.0 = Debug|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.ActiveCfg = Debug|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Debug_Broadway|x64.Build.0 = Debug|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.ActiveCfg = Release|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|Win32.Build.0 = Release|Win32 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.ActiveCfg = Release|x64 + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FD}.Release_Broadway|x64.Build.0 = Release|x64 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32 {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/build/win32/vs9/gtk-inspector.vcproj b/build/win32/vs9/gtk-inspector.vcproj new file mode 100644 index 0000000000..bfecdbcec3 --- /dev/null +++ b/build/win32/vs9/gtk-inspector.vcproj @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gtk-install.vsprops b/build/win32/vs9/gtk-install.vsprops index ccff886ee6..b1a1168458 100644 --- a/build/win32/vs9/gtk-install.vsprops +++ b/build/win32/vs9/gtk-install.vsprops @@ -404,6 +404,7 @@ copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\h 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 echo "Compiling gsettings XML Files..."