From d02a834df1d1d3ab2c161fc6bea34d69d65a313d Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 12 Nov 2015 17:14:01 +0800 Subject: MSVC builds: Rename "install" project Rename it to "gi-install" so that it will not conflict with the other projects in the GTK+ stack if used as a part of an all-in-one solution file. --- build/win32/vs10/Makefile.am | 2 +- build/win32/vs10/gi-install.vcxproj | 124 +++++++++++++++++++++++++++++ build/win32/vs10/gobject-introspection.sln | 2 +- build/win32/vs10/install.vcxproj | 124 ----------------------------- 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/gi-install.vcproj | 77 ++++++++++++++++++ build/win32/vs9/gobject-introspection.sln | 2 +- build/win32/vs9/install.vcproj | 77 ------------------ 11 files changed, 208 insertions(+), 208 deletions(-) create mode 100644 build/win32/vs10/gi-install.vcxproj delete mode 100644 build/win32/vs10/install.vcxproj create mode 100644 build/win32/vs9/gi-install.vcproj delete mode 100644 build/win32/vs9/install.vcproj (limited to 'build') diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 297224c2..c22e86cf 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -29,7 +29,7 @@ EXTRA_DIST = \ glib-print.vcxproj.filters \ _giscanner.vcxproj \ _giscanner.vcxproj.filters \ - install.vcxproj \ + gi-install.vcxproj \ README.txt \ $(GENERATED_ITEMS) diff --git a/build/win32/vs10/gi-install.vcxproj b/build/win32/vs10/gi-install.vcxproj new file mode 100644 index 00000000..808acd46 --- /dev/null +++ b/build/win32/vs10/gi-install.vcxproj @@ -0,0 +1,124 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2093D218-190E-4194-9421-3BA7CBF33B10} + install + Win32Proj + + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + + + + + + + + + + + + Installing Build Results... + $(GIDoInstall) + $(InstalledDlls);$(InstalledBins);%(Outputs) + Installing Build Results... + $(GIDoInstall) + $(InstalledDlls);$(InstalledBins);%(Outputs) + Installing Build Results... + $(GIDoInstall) + $(InstalledDlls);$(InstalledBins);%(Outputs) + Installing Build Results... + $(GIDoInstall) + $(InstalledDlls);$(InstalledBins);%(Outputs) + + + + + {5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774} + false + + + {f4e6621f-a7dd-4863-8ccf-ba04dfc601e3} + false + + + {23e28245-8fc7-4b41-b1c5-8785bd4366a7} + false + + + {8311394f-9114-4c97-80f2-51bcaba054c9} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/gobject-introspection.sln b/build/win32/vs10/gobject-introspection.sln index 49271a54..25bb9219 100644 --- a/build/win32/vs10/gobject-introspection.sln +++ b/build/win32/vs10/gobject-introspection.sln @@ -17,7 +17,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-gener EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcxproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-install", "gi-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj deleted file mode 100644 index 808acd46..00000000 --- a/build/win32/vs10/install.vcxproj +++ /dev/null @@ -1,124 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2093D218-190E-4194-9421-3BA7CBF33B10} - install - Win32Proj - - - - Utility - MultiByte - true - v100 - - - Utility - MultiByte - v100 - - - Utility - MultiByte - true - v100 - - - Utility - MultiByte - v100 - - - - - - - - - - - - - - - - - - - - - - - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - - - - - - - - - - - - - Installing Build Results... - $(GIDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(GIDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(GIDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - Installing Build Results... - $(GIDoInstall) - $(InstalledDlls);$(InstalledBins);%(Outputs) - - - - - {5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774} - false - - - {f4e6621f-a7dd-4863-8ccf-ba04dfc601e3} - false - - - {23e28245-8fc7-4b41-b1c5-8785bd4366a7} - false - - - {8311394f-9114-4c97-80f2-51bcaba054c9} - false - - - - - - \ No newline at end of file diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index 6dd3b650..9c19974c 100644 --- a/build/win32/vs11/Makefile.am +++ b/build/win32/vs11/Makefile.am @@ -20,7 +20,7 @@ EXTRA_DIST = \ glib-print.vcxproj.filters \ _giscanner.vcxproj \ _giscanner.vcxproj.filters \ - install.vcxproj \ + gi-install.vcxproj \ README.txt DISTCLEANFILES = $(EXTRA_DIST) diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am index c4b8bc5c..2ec8bd1a 100644 --- a/build/win32/vs12/Makefile.am +++ b/build/win32/vs12/Makefile.am @@ -20,7 +20,7 @@ EXTRA_DIST = \ glib-print.vcxproj.filters \ _giscanner.vcxproj \ _giscanner.vcxproj.filters \ - install.vcxproj \ + gi-install.vcxproj \ README.txt DISTCLEANFILES = $(EXTRA_DIST) diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am index f6138f22..cc958310 100644 --- a/build/win32/vs14/Makefile.am +++ b/build/win32/vs14/Makefile.am @@ -20,7 +20,7 @@ EXTRA_DIST = \ glib-print.vcxproj.filters \ _giscanner.vcxproj \ _giscanner.vcxproj.filters \ - install.vcxproj \ + gi-install.vcxproj \ README.txt DISTCLEANFILES = $(EXTRA_DIST) diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 0c5845d8..725a18a5 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -18,7 +18,7 @@ EXTRA_DIST = \ g-ir-compiler.vcprojin \ g-ir-generate.vcproj \ glib-print.vcproj \ - install.vcproj \ + gi-install.vcproj \ _giscanner.vcproj \ README.txt \ $(GENERATED_ITEMS) diff --git a/build/win32/vs9/gi-install.vcproj b/build/win32/vs9/gi-install.vcproj new file mode 100644 index 00000000..58ad177b --- /dev/null +++ b/build/win32/vs9/gi-install.vcproj @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gobject-introspection.sln b/build/win32/vs9/gobject-introspection.sln index 3edd58ee..d6d4e541 100644 --- a/build/win32/vs9/gobject-introspection.sln +++ b/build/win32/vs9/gobject-introspection.sln @@ -40,7 +40,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compi {442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-install", "gi-install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" ProjectSection(ProjectDependencies) = postProject {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3} = {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3} {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj deleted file mode 100644 index 58ad177b..00000000 --- a/build/win32/vs9/install.vcproj +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.1