From c6aee1bf15795d0ae4367d6230424f977e1eade0 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 4 Jul 2016 12:43:36 +0800 Subject: [PATCH] Visual Studio builds: Build the gio tool https://bugzilla.gnome.org/show_bug.cgi?id=768357 --- build/win32/vs10/Makefile.am | 4 + build/win32/vs10/gio-tool.vcxproj.filtersin | 12 ++ build/win32/vs10/gio-tool.vcxprojin | 188 ++++++++++++++++++++ build/win32/vs10/glib-install.propsin | 2 + build/win32/vs10/glib-install.vcxproj | 4 + build/win32/vs10/glib.sln | 54 ++++-- build/win32/vs11/Makefile.am | 2 + build/win32/vs12/Makefile.am | 2 + build/win32/vs14/Makefile.am | 2 + build/win32/vs9/Makefile.am | 2 + build/win32/vs9/gio-tool.vcprojin | 173 ++++++++++++++++++ build/win32/vs9/glib-install.vspropsin | 2 + build/win32/vs9/glib.sln | 24 +++ gio/Makefile.am | 14 +- 14 files changed, 462 insertions(+), 23 deletions(-) create mode 100644 build/win32/vs10/gio-tool.vcxproj.filtersin create mode 100644 build/win32/vs10/gio-tool.vcxprojin create mode 100644 build/win32/vs9/gio-tool.vcprojin diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 096c9d00e..b6af7397f 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -9,6 +9,8 @@ GENERATED_ITEMS = \ glib-compile-schemas.vcxproj.filters \ glib-compile-resources.vcxproj \ glib-compile-resources.vcxproj.filters \ + gio-tool.vcxproj \ + gio-tool.vcxproj.filters \ glib-version-paths.props \ glib-install.props @@ -39,6 +41,8 @@ EXTRA_DIST = \ gsettings.vcxproj.filters \ glib-compile-resources.vcxprojin \ glib-compile-resources.vcxproj.filtersin \ + gio-tool.vcxprojin \ + gio-tool.vcxproj.filtersin \ gresource.vcxproj \ gresource.vcxproj.filters \ gio-querymodules.vcxproj \ diff --git a/build/win32/vs10/gio-tool.vcxproj.filtersin b/build/win32/vs10/gio-tool.vcxproj.filtersin new file mode 100644 index 000000000..42b9cdb75 --- /dev/null +++ b/build/win32/vs10/gio-tool.vcxproj.filtersin @@ -0,0 +1,12 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + +#include "gio-tool.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/gio-tool.vcxprojin b/build/win32/vs10/gio-tool.vcxprojin new file mode 100644 index 000000000..252e29de5 --- /dev/null +++ b/build/win32/vs10/gio-tool.vcxprojin @@ -0,0 +1,188 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338} + glibtool + Win32Proj + + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + ..\..\..\gio;%(AdditionalIncludeDirectories) + _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(OutDir)gio.exe + true + Console + $(OutDir)gio.pdb + MachineX86 + + + + + Disabled + ..\..\..\gio;%(AdditionalIncludeDirectories) + _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + $(OutDir)gio.exe + true + Console + false + + + $(OutDir)gio.pdb + MachineX64 + + + + + MaxSpeed + true + ..\..\..\gio;%(AdditionalIncludeDirectories) + $(GioInBuildMacro);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)gio.exe + true + Console + true + true + $(OutDir)gio.pdb + MachineX86 + + + + + ..\..\..\gio;%(AdditionalIncludeDirectories) + $(GioInBuildMacro);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + $(OutDir)gio.exe + true + Console + true + true + false + + + $(OutDir)gio.pdb + MachineX64 + + + +#include "gio-tool.vs10.sourcefiles" + + + + {f3d1583c-5613-4809-bd98-7cc1c1276f92} + false + + + {12bca020-eabf-429e-876a-a476bc9c10c0} + false + + + {f172effc-e30f-4593-809e-db2024b1e753} + false + + + + + + diff --git a/build/win32/vs10/glib-install.propsin b/build/win32/vs10/glib-install.propsin index ce2530e1b..e6b13a668 100644 --- a/build/win32/vs10/glib-install.propsin +++ b/build/win32/vs10/glib-install.propsin @@ -34,6 +34,8 @@ copy $(BinDir)\gio-querymodules.exe $(CopyDir)\bin copy $(BinDir)\gio-querymodules.pdb $(CopyDir)\bin copy $(BinDir)\gdbus.exe $(CopyDir)\bin copy $(BinDir)\gdbus.pdb $(CopyDir)\bin +copy $(BinDir)\gio.exe $(CopyDir)\bin +copy $(BinDir)\gio.pdb $(CopyDir)\bin copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen if exist ..\..\..\gobject\glib-mkenums copy ..\..\..\gobject\glib-mkenums $(CopyDir)\bin diff --git a/build/win32/vs10/glib-install.vcxproj b/build/win32/vs10/glib-install.vcxproj index e7ad0142c..faa440490 100644 --- a/build/win32/vs10/glib-install.vcxproj +++ b/build/win32/vs10/glib-install.vcxproj @@ -175,6 +175,10 @@ {95a1571f-61be-4c51-be53-2f2dab280687} false + + {d0403e9a-2b00-4fd3-b3dd-3c8f9cb9a338} + false + diff --git a/build/win32/vs10/glib.sln b/build/win32/vs10/glib.sln index 12b0d6443..848c2cffe 100644 --- a/build/win32/vs10/glib.sln +++ b/build/win32/vs10/glib.sln @@ -20,8 +20,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-schemas", "gli EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsettings", "gsettings.vcxproj", "{05041C63-F1C5-49BA-A7DE-61EBB5307EAA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-install", "glib-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gresource", "gresource.vcxproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280685}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-compile-resources", "glib-compile-resources.vcxproj", "{B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}" @@ -30,6 +28,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-querymodules", "gio-que EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdbus", "gdbus.vcxproj", "{95A1571F-61BE-4C51-BE53-2F2DAB280687}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-tool", "gio-tool.vcxproj", "{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-install", "glib-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -202,22 +204,6 @@ Global {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 {05041C63-F1C5-49BA-A7DE-61EBB5307EAA}.Release_BundledPCRE|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}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|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 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.Build.0 = Release|x64 {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.ActiveCfg = Debug|Win32 {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|Win32.Build.0 = Debug|Win32 {95A1571F-61BE-4C51-BE53-2F2DAB280685}.Debug|x64.ActiveCfg = Debug|x64 @@ -282,6 +268,38 @@ Global {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A}.Release_BundledPCRE|x64.Build.0 = Release|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.Build.0 = Release|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.ActiveCfg = Debug|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.Build.0 = Debug|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.ActiveCfg = Debug|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.Build.0 = Debug|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.ActiveCfg = Release|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.Build.0 = Release|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.ActiveCfg = Release|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.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}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|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 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release_BundledPCRE|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index 7900d7e41..d98d1db2c 100644 --- a/build/win32/vs11/Makefile.am +++ b/build/win32/vs11/Makefile.am @@ -23,6 +23,8 @@ EXTRA_DIST = \ gsettings.vcxproj.filters \ glib-compile-resources.vcxproj \ glib-compile-resources.vcxproj.filters \ + gio-tool.vcxproj \ + gio-tool.vcxproj.filters \ gresource.vcxproj \ gresource.vcxproj.filters \ gio-querymodules.vcxproj \ diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am index b4a9f3562..b863236ab 100644 --- a/build/win32/vs12/Makefile.am +++ b/build/win32/vs12/Makefile.am @@ -23,6 +23,8 @@ EXTRA_DIST = \ gsettings.vcxproj.filters \ glib-compile-resources.vcxproj \ glib-compile-resources.vcxproj.filters \ + gio-tool.vcxproj \ + gio-tool.vcxproj.filters \ gresource.vcxproj \ gresource.vcxproj.filters \ gio-querymodules.vcxproj \ diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am index 56f3110ba..a17e93112 100644 --- a/build/win32/vs14/Makefile.am +++ b/build/win32/vs14/Makefile.am @@ -23,6 +23,8 @@ EXTRA_DIST = \ gsettings.vcxproj.filters \ glib-compile-resources.vcxproj \ glib-compile-resources.vcxproj.filters \ + gio-tool.vcxproj \ + gio-tool.vcxproj.filters \ gresource.vcxproj \ gresource.vcxproj.filters \ gio-querymodules.vcxproj \ diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 1cc2b2159..bbc88197e 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -4,6 +4,7 @@ GENERATED_ITEMS = \ gio.vcproj \ glib-compile-schemas.vcproj \ glib-compile-resources.vcproj \ + gio-tool.vcproj \ glib-version-paths.vsprops \ glib-install.vsprops @@ -26,6 +27,7 @@ EXTRA_DIST = \ gdbus.vcproj \ glib-compile-schemas.vcprojin \ glib-compile-resources.vcprojin \ + gio-tool.vcprojin \ glib-install.vcproj \ glib-build-defines.vsprops \ glib-version-paths.vsprops.in \ diff --git a/build/win32/vs9/gio-tool.vcprojin b/build/win32/vs9/gio-tool.vcprojin new file mode 100644 index 000000000..87f1bf22d --- /dev/null +++ b/build/win32/vs9/gio-tool.vcprojin @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "gio-tool.sourcefiles" + + + + + + + + + diff --git a/build/win32/vs9/glib-install.vspropsin b/build/win32/vs9/glib-install.vspropsin index 41fd26299..a511ebbd9 100644 --- a/build/win32/vs9/glib-install.vspropsin +++ b/build/win32/vs9/glib-install.vspropsin @@ -36,6 +36,8 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio-querymodules.exe copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio-querymodules.pdb $(CopyDir)\bin copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.exe $(CopyDir)\bin copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.pdb $(CopyDir)\bin +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.exe $(CopyDir)\bin +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.pdb $(CopyDir)\bin copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen if exist ..\..\..\gobject\glib-mkenums copy ..\..\..\gobject\glib-mkenums $(CopyDir)\bin diff --git a/build/win32/vs9/glib.sln b/build/win32/vs9/glib.sln index 76c0648ac..9b593cbaa 100644 --- a/build/win32/vs9/glib.sln +++ b/build/win32/vs9/glib.sln @@ -83,6 +83,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdbus", "gdbus.vcproj", "{9 {F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gio-tool", "gio-tool.vcproj", "{D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}" + ProjectSection(ProjectDependencies) = postProject + {F3D1583C-5613-4809-BD98-7CC1C1276F92} = {F3D1583C-5613-4809-BD98-7CC1C1276F92} + {F172EFFC-E30F-4593-809E-DB2024B1E753} = {F172EFFC-E30F-4593-809E-DB2024B1E753} + {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-install", "glib-install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" ProjectSection(ProjectDependencies) = postProject {12BCA020-EABF-429E-876A-A476BC9C10C0} = {12BCA020-EABF-429E-876A-A476BC9C10C0} @@ -99,6 +106,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-install", "glib-instal {95A1571F-61BE-4C51-BE53-2F2DAB280685} = {95A1571F-61BE-4C51-BE53-2F2DAB280685} {95A1571F-61BE-4C51-BE53-2F2DAB280686} = {95A1571F-61BE-4C51-BE53-2F2DAB280686} {95A1571F-61BE-4C51-BE53-2F2DAB280687} = {95A1571F-61BE-4C51-BE53-2F2DAB280687} + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338} = {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338} EndProjectSection EndProject Global @@ -337,6 +345,22 @@ Global {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|Win32.Build.0 = Release|Win32 {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.ActiveCfg = Release|x64 {95A1571F-61BE-4C51-BE53-2F2DAB280687}.Release|x64.Build.0 = Release|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug_BundledPCRE|x64.Build.0 = Debug|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.ActiveCfg = Release|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|Win32.Build.0 = Release|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.ActiveCfg = Release|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release_BundledPCRE|x64.Build.0 = Release|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.ActiveCfg = Debug|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|Win32.Build.0 = Debug|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.ActiveCfg = Debug|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Debug|x64.Build.0 = Debug|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.ActiveCfg = Release|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|Win32.Build.0 = Release|Win32 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.ActiveCfg = Release|x64 + {D0403E9A-2B00-4FD3-B3DD-3C8F9CB9A338}.Release|x64.Build.0 = Release|x64 {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.ActiveCfg = Debug|Win32 {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|Win32.Build.0 = Debug|Win32 {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug_BundledPCRE|x64.ActiveCfg = Debug|x64 diff --git a/gio/Makefile.am b/gio/Makefile.am index 9829e73b0..7248eb190 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -914,7 +914,7 @@ gio_LDADD = libgio-2.0.la \ # ------ MSVC Project File Generation ------ # ------------------------------------------------------------------------ # -MSVCPROJS = gio glib-compile-resources glib-compile-schemas +MSVCPROJS = gio glib-compile-resources glib-compile-schemas gio-tool gio_FILES = \ $(gio_base_sources) \ @@ -935,14 +935,18 @@ glib_compile_resources_EXCLUDES = dummy glib_compile_schemas_FILES = $(glib_compile_schemas_SOURCES) glib_compile_schemas_EXCLUDES = dummy +gio_tool_FILES = $(gio_SOURCES) +gio_tool_EXCLUDES = dummy + include $(top_srcdir)/build/Makefile.msvcproj dist-hook: \ - $(BUILT_EXTRA_DIST) \ - $(top_builddir)/build/win32/vs9/gio.vcproj \ - $(top_builddir)/build/win32/vs9/gio.headers \ + $(BUILT_EXTRA_DIST) \ + $(top_builddir)/build/win32/vs9/gio.vcproj \ + $(top_builddir)/build/win32/vs9/gio.headers \ $(top_builddir)/build/win32/vs9/glib-compile-schemas.vcproj \ - $(top_builddir)/build/win32/vs9/glib-compile-resources.vcproj + $(top_builddir)/build/win32/vs9/glib-compile-resources.vcproj \ + $(top_builddir)/build/win32/vs9/gio-tool.vcproj files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \