From 6423a02c55db8ef5b497ca06188ab77ff6d8009a Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 25 Aug 2015 17:41:55 +0800 Subject: [PATCH] MSVC Builds: Massive Rename of Projects We need to rename the projects so that when these projects are added into an all-in-one solution file that will build the GTK+ 2/3 stack, the names of the projects will not collide with the GTK+-2.x ones, especially as GTK+-2.x and GTK+-3.x are done to co-exist on the same system. This is due to the case that the MSVC projects are directly carried over from the GTK+-2.x ones and was then updated for 3.x. We still need to update the GUIDs of the projects, so that they won't conflict with the GTK+-2.x ones. --- build/win32/vs10/Makefile.am | 74 ++-- build/win32/vs10/broadwayd.vcxprojin | 10 +- build/win32/vs10/gailutil-3.vcxproj.filtersin | 20 ++ build/win32/vs10/gailutil-3.vcxprojin | 188 ++++++++++ build/win32/vs10/gdk-3.vcxproj.filtersin | 24 ++ build/win32/vs10/gdk-3.vcxprojin | 333 ++++++++++++++++++ .../vs10/gdk3-broadway.vcxproj.filtersin | 20 ++ build/win32/vs10/gdk3-broadway.vcxprojin | 131 +++++++ build/win32/vs10/gdk3-win32.vcxproj.filtersin | 20 ++ build/win32/vs10/gdk3-win32.vcxprojin | 131 +++++++ build/win32/vs10/gtk+.sln | 14 +- build/win32/vs10/gtk-3.vcxproj.filtersin | 45 +++ build/win32/vs10/gtk-3.vcxprojin | 228 ++++++++++++ .../vs10/gtk-encode-symbolic-svg.vcxproj | 10 +- build/win32/vs10/gtk3-build-defines.props | 52 +++ build/win32/vs10/gtk3-copy-gdk-broadway.props | 50 +++ .../vs10/gtk3-demo-application.vcxprojin | 12 +- build/win32/vs10/gtk3-demo.vcxprojin | 12 +- build/win32/vs10/gtk3-gen-srcs.props | 93 +++++ build/win32/vs10/gtk3-icon-browser.vcxprojin | 12 +- build/win32/vs10/gtk3-ignore-broadway.props | 18 + build/win32/vs10/gtk3-install.propsin | 146 ++++++++ build/win32/vs10/gtk3-install.vcxproj | 222 ++++++++++++ build/win32/vs10/gtk3-prebuild.vcxproj | 244 +++++++++++++ build/win32/vs10/gtk3-version-paths.props.in | 58 +++ build/win32/vs11/Makefile.am | 36 +- build/win32/vs12/Makefile.am | 36 +- build/win32/vs9/Makefile.am | 54 +-- build/win32/vs9/broadwayd.vcprojin | 8 +- build/win32/vs9/gailutil-3.vcprojin | 183 ++++++++++ build/win32/vs9/gdk-3.vcprojin | 304 ++++++++++++++++ build/win32/vs9/gdk3-broadway.vcprojin | 130 +++++++ build/win32/vs9/gdk3-win32.vcprojin | 130 +++++++ build/win32/vs9/gtk+.sln | 14 +- build/win32/vs9/gtk-3.vcprojin | 251 +++++++++++++ .../win32/vs9/gtk-encode-symbolic-svg.vcproj | 8 +- build/win32/vs9/gtk3-build-defines.vsprops | 46 +++ .../win32/vs9/gtk3-copy-gdk-broadway.vsprops | 33 ++ .../win32/vs9/gtk3-demo-application.vcprojin | 8 +- build/win32/vs9/gtk3-demo.vcprojin | 8 +- build/win32/vs9/gtk3-gen-srcs.vsprops | 73 ++++ build/win32/vs9/gtk3-icon-browser.vcprojin | 8 +- build/win32/vs9/gtk3-ignore-broadway.vsprops | 14 + build/win32/vs9/gtk3-install.vcproj | 140 ++++++++ build/win32/vs9/gtk3-install.vspropsin | 126 +++++++ build/win32/vs9/gtk3-prebuild.vcproj | 282 +++++++++++++++ build/win32/vs9/gtk3-version-paths.vsprops.in | 57 +++ configure.ac | 4 +- gdk/Makefile.am | 16 +- gdk/broadway/Makefile.am | 16 +- gdk/win32/Makefile.am | 16 +- gtk/Makefile.am | 16 +- libgail-util/Makefile.am | 16 +- 53 files changed, 3996 insertions(+), 204 deletions(-) create mode 100644 build/win32/vs10/gailutil-3.vcxproj.filtersin create mode 100644 build/win32/vs10/gailutil-3.vcxprojin create mode 100644 build/win32/vs10/gdk-3.vcxproj.filtersin create mode 100644 build/win32/vs10/gdk-3.vcxprojin create mode 100644 build/win32/vs10/gdk3-broadway.vcxproj.filtersin create mode 100644 build/win32/vs10/gdk3-broadway.vcxprojin create mode 100644 build/win32/vs10/gdk3-win32.vcxproj.filtersin create mode 100644 build/win32/vs10/gdk3-win32.vcxprojin create mode 100644 build/win32/vs10/gtk-3.vcxproj.filtersin create mode 100644 build/win32/vs10/gtk-3.vcxprojin create mode 100644 build/win32/vs10/gtk3-build-defines.props create mode 100644 build/win32/vs10/gtk3-copy-gdk-broadway.props create mode 100644 build/win32/vs10/gtk3-gen-srcs.props create mode 100644 build/win32/vs10/gtk3-ignore-broadway.props create mode 100644 build/win32/vs10/gtk3-install.propsin create mode 100644 build/win32/vs10/gtk3-install.vcxproj create mode 100644 build/win32/vs10/gtk3-prebuild.vcxproj create mode 100644 build/win32/vs10/gtk3-version-paths.props.in create mode 100644 build/win32/vs9/gailutil-3.vcprojin create mode 100644 build/win32/vs9/gdk-3.vcprojin create mode 100644 build/win32/vs9/gdk3-broadway.vcprojin create mode 100644 build/win32/vs9/gdk3-win32.vcprojin create mode 100644 build/win32/vs9/gtk-3.vcprojin create mode 100644 build/win32/vs9/gtk3-build-defines.vsprops create mode 100644 build/win32/vs9/gtk3-copy-gdk-broadway.vsprops create mode 100644 build/win32/vs9/gtk3-gen-srcs.vsprops create mode 100644 build/win32/vs9/gtk3-ignore-broadway.vsprops create mode 100644 build/win32/vs9/gtk3-install.vcproj create mode 100644 build/win32/vs9/gtk3-install.vspropsin create mode 100644 build/win32/vs9/gtk3-prebuild.vcproj create mode 100644 build/win32/vs9/gtk3-version-paths.vsprops.in diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index aabad96c9c..5984517a85 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -1,41 +1,41 @@ include $(top_srcdir)/Makefile.decl GENERATED_ITEMS = \ - gdk-win32.vcxproj \ - gdk-win32.vcxproj.filters \ - gdk-broadway.vcxproj \ - gdk-broadway.vcxproj.filters \ + gdk3-win32.vcxproj \ + gdk3-win32.vcxproj.filters \ + gdk3-broadway.vcxproj \ + gdk3-broadway.vcxproj.filters \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ - gdk.vcxproj \ - gdk.vcxproj.filters \ - gtk.vcxproj \ - gtk.vcxproj.filters \ + gdk-3.vcxproj \ + gdk-3.vcxproj.filters \ + gtk-3.vcxproj \ + gtk-3.vcxproj.filters \ gtk3-demo.vcxproj \ gtk3-demo.vcxproj.filters \ gtk3-demo-application.vcxproj \ gtk3-demo-application.vcxproj.filters \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ - gailutil.vcxproj \ - gailutil.vcxproj.filters \ - gtk-install.props \ - gtk-version-paths.props + gailutil-3.vcxproj \ + gailutil-3.vcxproj.filters \ + gtk3-install.props \ + gtk3-version-paths.props EXTRA_DIST += \ README.txt \ gtk+.sln \ - gtk-prebuild.vcxproj \ - gdk-win32.vcxprojin \ - gdk-win32.vcxproj.filtersin \ - gdk-broadway.vcxprojin \ - gdk-broadway.vcxproj.filtersin \ + gtk3-prebuild.vcxproj \ + gdk3-win32.vcxprojin \ + gdk3-win32.vcxproj.filtersin \ + gdk3-broadway.vcxprojin \ + gdk3-broadway.vcxproj.filtersin \ broadwayd.vcxprojin \ broadwayd.vcxproj.filtersin \ - gdk.vcxprojin \ - gdk.vcxproj.filtersin \ - gtk.vcxprojin \ - gtk.vcxproj.filtersin \ + gdk-3.vcxprojin \ + gdk-3.vcxproj.filtersin \ + gtk-3.vcxprojin \ + gtk-3.vcxproj.filtersin \ gtk-encode-symbolic-svg.vcxproj \ gtk-encode-symbolic-svg.vcxproj.filters \ gtk3-demo.vcxprojin \ @@ -44,23 +44,23 @@ EXTRA_DIST += \ gtk3-demo-application.vcxproj.filtersin \ gtk3-icon-browser.vcxprojin \ gtk3-icon-browser.vcxproj.filtersin \ - gailutil.vcxprojin \ - gailutil.vcxproj.filtersin \ - gtk-install.vcxproj \ - gtk-build-defines.props \ - gtk-copy-gdk-broadway.props \ - gtk-gen-srcs.props \ - gtk-ignore-broadway.props \ - gtk-install.propsin \ - gtk-version-paths.props.in \ + gailutil-3.vcxprojin \ + gailutil-3.vcxproj.filtersin \ + gtk3-install.vcxproj \ + gtk3-build-defines.props \ + gtk3-copy-gdk-broadway.props \ + gtk3-gen-srcs.props \ + gtk3-ignore-broadway.props \ + gtk3-install.propsin \ + gtk3-version-paths.props.in \ $(GENERATED_ITEMS) -gtk-install.props: $(top_srcdir)/build/win32/vs10/gtk-install.propsin - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk-install.propsin >$@ - rm gdk.vs10.headers - rm gdk-win32.vs10.headers - rm gdk-broadway.vs10.headers - rm gtk.vs10.headers - rm gailutil.vs10.headers +gtk3-install.props: $(top_srcdir)/build/win32/vs10/gtk3-install.propsin + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk3-install.propsin >$@ + rm gdk-3.vs10.headers + rm gdk3-win32.vs10.headers + rm gdk3-broadway.vs10.headers + rm gtk-3.vs10.headers + rm gailutil-3.vs10.headers -include $(top_srcdir)/git.mk diff --git a/build/win32/vs10/broadwayd.vcxprojin b/build/win32/vs10/broadwayd.vcxprojin index c6c942f6dd..46eac7608d 100644 --- a/build/win32/vs10/broadwayd.vcxprojin +++ b/build/win32/vs10/broadwayd.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + @@ -166,7 +166,7 @@ #include "broadwayd.vs10.sourcefiles" - + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff} false diff --git a/build/win32/vs10/gailutil-3.vcxproj.filtersin b/build/win32/vs10/gailutil-3.vcxproj.filtersin new file mode 100644 index 0000000000..5f3a5bcad4 --- /dev/null +++ b/build/win32/vs10/gailutil-3.vcxproj.filtersin @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {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;tiff;tif;png;wav + + + +#include "gailutil-3.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/gailutil-3.vcxprojin b/build/win32/vs10/gailutil-3.vcxprojin new file mode 100644 index 0000000000..9f4ef1e38b --- /dev/null +++ b/build/win32/vs10/gailutil-3.vcxprojin @@ -0,0 +1,188 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {29E3E814-1BA3-4AD7-A3A7-3669CB80A942} + gailutil + Win32Proj + + + + DynamicLibrary + MultiByte + true + v100 + + + DynamicLibrary + MultiByte + v100 + + + DynamicLibrary + MultiByte + true + v100 + + + DynamicLibrary + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + atk-1.0.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + ..\..\..\libgail-util\gailutil.def + $(TargetDir)$(ProjectName).0.lib + Windows + MachineX86 + + + + + Disabled + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + atk-1.0.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + ..\..\..\libgail-util\gailutil.def + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + $(TargetDir)$(ProjectName).0.lib + MachineX64 + + + + + MaxSpeed + true + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + atk-1.0.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + ..\..\..\libgail-util\gailutil.def + $(TargetDir)$(ProjectName).0.lib + Windows + true + true + MachineX86 + + + + + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + atk-1.0.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + ..\..\..\libgail-util\gailutil.def + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + true + true + $(TargetDir)$(ProjectName).0.lib + MachineX64 + + + +#include "gailutil-3.vs10.sourcefiles" + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7} + false + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5} + false + + + + + + diff --git a/build/win32/vs10/gdk-3.vcxproj.filtersin b/build/win32/vs10/gdk-3.vcxproj.filtersin new file mode 100644 index 0000000000..b618b922d4 --- /dev/null +++ b/build/win32/vs10/gdk-3.vcxproj.filtersin @@ -0,0 +1,24 @@ + + + + + {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 + + + + Resource Files + + +#include "gdk-3.vs10.sourcefiles.filters" + Source Files + + diff --git a/build/win32/vs10/gdk-3.vcxprojin b/build/win32/vs10/gdk-3.vcxprojin new file mode 100644 index 0000000000..d98188bc30 --- /dev/null +++ b/build/win32/vs10/gdk-3.vcxprojin @@ -0,0 +1,333 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Debug_Broadway + Win32 + + + Debug_Broadway + x64 + + + Release_Broadway + Win32 + + + Release_Broadway + x64 + + + + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} + gdk3 + Win32Proj + + + + DynamicLibrary + MultiByte + true + v100 + + + DynamicLibrary + MultiByte + v100 + + + DynamicLibrary + MultiByte + true + v100 + + + DynamicLibrary + MultiByte + v100 + + + DynamicLibrary + MultiByte + true + v100 + + + DynamicLibrary + MultiByte + v100 + + + DynamicLibrary + MultiByte + true + v100 + + + DynamicLibrary + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + true + false + true + false + + + + Disabled + ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + $(TargetDir)$(ProjectName).0.lib + MachineX86 + + + + + Disabled + ..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + $(TargetDir)$(ProjectName).0.lib + MachineX86 + + + + + ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + true + true + $(TargetDir)$(ProjectName).0.lib + MachineX86 + + + + + ..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + true + true + $(TargetDir)$(ProjectName).0.lib + MachineX86 + + + + + Disabled + ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + $(TargetDir)$(ProjectName).0.lib + MachineX64 + + + + + Disabled + ..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + $(TargetDir)$(ProjectName).0.lib + MachineX64 + + + + + ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + imm32.lib;winmm.lib;dwmapi.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + true + true + $(TargetDir)$(ProjectName).0.lib + MachineX64 + + + + + ..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + imm32.lib;winmm.lib;ws2_32.lib;dwmapi.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + true + true + $(TargetDir)$(ProjectName).0.lib + MachineX64 + + + + + + +#include "gdk-3.vs10.sourcefiles" + + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fe} + false + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fa} + false + + + + + + diff --git a/build/win32/vs10/gdk3-broadway.vcxproj.filtersin b/build/win32/vs10/gdk3-broadway.vcxproj.filtersin new file mode 100644 index 0000000000..539d51140b --- /dev/null +++ b/build/win32/vs10/gdk3-broadway.vcxproj.filtersin @@ -0,0 +1,20 @@ + + + + + {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 + + + +#include "gdk3-broadway.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/gdk3-broadway.vcxprojin b/build/win32/vs10/gdk3-broadway.vcxprojin new file mode 100644 index 0000000000..02d5e85774 --- /dev/null +++ b/build/win32/vs10/gdk3-broadway.vcxprojin @@ -0,0 +1,131 @@ + + + + + Debug_Broadway + Win32 + + + Debug_Broadway + x64 + + + Release_Broadway + Win32 + + + Release_Broadway + x64 + + + + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE} + gdkbroadway + Win32Proj + + + + StaticLibrary + MultiByte + true + v100 + + + StaticLibrary + MultiByte + v100 + + + StaticLibrary + MultiByte + true + v100 + + + StaticLibrary + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + + Disabled + ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + + + ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + + + Disabled + ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + + + ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + $(GdkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + +#include "gdk3-broadway.vs10.sourcefiles" + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff} + false + + + + + + diff --git a/build/win32/vs10/gdk3-win32.vcxproj.filtersin b/build/win32/vs10/gdk3-win32.vcxproj.filtersin new file mode 100644 index 0000000000..f81bd0585d --- /dev/null +++ b/build/win32/vs10/gdk3-win32.vcxproj.filtersin @@ -0,0 +1,20 @@ + + + + + {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 + + + +#include "gdk3-win32.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/gdk3-win32.vcxprojin b/build/win32/vs10/gdk3-win32.vcxprojin new file mode 100644 index 0000000000..d17fead5e4 --- /dev/null +++ b/build/win32/vs10/gdk3-win32.vcxprojin @@ -0,0 +1,131 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA} + gdkwin32 + Win32Proj + + + + StaticLibrary + MultiByte + true + v100 + + + StaticLibrary + MultiByte + v100 + + + StaticLibrary + MultiByte + true + v100 + + + StaticLibrary + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + + Disabled + ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + + + ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + + + Disabled + ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + + + ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + +#include "gdk3-win32.vs10.sourcefiles" + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff} + false + + + + + + diff --git a/build/win32/vs10/gtk+.sln b/build/win32/vs10/gtk+.sln index 84ff24944a..eab7e96f6e 100644 --- a/build/win32/vs10/gtk+.sln +++ b/build/win32/vs10/gtk+.sln @@ -1,16 +1,16 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-prebuild", "gtk-prebuild.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-prebuild", "gtk3-prebuild.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk3-win32", "gdk3-win32.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-broadway", "gdk-broadway.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk3-broadway", "gdk3-broadway.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC6130}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-3", "gdk-3.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-3", "gtk-3.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}" EndProject @@ -20,9 +20,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-icon-browser", "gtk3-i EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "gtk-encode-symbolic-svg.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC6131}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil-3", "gailutil-3.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-install", "gtk-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build/win32/vs10/gtk-3.vcxproj.filtersin b/build/win32/vs10/gtk-3.vcxproj.filtersin new file mode 100644 index 0000000000..aefeb4531b --- /dev/null +++ b/build/win32/vs10/gtk-3.vcxproj.filtersin @@ -0,0 +1,45 @@ + + + + + {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 + + + + Resource Files + + + Resource Files + Resource Files + + +#include "gtk-3.vs10.sourcefiles.filters" + 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 + + + Resource Files + + diff --git a/build/win32/vs10/gtk-3.vcxprojin b/build/win32/vs10/gtk-3.vcxprojin new file mode 100644 index 0000000000..5c8706493c --- /dev/null +++ b/build/win32/vs10/gtk-3.vcxprojin @@ -0,0 +1,228 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + true + + + Release + x64 + true + + + + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} + gtk3 + Win32Proj + + + + DynamicLibrary + MultiByte + v100 + + + DynamicLibrary + MultiByte + v100 + + + DynamicLibrary + MultiByte + v100 + + + DynamicLibrary + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + $(TargetDir)$(ProjectName).0.lib + MachineX86 + + + + + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GtkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + true + true + $(TargetDir)$(ProjectName).0.lib + MachineX86 + + + + + Disabled + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + $(TargetDir)$(ProjectName).0.lib + MachineX64 + + + + + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) + $(GtkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies) + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll + true + $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb + Windows + true + true + $(TargetDir)$(ProjectName).0.lib + MachineX64 + + + + + Generating GTK+ DBus Sources... + $(GenerateGtkDbusBuiltSources) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + Generating GTK+ DBus Sources... + $(GenerateGtkDbusBuiltSources) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + Generating GTK+ DBus Sources... + $(GenerateGtkDbusBuiltSources) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + Generating GTK+ DBus Sources... + $(GenerateGtkDbusBuiltSources) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + + + Generating GTK+ Win32 Version Resource... + $(GenerateGtkWin32RC) + ..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;%(Outputs) + Generating GTK+ Win32 Version Resource... + $(GenerateGtkWin32RC) + ..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;%(Outputs) + Generating GTK+ Win32 Version Resource... + $(GenerateGtkWin32RC) + ..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;%(Outputs) + Generating GTK+ Win32 Version Resource... + $(GenerateGtkWin32RC) + ..\..\..\gtk\gtk-win32.rc;..\..\..\gtk\libgtk3.manifest;%(Outputs) + + + + + + +#include "gtk-3.vs10.sourcefiles" + + + + + + + + + + + + + + + + + + + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7} + false + + + + + + diff --git a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj b/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj index e72f0d7303..b8ddb32d70 100644 --- a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj +++ b/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + @@ -166,7 +166,7 @@ - + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7} false diff --git a/build/win32/vs10/gtk3-build-defines.props b/build/win32/vs10/gtk3-build-defines.props new file mode 100644 index 0000000000..7d0b7219ec --- /dev/null +++ b/build/win32/vs10/gtk3-build-defines.props @@ -0,0 +1,52 @@ + + + + + + + 3.0.0 + /dummy + GTK_PREFIX=\"$(GtkDummyPrefix)\" + GDK_COMPILATION;G_LOG_DOMAIN="Gdk" + INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr + GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED + + + <_PropertySheetDisplayName>gtk3builddefinesprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + true + /d2Zi+ %(AdditionalOptions) + + + pangocairo-1.0.lib;cairo.lib;cairo-gobject.lib;pango-1.0.lib;gdk_pixbuf-2.0.lib;gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;epoxy.lib;%(AdditionalDependencies) + $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + + + $(GtkBinaryVersion) + + + $(GtkDummyPrefix) + + + $(GtkPrefixDefine) + + + $(GdkDefines) + + + $(GtkIncludedImmodulesDefines) + + + $(GtkDefines) + + + diff --git a/build/win32/vs10/gtk3-copy-gdk-broadway.props b/build/win32/vs10/gtk3-copy-gdk-broadway.props new file mode 100644 index 0000000000..227b0da90b --- /dev/null +++ b/build/win32/vs10/gtk3-copy-gdk-broadway.props @@ -0,0 +1,50 @@ + + + + + + + <_PropertySheetDisplayName>gtk3copygdkbroadwayprops + + + + /EXPORT:gdk_win32_display_manager_get_type + + + +if "$(Configuration)" == "Release" goto END + +if "$(Configuration)" == "Debug" goto END + +if "$(Configuration)" == "Release_Broadway" goto DoRelease + +if "$(Configuration)" == "Debug_Broadway" goto DoDebug + + +:DoRelease + +mkdir .\Release\$(Platform)\bin + +copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Release\$(Platform)\bin\ + +copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Release\$(Platform)\bin\ + +goto END + + +:DoDebug + +mkdir .\Debug\$(Platform)\bin + +copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Debug\$(Platform)\bin\ + +copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Debug\$(Platform)\bin\ + +goto END + + +:END + + + + diff --git a/build/win32/vs10/gtk3-demo-application.vcxprojin b/build/win32/vs10/gtk3-demo-application.vcxprojin index c22dfb7f23..244b77e095 100644 --- a/build/win32/vs10/gtk3-demo-application.vcxprojin +++ b/build/win32/vs10/gtk3-demo-application.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + @@ -158,11 +158,11 @@ #include "gtk3-demo-application.vs10.sourcefiles" - + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7} false - + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5} false diff --git a/build/win32/vs10/gtk3-demo.vcxprojin b/build/win32/vs10/gtk3-demo.vcxprojin index a3586892bb..29b175f6ed 100644 --- a/build/win32/vs10/gtk3-demo.vcxprojin +++ b/build/win32/vs10/gtk3-demo.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + @@ -172,11 +172,11 @@ #include "gtk3-demo.vs10.sourcefiles" - + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7} false - + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5} false diff --git a/build/win32/vs10/gtk3-gen-srcs.props b/build/win32/vs10/gtk3-gen-srcs.props new file mode 100644 index 0000000000..41c68eb03c --- /dev/null +++ b/build/win32/vs10/gtk3-gen-srcs.props @@ -0,0 +1,93 @@ + + + + + + + +copy ..\..\..\config.h.win32 ..\..\..\config.h + + +if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H + +if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h + +if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD + +if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway + +if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll + +if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib + +if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug + +if "$(Configuration)" == "Debug" del ..\..\..\MSVC_Release + +copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h + +copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD + +echo $(Configuration) > ..\..\..\MSVC_$(Configuration) + +:DONE_GDKCONFIG_H + + +if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H + + +if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h + +if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD + +if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release + +if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug + + +if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway + +if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway + +copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h + +copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD + +echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway + +:DONE_GDKCONFIG_H + + +cd ..\..\..\gtk + +$(PythonPath)\python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml + +cd $(SolutionDir) + + $(PythonPath)\python ..\process-in-win32.py --gtkwin32rc --gtk3manifest + copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h + + + <_PropertySheetDisplayName>gtk3gensrcsprops + + + + $(GenConfigH) + + + $(GenGdkConfigHWin32) + + + $(GenGdkConfigHBroadway) + + + $(GenerateGtkDbusBuiltSources) + + + $(GenerateGtkWin32RC) + + + $(CopyDemosH) + + + diff --git a/build/win32/vs10/gtk3-icon-browser.vcxprojin b/build/win32/vs10/gtk3-icon-browser.vcxprojin index f8a81b510b..6b404a3aea 100644 --- a/build/win32/vs10/gtk3-icon-browser.vcxprojin +++ b/build/win32/vs10/gtk3-icon-browser.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + @@ -162,11 +162,11 @@ #include "gtk3-icon-browser.vs10.sourcefiles" - + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7} false - + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5} false diff --git a/build/win32/vs10/gtk3-ignore-broadway.props b/build/win32/vs10/gtk3-ignore-broadway.props new file mode 100644 index 0000000000..0c97cf0de9 --- /dev/null +++ b/build/win32/vs10/gtk3-ignore-broadway.props @@ -0,0 +1,18 @@ + + + + + + + <_PropertySheetDisplayName>gtk3ignorebroadwayprops + + + + false + + + $(OutDir)\gdk3-win32.lib;%(AdditionalDependencies) + /EXPORT:gdk_win32_display_manager_get_type + + + diff --git a/build/win32/vs10/gtk3-install.propsin b/build/win32/vs10/gtk3-install.propsin new file mode 100644 index 0000000000..5af28b0a5f --- /dev/null +++ b/build/win32/vs10/gtk3-install.propsin @@ -0,0 +1,146 @@ + + + + + + + $(SolutionDir)$(Configuration)\$(Platform)\bin + $(BinDir)\$(GtkDllPrefix)gdk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gtk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gailutil(GtkDllSuffix).dll + $(BinDir)\gtk3-demo.exe;$(BinDir)\gtk3-demo-application.exe;$(BinDir)\gtk3-icon-browser.exe;$(BinDir)\gtk-encode-symbolic-svg.exe + $(BinDir)\broadwayd.exe + +mkdir $(CopyDir)\bin +mkdir $(CopyDir)\lib + +copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll" $(CopyDir)\bin +copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin +copy "$(BinDir)\gdk-$(ApiVersion).lib" $(CopyDir)\lib + +if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN +if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN +copy "$(BinDir)\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll" $(CopyDir)\bin +copy "$(BinDir)\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin +copy "$(BinDir)\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll" $(CopyDir)\bin +copy "$(BinDir)\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb" $(CopyDir)\bin +copy "$(BinDir)\gtk-$(ApiVersion).lib" $(CopyDir)\lib +copy "$(BinDir)\gailutil-$(ApiVersion).lib" $(CopyDir)\lib +copy "$(BinDir)\gtk3-demo.exe" $(CopyDir)\bin +copy "$(BinDir)\gtk3-demo.pdb" $(CopyDir)\bin +copy "$(BinDir)\gtk3-demo-application.exe" $(CopyDir)\bin +copy "$(BinDir)\gtk3-demo-application.pdb" $(CopyDir)\bin +copy "$(BinDir)\gtk3-icon-browser.exe" $(CopyDir)\bin +copy "$(BinDir)\gtk3-icon-browser.pdb" $(CopyDir)\bin +copy "$(BinDir)\gtk-encode-symbolic-svg.exe" $(CopyDir)\bin +copy "$(BinDir)\gtk-encode-symbolic-svg.pdb" $(CopyDir)\bin +goto DONE_BIN + +:DO_BROADWAY_BIN +copy "$(BinDir)\broadwayd.exe" $(CopyDir)\bin +copy "$(BinDir)\broadwayd.pdb" $(CopyDir)\bin + +if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_RELEASE +if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG +:DO_BROADWAY_RELEASE +copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin +copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin +copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin +copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib +copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib +copy .\Release\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin +copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin + +goto DONE_BIN + +:DO_BROADWAY_DEBUG +copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib +copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib +copy .\Debug\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin + +:DONE_BIN + + +echo off +mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32 +mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated +copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk +#include "gdk-3.vs10.headers" +#include "gdk3-win32.vs10.headers" + +mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y +mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated +#include "gtk-3.vs10.headers" + +mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util +#include "gailutil-3.vs10.headers" + +mkdir $(CopyDir)\share\icons\hicolor\16x16\apps +copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps +mkdir $(CopyDir)\share\icons\hicolor\22x22\apps +copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps +mkdir $(CopyDir)\share\icons\hicolor\24x24\apps +copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps +mkdir $(CopyDir)\share\icons\hicolor\32x32\apps +copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps +mkdir $(CopyDir)\share\icons\hicolor\48x48\apps +copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps +mkdir $(CopyDir)\share\icons\hicolor\256x256\apps +copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps +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..." +$(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas + + +copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk +mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway +#include "gdk3-broadway.vs10.headers" + + + + <_PropertySheetDisplayName>gtk3installsprops + + + + $(BinDir) + + + $(InstalledDlls) + + + $(InstalledBins) + + + $(InstalledBroadwayBins) + + + $(GtkDoInstallBin) + + + $(GtkDoInstall) + + + $(GtkDoInstallBroadwayHeaders) + + + diff --git a/build/win32/vs10/gtk3-install.vcxproj b/build/win32/vs10/gtk3-install.vcxproj new file mode 100644 index 0000000000..cf98b1ee80 --- /dev/null +++ b/build/win32/vs10/gtk3-install.vcxproj @@ -0,0 +1,222 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Debug_Broadway + Win32 + + + Debug_Broadway + x64 + + + Release_Broadway + Win32 + + + Release_Broadway + x64 + + + + {2093D218-190E-4194-9421-3BA7CBF33B15} + gtkinstall + Win32Proj + + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + + + + + + + + + + + + + + + + + + + + Installing Build Results... + $(GtkDoInstallBin)$(GtkDoInstall) + $(InstalledDlls);$(InstalledBins);%(Outputs) + Installing Build Results... + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders) + $(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs) + Installing Build Results... + $(GtkDoInstallBin)$(GtkDoInstall) + $(InstalledDlls);$(InstalledBins);%(Outputs) + Installing Build Results... + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders) + $(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs) + Installing Build Results... + $(GtkDoInstallBin)$(GtkDoInstall) + $(InstalledDlls);$(InstalledBins);%(Outputs) + Installing Build Results... + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders) + $(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs) + Installing Build Results... + $(GtkDoInstallBin)$(GtkDoInstall) + $(InstalledDlls);$(InstalledBins);%(Outputs) + Installing Build Results... + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders) + $(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs) + + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7} + false + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fc} + false + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5} + false + + + {29e3e814-1ba3-4ad7-a3a7-3669cb80a942} + false + + + {3281202a-cd26-4c67-b892-eb34bdbc612f} + false + + + {3281202a-cd26-4c67-b892-eb34bdbc612e} + false + + + {3281202a-cd26-4c67-b892-eb34bdbc6130} + false + + + {3281202a-cd26-4c67-b892-eb34bdbc6131} + false + + + + + + diff --git a/build/win32/vs10/gtk3-prebuild.vcxproj b/build/win32/vs10/gtk3-prebuild.vcxproj new file mode 100644 index 0000000000..4b6cf1304d --- /dev/null +++ b/build/win32/vs10/gtk3-prebuild.vcxproj @@ -0,0 +1,244 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Debug_Broadway + Win32 + + + Debug_Broadway + x64 + + + Release_Broadway + Win32 + + + Release_Broadway + x64 + + + + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} + gtkprebuild + Win32Proj + + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + Utility + MultiByte + true + v100 + + + Utility + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + + + + + + + + + + + + + + + + + + + + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + + + Copying gdkconfig from gdkconfig.win32... + $(GenGdkConfigHWin32) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs) + Copying gdkconfig from gdkconfig.win32... + $(GenGdkConfigHWin32) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs) + Copying gdkconfig from gdkconfig.win32... + $(GenGdkConfigHWin32) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs) + Copying gdkconfig from gdkconfig.win32... + $(GenGdkConfigHWin32) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs) + + + Copying gdkconfig from gdkconfig.win32_broadway... + $(GenGdkConfigHBroadway) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs) + Copying gdkconfig from gdkconfig.win32_broadway... + $(GenGdkConfigHBroadway) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs) + Copying gdkconfig from gdkconfig.win32_broadway... + $(GenGdkConfigHBroadway) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs) + Copying gdkconfig from gdkconfig.win32_broadway... + $(GenGdkConfigHBroadway) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs) + + + Copying demos.h from demos.h.win32... + $(CopyDemosH) + ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + Copying demos.h from demos.h.win32... + $(CopyDemosH) + ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + Copying demos.h from demos.h.win32... + $(CopyDemosH) + ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + Copying demos.h from demos.h.win32... + $(CopyDemosH) + ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + Copying demos.h from demos.h.win32... + $(CopyDemosH) + ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + Copying demos.h from demos.h.win32... + $(CopyDemosH) + ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + Copying demos.h from demos.h.win32... + $(CopyDemosH) + ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + Copying demos.h from demos.h.win32... + $(CopyDemosH) + ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + + + + + + + + diff --git a/build/win32/vs10/gtk3-version-paths.props.in b/build/win32/vs10/gtk3-version-paths.props.in new file mode 100644 index 0000000000..83a58f3a33 --- /dev/null +++ b/build/win32/vs10/gtk3-version-paths.props.in @@ -0,0 +1,58 @@ + + + + 10 + $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) + ..\..\..\..\vs$(VSVer)\$(Platform) + 3.0 + @GTK_VERSION@ + lib + .0-0 + + -vs$(VSVer) + $(GtkSeparateVSDllPrefix) + $(GtkSeparateVSDllSuffix) + c:\python27 + + + <_PropertySheetDisplayName>gtk3versionpathsprops + + + + $(VSVer) + + + $(GlibEtcInstallRoot) + + + $(CopyDir) + + + $(ApiVersion) + + + $(GtkVersion) + + + $(GtkLibtoolCompatibleDllPrefix) + + + $(GtkLibtoolCompatibleDllSuffix) + + + $(GtkSeparateVSDllPrefix) + + + $(GtkSeparateVSDllSuffix) + + + $(GtkDllPrefix) + + + $(GtkDllSuffix) + + + $(PythonPath) + + + diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index c025b9e7c1..bde8249cbf 100644 --- a/build/win32/vs11/Makefile.am +++ b/build/win32/vs11/Makefile.am @@ -3,13 +3,13 @@ include $(top_srcdir)/Makefile.decl EXTRA_DIST += \ README.txt \ gtk+.sln \ - gtk-prebuild.vcxproj \ - gdk-win32.vcxproj \ - gdk-win32.vcxproj.filters \ - gdk.vcxproj \ - gdk.vcxproj.filters \ - gtk.vcxproj \ - gtk.vcxproj.filters \ + gtk3-prebuild.vcxproj \ + gdk3-win32.vcxproj \ + gdk3-win32.vcxproj.filters \ + gdk-3.vcxproj \ + gdk-3.vcxproj.filters \ + gtk-3.vcxproj \ + gtk-3.vcxproj.filters \ gtk-encode-symbolic-svg.vcxproj \ gtk-encode-symbolic-svg.vcxproj.filters \ gtk3-demo.vcxproj \ @@ -18,19 +18,19 @@ EXTRA_DIST += \ gtk3-demo-application.vcxproj.filters \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ - gailutil.vcxproj \ - gailutil.vcxproj.filters \ - gtk-install.vcxproj \ + gailutil-3.vcxproj \ + gailutil-3.vcxproj.filters \ + gtk3-install.vcxproj \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ - gdk-broadway.vcxproj \ - gdk-broadway.vcxproj.filters \ - gtk-build-defines.props \ - gtk-copy-gdk-broadway.props \ - gtk-gen-srcs.props \ - gtk-ignore-broadway.props \ - gtk-install.props \ - gtk-version-paths.props + gdk3-broadway.vcxproj \ + gdk3-broadway.vcxproj.filters \ + gtk3-build-defines.props \ + gtk3-copy-gdk-broadway.props \ + gtk3-gen-srcs.props \ + gtk3-ignore-broadway.props \ + gtk3-install.props \ + gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am index 64f64e15cb..e51d9a76b0 100644 --- a/build/win32/vs12/Makefile.am +++ b/build/win32/vs12/Makefile.am @@ -3,13 +3,13 @@ include $(top_srcdir)/Makefile.decl EXTRA_DIST += \ README.txt \ gtk+.sln \ - gtk-prebuild.vcxproj \ - gdk-win32.vcxproj \ - gdk-win32.vcxproj.filters \ - gdk.vcxproj \ - gdk.vcxproj.filters \ - gtk.vcxproj \ - gtk.vcxproj.filters \ + gtk3-prebuild.vcxproj \ + gdk3-win32.vcxproj \ + gdk3-win32.vcxproj.filters \ + gdk-3.vcxproj \ + gdk-3.vcxproj.filters \ + gtk-3.vcxproj \ + gtk-3.vcxproj.filters \ gtk-encode-symbolic-svg.vcxproj \ gtk-encode-symbolic-svg.vcxproj.filters \ gtk3-demo.vcxproj \ @@ -18,19 +18,19 @@ EXTRA_DIST += \ gtk3-demo-application.vcxproj.filters \ gtk3-icon-browser.vcxproj \ gtk3-icon-browser.vcxproj.filters \ - gailutil.vcxproj \ - gailutil.vcxproj.filters \ - gtk-install.vcxproj \ + gailutil-3.vcxproj \ + gailutil-3.vcxproj.filters \ + gtk3-install.vcxproj \ broadwayd.vcxproj \ broadwayd.vcxproj.filters \ - gdk-broadway.vcxproj \ - gdk-broadway.vcxproj.filters \ - gtk-build-defines.props \ - gtk-copy-gdk-broadway.props \ - gtk-gen-srcs.props \ - gtk-ignore-broadway.props \ - gtk-install.props \ - gtk-version-paths.props + gdk3-broadway.vcxproj \ + gdk3-broadway.vcxproj.filters \ + gtk3-build-defines.props \ + gtk3-copy-gdk-broadway.props \ + gtk3-gen-srcs.props \ + gtk3-ignore-broadway.props \ + gtk3-install.props \ + gtk3-version-paths.props DISTCLEANFILES = $(EXTRA_DIST) diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index b6fa800c5c..7c0cb24eb6 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -1,48 +1,48 @@ include $(top_srcdir)/Makefile.decl GENERATED_ITEMS = \ - gdk-win32.vcproj \ - gdk-broadway.vcproj \ + gdk3-win32.vcproj \ + gdk3-broadway.vcproj \ broadwayd.vcproj \ - gdk.vcproj \ - gtk.vcproj \ + gdk-3.vcproj \ + gtk-3.vcproj \ gtk3-demo.vcproj \ gtk3-demo-application.vcproj \ gtk3-icon-browser.vcproj \ - gailutil.vcproj \ - gtk-install.vsprops \ - gtk-version-paths.vsprops + gailutil-3.vcproj \ + gtk3-install.vsprops \ + gtk3-version-paths.vsprops EXTRA_DIST += \ README.txt \ gtk+.sln \ - gtk-prebuild.vcproj \ - gdk-win32.vcprojin \ - gdk.vcprojin \ - gtk.vcprojin \ + gtk3-prebuild.vcproj \ + gdk3-win32.vcprojin \ + gdk-3.vcprojin \ + gtk-3.vcprojin \ gtk-encode-symbolic-svg.vcproj \ gtk3-demo.vcprojin \ gtk3-demo-application.vcprojin \ gtk3-icon-browser.vcprojin \ - gailutil.vcprojin \ - gtk-install.vcproj \ + gailutil-3.vcprojin \ + gtk3-install.vcproj \ broadwayd.vcprojin \ - gdk-broadway.vcprojin \ - gtk-build-defines.vsprops \ - gtk-copy-gdk-broadway.vsprops \ - gtk-gen-srcs.vsprops \ - gtk-ignore-broadway.vsprops \ - gtk-install.vspropsin \ - gtk-version-paths.vsprops.in \ + gdk3-broadway.vcprojin \ + gtk3-build-defines.vsprops \ + gtk3-copy-gdk-broadway.vsprops \ + gtk3-gen-srcs.vsprops \ + gtk3-ignore-broadway.vsprops \ + gtk3-install.vspropsin \ + gtk3-version-paths.vsprops.in \ $(GENERATED_ITEMS) -gtk-install.vsprops: $(top_srcdir)/build/win32/vs9/gtk-install.vspropsin - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk-install.vspropsin >$@ - rm gdk.headers - rm gdk-win32.headers - rm gdk-broadway.headers - rm gtk.headers - rm gailutil.headers +gtk3-install.vsprops: $(top_srcdir)/build/win32/vs9/gtk3-install.vspropsin + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk3-install.vspropsin >$@ + rm gdk-3.headers + rm gdk3-win32.headers + rm gdk3-broadway.headers + rm gtk-3.headers + rm gailutil-3.headers DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/vs9/broadwayd.vcprojin b/build/win32/vs9/broadwayd.vcprojin index 4d3bd4c42d..748d547abc 100644 --- a/build/win32/vs9/broadwayd.vcprojin +++ b/build/win32/vs9/broadwayd.vcprojin @@ -21,7 +21,7 @@ @@ -51,7 +51,7 @@ @@ -115,7 +115,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "gailutil-3.sourcefiles" + + + + + + + + + diff --git a/build/win32/vs9/gdk-3.vcprojin b/build/win32/vs9/gdk-3.vcprojin new file mode 100644 index 0000000000..db8ab812d8 --- /dev/null +++ b/build/win32/vs9/gdk-3.vcprojin @@ -0,0 +1,304 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "gdk-3.sourcefiles" + + + + diff --git a/build/win32/vs9/gdk3-broadway.vcprojin b/build/win32/vs9/gdk3-broadway.vcprojin new file mode 100644 index 0000000000..232bc44d61 --- /dev/null +++ b/build/win32/vs9/gdk3-broadway.vcprojin @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "gdk3-broadway.sourcefiles" + + + diff --git a/build/win32/vs9/gdk3-win32.vcprojin b/build/win32/vs9/gdk3-win32.vcprojin new file mode 100644 index 0000000000..4919790591 --- /dev/null +++ b/build/win32/vs9/gdk3-win32.vcprojin @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "gdk3-win32.sourcefiles" + + + diff --git a/build/win32/vs9/gtk+.sln b/build/win32/vs9/gtk+.sln index 2f2aa80875..d9a48b2951 100644 --- a/build/win32/vs9/gtk+.sln +++ b/build/win32/vs9/gtk+.sln @@ -1,13 +1,13 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-prebuild", "gtk-prebuild.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-prebuild", "gtk3-prebuild.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk3-win32", "gdk3-win32.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}" ProjectSection(ProjectDependencies) = postProject {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-broadway", "gdk-broadway.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk3-broadway", "gdk3-broadway.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE}" ProjectSection(ProjectDependencies) = postProject {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} EndProjectSection @@ -17,13 +17,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcpr {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FF} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-3", "gdk-3.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}" ProjectSection(ProjectDependencies) = postProject {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA} {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FE} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-3", "gtk-3.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}" ProjectSection(ProjectDependencies) = postProject {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} EndProjectSection @@ -51,13 +51,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-icon-browser", "gtk3-i {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil-3", "gailutil-3.vcproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}" ProjectSection(ProjectDependencies) = postProject {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-install", "gtk-install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}" ProjectSection(ProjectDependencies) = postProject {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} diff --git a/build/win32/vs9/gtk-3.vcprojin b/build/win32/vs9/gtk-3.vcprojin new file mode 100644 index 0000000000..d975d506ef --- /dev/null +++ b/build/win32/vs9/gtk-3.vcprojin @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "gtk-3.sourcefiles" + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gtk-encode-symbolic-svg.vcproj b/build/win32/vs9/gtk-encode-symbolic-svg.vcproj index 21853d8c25..493fd4e529 100644 --- a/build/win32/vs9/gtk-encode-symbolic-svg.vcproj +++ b/build/win32/vs9/gtk-encode-symbolic-svg.vcproj @@ -21,7 +21,7 @@ @@ -51,7 +51,7 @@ @@ -115,7 +115,7 @@ + + + + + + + + + + diff --git a/build/win32/vs9/gtk3-copy-gdk-broadway.vsprops b/build/win32/vs9/gtk3-copy-gdk-broadway.vsprops new file mode 100644 index 0000000000..048562bd67 --- /dev/null +++ b/build/win32/vs9/gtk3-copy-gdk-broadway.vsprops @@ -0,0 +1,33 @@ + + + + + diff --git a/build/win32/vs9/gtk3-demo-application.vcprojin b/build/win32/vs9/gtk3-demo-application.vcprojin index f8cc1cfa8d..801197aaa7 100644 --- a/build/win32/vs9/gtk3-demo-application.vcprojin +++ b/build/win32/vs9/gtk3-demo-application.vcprojin @@ -21,7 +21,7 @@ @@ -49,7 +49,7 @@ @@ -109,7 +109,7 @@ @@ -121,7 +121,7 @@ diff --git a/build/win32/vs9/gtk3-gen-srcs.vsprops b/build/win32/vs9/gtk3-gen-srcs.vsprops new file mode 100644 index 0000000000..831e5c66cc --- /dev/null +++ b/build/win32/vs9/gtk3-gen-srcs.vsprops @@ -0,0 +1,73 @@ + + + + + + + + + diff --git a/build/win32/vs9/gtk3-icon-browser.vcprojin b/build/win32/vs9/gtk3-icon-browser.vcprojin index 5c610714e4..effb281f76 100644 --- a/build/win32/vs9/gtk3-icon-browser.vcprojin +++ b/build/win32/vs9/gtk3-icon-browser.vcprojin @@ -21,7 +21,7 @@ @@ -51,7 +51,7 @@ @@ -115,7 +115,7 @@ + + + diff --git a/build/win32/vs9/gtk3-install.vcproj b/build/win32/vs9/gtk3-install.vcproj new file mode 100644 index 0000000000..d3eb1fd306 --- /dev/null +++ b/build/win32/vs9/gtk3-install.vcproj @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gtk3-install.vspropsin b/build/win32/vs9/gtk3-install.vspropsin new file mode 100644 index 0000000000..081c010838 --- /dev/null +++ b/build/win32/vs9/gtk3-install.vspropsin @@ -0,0 +1,126 @@ + + + + + + diff --git a/build/win32/vs9/gtk3-prebuild.vcproj b/build/win32/vs9/gtk3-prebuild.vcproj new file mode 100644 index 0000000000..c1648c398a --- /dev/null +++ b/build/win32/vs9/gtk3-prebuild.vcproj @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gtk3-version-paths.vsprops.in b/build/win32/vs9/gtk3-version-paths.vsprops.in new file mode 100644 index 0000000000..2e813da97c --- /dev/null +++ b/build/win32/vs9/gtk3-version-paths.vsprops.in @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + diff --git a/configure.ac b/configure.ac index 82d9c889a7..037ccf75b5 100644 --- a/configure.ac +++ b/configure.ac @@ -1937,9 +1937,9 @@ build/gtk-introspection-msvc.mak build/win32/Makefile build/win32/crypt/Makefile build/win32/vs9/Makefile -build/win32/vs9/gtk-version-paths.vsprops +build/win32/vs9/gtk3-version-paths.vsprops build/win32/vs10/Makefile -build/win32/vs10/gtk-version-paths.props +build/win32/vs10/gtk3-version-paths.props build/win32/vs11/Makefile build/win32/vs12/Makefile gdk/Makefile diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 3efb6fde98..dea10d15c0 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -434,24 +434,24 @@ stamp-gc-h: $(top_builddir)/config.status && echo timestamp > gdk/$(@F) # ------------------- MSVC Build Items ---------------- -MSVCPROJS = gdk +MSVCPROJS = gdk-3 -gdk_FILES = $(libgdk_3_la_SOURCES) -gdk_EXCLUDES = dummy -gdk_HEADERS_DIR = $(gdkincludedir) +gdk_3_FILES = $(libgdk_3_la_SOURCES) +gdk_3_EXCLUDES = dummy +gdk_3_HEADERS_DIR = $(gdkincludedir) -gdk_HEADERS_INST = \ +gdk_3_HEADERS_INST = \ $(gdkinclude_HEADERS) \ $(deprecatedinclude_HEADERS) \ $(nodist_gdkinclude_HEADERS) -gdk_HEADERS_EXCLUDES = dummy +gdk_3_HEADERS_EXCLUDES = dummy include $(top_srcdir)/build/Makefile.msvcproj dist-hook: \ - $(top_builddir)/build/win32/vs9/gdk.vcproj \ - $(top_builddir)/build/win32/vs9/gdk.headers + $(top_builddir)/build/win32/vs9/gdk-3.vcproj \ + $(top_builddir)/build/win32/vs9/gdk-3.headers DISTCLEANFILES = gdkconfig.h stamp-gc-h diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am index a5e8bc68e0..90500a257f 100644 --- a/gdk/broadway/Makefile.am +++ b/gdk/broadway/Makefile.am @@ -102,15 +102,15 @@ EXTRA_DIST += $(broadway_built_sources) BUILT_SOURCES = $(broadway_built_sources) # ------------------- MSVC Build Items ---------------- -MSVCPROJS = gdk-broadway broadwayd +MSVCPROJS = gdk3-broadway broadwayd -gdk_broadway_FILES = $(libgdk_broadway_la_SOURCES) -gdk_broadway_EXCLUDES = dummy -gdk_broadway_HEADERS_DIR = $(libgdkbroadwayincludedir) +gdk3_broadway_FILES = $(libgdk_broadway_la_SOURCES) +gdk3_broadway_EXCLUDES = dummy +gdk3_broadway_HEADERS_DIR = $(libgdkbroadwayincludedir) -gdk_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS) +gdk3_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS) -gdk_broadway_HEADERS_EXCLUDES = dummy +gdk3_broadway_HEADERS_EXCLUDES = dummy broadwayd_FILES = $(broadwayd_SOURCES) broadwayd_EXCLUDES = dummy @@ -118,8 +118,8 @@ broadwayd_EXCLUDES = dummy include $(top_srcdir)/build/Makefile.msvcproj dist-hook: \ - $(top_builddir)/build/win32/vs9/gdk-broadway.vcproj \ + $(top_builddir)/build/win32/vs9/gdk3-broadway.vcproj \ $(top_builddir)/build/win32/vs9/broadwayd.vcproj \ - $(top_builddir)/build/win32/vs9/gdk-broadway.headers + $(top_builddir)/build/win32/vs9/gdk3-broadway.headers -include $(top_srcdir)/git.mk diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index 65308529d8..e5fea777bf 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -85,20 +85,20 @@ libgdkwin32include_HEADERS = \ gdkwin32window.h # ------------------- MSVC Build Items ---------------- -MSVCPROJS = gdk-win32 +MSVCPROJS = gdk3-win32 -gdk_win32_FILES = $(libgdk_win32_la_SOURCES) -gdk_win32_EXCLUDES = dummy -gdk_win32_HEADERS_DIR = $(libgdkwin32includedir) +gdk3_win32_FILES = $(libgdk_win32_la_SOURCES) +gdk3_win32_EXCLUDES = dummy +gdk3_win32_HEADERS_DIR = $(libgdkwin32includedir) -gdk_win32_HEADERS_INST = $(libgdkwin32include_HEADERS) +gdk3_win32_HEADERS_INST = $(libgdkwin32include_HEADERS) -gdk_win32_HEADERS_EXCLUDES = dummy +gdk3_win32_HEADERS_EXCLUDES = dummy include $(top_srcdir)/build/Makefile.msvcproj dist-hook: \ - $(top_builddir)/build/win32/vs9/gdk-win32.vcproj \ - $(top_builddir)/build/win32/vs9/gdk-win32.headers + $(top_builddir)/build/win32/vs9/gdk3-win32.vcproj \ + $(top_builddir)/build/win32/vs9/gdk3-win32.headers -include $(top_srcdir)/git.mk diff --git a/gtk/Makefile.am b/gtk/Makefile.am index efe5d9d04a..abd1e5e5d0 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1302,29 +1302,29 @@ uninstall-mac-key-theme: endif # ------------------- MSVC Build Items ---------------- -MSVCPROJS = gtk +MSVCPROJS = gtk-3 -gtk_FILES = \ +gtk_3_FILES = \ $(gtk_base_c_sources) \ $(gtk_os_win32_c_sources) \ $(gtk_use_win32_c_sources) \ $(gtk_dbus_built_sources) -gtk_EXCLUDES = dummy -gtk_HEADERS_DIR = $(gtkincludedir) +gtk_3_EXCLUDES = dummy +gtk_3_HEADERS_DIR = $(gtkincludedir) -gtk_HEADERS_INST = \ +gtk_3_HEADERS_INST = \ $(gtkinclude_HEADERS) \ $(a11y_h_sources) \ $(deprecated_h_sources) -gtk_HEADERS_EXCLUDES = dummy +gtk_3_HEADERS_EXCLUDES = dummy include $(top_srcdir)/build/Makefile.msvcproj dist-hook: \ - $(top_builddir)/build/win32/vs9/gtk.vcproj \ - $(top_builddir)/build/win32/vs9/gtk.headers + $(top_builddir)/build/win32/vs9/gtk-3.vcproj \ + $(top_builddir)/build/win32/vs9/gtk-3.headers # Install a RC file for the default GTK+ theme, and key themes install-data-local: install-ms-lib install-def-file install-mac-key-theme diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am index a5709039e9..048fe33097 100644 --- a/libgail-util/Makefile.am +++ b/libgail-util/Makefile.am @@ -82,21 +82,21 @@ install-data-local: install-ms-lib install-def-file uninstall-local: uninstall-ms-lib uninstall-def-file # ------------------- MSVC Build Items ---------------- -MSVCPROJS = gailutil +MSVCPROJS = gailutil-3 -gailutil_FILES = $(libgailutil_3_la_SOURCES) +gailutil_3_FILES = $(libgailutil_3_la_SOURCES) -gailutil_EXCLUDES = dummy -gailutil_HEADERS_DIR = $(libgailutilincludedir) +gailutil_3_EXCLUDES = dummy +gailutil_3_HEADERS_DIR = $(libgailutilincludedir) -gailutil_HEADERS_INST = $(libgailutilinclude_HEADERS) +gailutil_3_HEADERS_INST = $(libgailutilinclude_HEADERS) -gailutil_HEADERS_EXCLUDES = dummy +gailutil_3_HEADERS_EXCLUDES = dummy include $(top_srcdir)/build/Makefile.msvcproj dist-hook: \ - $(top_builddir)/build/win32/vs9/gailutil.vcproj \ - $(top_builddir)/build/win32/vs9/gailutil.headers + $(top_builddir)/build/win32/vs9/gailutil-3.vcproj \ + $(top_builddir)/build/win32/vs9/gailutil-3.headers -include $(top_srcdir)/git.mk