diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index ad4f51e361..aabad96c9c 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -1,40 +1,66 @@ include $(top_srcdir)/Makefile.decl -EXTRA_DIST += \ - README.txt \ - gtk+.sln \ - gtk-prebuild.vcxproj \ - gdk-win32.vcxproj \ - gdk-win32.vcxproj.filters \ - gdk.vcxproj \ - gdk.vcxprojin \ - gdk.vcxproj.filters \ - gdk.vcxproj.filtersin \ - gtk.vcxproj \ - gtk.vcxprojin \ - gtk.vcxproj.filters \ - gtk.vcxproj.filtersin \ - gtk-encode-symbolic-svg.vcxproj \ - gtk-encode-symbolic-svg.vcxproj.filters \ - gtk3-demo.vcxproj \ - gtk3-demo.vcxproj.filters \ - gtk3-demo-application.vcxproj \ +GENERATED_ITEMS = \ + gdk-win32.vcxproj \ + gdk-win32.vcxproj.filters \ + gdk-broadway.vcxproj \ + gdk-broadway.vcxproj.filters \ + broadwayd.vcxproj \ + broadwayd.vcxproj.filters \ + gdk.vcxproj \ + gdk.vcxproj.filters \ + gtk.vcxproj \ + gtk.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 \ gtk3-icon-browser.vcxproj.filters \ - gailutil.vcxproj \ - gailutil.vcxproj.filters \ - gtk-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.in \ + gailutil.vcxproj \ + gailutil.vcxproj.filters \ + gtk-install.props \ gtk-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 \ + broadwayd.vcxprojin \ + broadwayd.vcxproj.filtersin \ + gdk.vcxprojin \ + gdk.vcxproj.filtersin \ + gtk.vcxprojin \ + gtk.vcxproj.filtersin \ + gtk-encode-symbolic-svg.vcxproj \ + gtk-encode-symbolic-svg.vcxproj.filters \ + gtk3-demo.vcxprojin \ + gtk3-demo.vcxproj.filtersin \ + gtk3-demo-application.vcxprojin \ + 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 \ + $(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 + -include $(top_srcdir)/git.mk diff --git a/build/win32/vs10/broadwayd.vcxproj.filtersin b/build/win32/vs10/broadwayd.vcxproj.filtersin new file mode 100644 index 0000000000..ad496bc438 --- /dev/null +++ b/build/win32/vs10/broadwayd.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 "broadwayd.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/broadwayd.vcxprojin b/build/win32/vs10/broadwayd.vcxprojin new file mode 100644 index 0000000000..c6c942f6dd --- /dev/null +++ b/build/win32/vs10/broadwayd.vcxprojin @@ -0,0 +1,177 @@ + + + + + Debug_Broadway + Win32 + + + Debug_Broadway + x64 + + + Release_Broadway + Win32 + + + Release_Broadway + x64 + + + + {3281202A-CD26-4C67-B892-EB34BDBC6130} + broadwayd + Win32Proj + + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + _DEBUG;$(GdkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + ws2_32.lib;%(AdditionalDependencies) + true + Console + MachineX86 + + + + + MaxSpeed + ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + true + $(GdkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + ws2_32.lib;%(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + _DEBUG;$(GdkDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + ws2_32.lib;%(AdditionalDependencies) + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + ..\..\..\gdk;..\..\..\gdk\broadway;%(AdditionalIncludeDirectories) + true + $(GdkDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + ws2_32.lib;%(AdditionalDependencies) + true + Console + true + true + MachineX64 + + + +#include "broadwayd.vs10.sourcefiles" + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff} + false + + + + + + diff --git a/build/win32/vs10/gailutil.vcxproj.filtersin b/build/win32/vs10/gailutil.vcxproj.filtersin new file mode 100644 index 0000000000..325301aeb4 --- /dev/null +++ b/build/win32/vs10/gailutil.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.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/gailutil.vcxprojin b/build/win32/vs10/gailutil.vcxprojin new file mode 100644 index 0000000000..cad2271fed --- /dev/null +++ b/build/win32/vs10/gailutil.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)-$(ApiVersion).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)-$(ApiVersion).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)-$(ApiVersion).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)-$(ApiVersion).lib + MachineX64 + + + +#include "gailutil.vs10.sourcefiles" + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7} + false + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5} + false + + + + + + diff --git a/build/win32/vs10/gdk-broadway.vcxproj.filtersin b/build/win32/vs10/gdk-broadway.vcxproj.filtersin new file mode 100644 index 0000000000..466f0f3080 --- /dev/null +++ b/build/win32/vs10/gdk-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 "gdk-broadway.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/gdk-broadway.vcxprojin b/build/win32/vs10/gdk-broadway.vcxprojin new file mode 100644 index 0000000000..6dae765a29 --- /dev/null +++ b/build/win32/vs10/gdk-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 "gdk-broadway.vs10.sourcefiles" + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff} + false + + + + + + diff --git a/build/win32/vs10/gdk-win32.vcxproj.filtersin b/build/win32/vs10/gdk-win32.vcxproj.filtersin new file mode 100644 index 0000000000..00973e46b5 --- /dev/null +++ b/build/win32/vs10/gdk-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 "gdk-win32.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/gdk-win32.vcxprojin b/build/win32/vs10/gdk-win32.vcxprojin new file mode 100644 index 0000000000..49cec40769 --- /dev/null +++ b/build/win32/vs10/gdk-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 "gdk-win32.vs10.sourcefiles" + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073ff} + false + + + + + + diff --git a/build/win32/vs10/gdk.vcxproj.filtersin b/build/win32/vs10/gdk.vcxproj.filtersin index c8e38a7334..c28ff445a9 100644 --- a/build/win32/vs10/gdk.vcxproj.filtersin +++ b/build/win32/vs10/gdk.vcxproj.filtersin @@ -18,7 +18,7 @@ Resource Files -#include "libgdk.vs10.sourcefiles.filters" +#include "gdk.vs10.sourcefiles.filters" Source Files - \ No newline at end of file + diff --git a/build/win32/vs10/gdk.vcxprojin b/build/win32/vs10/gdk.vcxprojin index ca6e38e574..c48c2b339c 100644 --- a/build/win32/vs10/gdk.vcxprojin +++ b/build/win32/vs10/gdk.vcxprojin @@ -314,7 +314,7 @@ -#include "libgdk.vs10.sourcefiles" +#include "gdk.vs10.sourcefiles" diff --git a/build/win32/vs10/gtk-install.propsin b/build/win32/vs10/gtk-install.propsin new file mode 100644 index 0000000000..4d6d3a0f42 --- /dev/null +++ b/build/win32/vs10/gtk-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$(GtkDllSuffix).dll" $(CopyDir)\bin +copy "$(BinDir)\$(GtkDllPrefix)gdk$(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$(GtkDllSuffix).dll" $(CopyDir)\bin +copy "$(BinDir)\$(GtkDllPrefix)gtk$(GtkDllSuffix).pdb" $(CopyDir)\bin +copy "$(BinDir)\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll" $(CopyDir)\bin +copy "$(BinDir)\$(GtkDllPrefix)gailutil$(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$(GtkDllSuffix).dll $(CopyDir)\bin +copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).pdb $(CopyDir)\bin +copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin +copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil$(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$(GtkDllSuffix).dll $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk$(GtkDllSuffix).pdb $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil$(GtkDllSuffix).dll $(CopyDir)\bin +copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil$(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.vs10.headers" +#include "gdk-win32.vs10.headers" + +mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y +mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated +#include "gtk.vs10.headers" + +mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util +#include "gailutil.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 "gdk-broadway.vs10.headers" + + + + <_PropertySheetDisplayName>gtkinstallsprops + + + + $(BinDir) + + + $(InstalledDlls) + + + $(InstalledBins) + + + $(InstalledBroadwayBins) + + + $(GtkDoInstallBin) + + + $(GtkDoInstall) + + + $(GtkDoInstallBroadwayHeaders) + + + diff --git a/build/win32/vs10/gtk.vcxproj.filtersin b/build/win32/vs10/gtk.vcxproj.filtersin index 654f4dd124..55d16f2c41 100644 --- a/build/win32/vs10/gtk.vcxproj.filtersin +++ b/build/win32/vs10/gtk.vcxproj.filtersin @@ -22,7 +22,7 @@ Resource Files -#include "libgtk.vs10.sourcefiles.filters" +#include "gtk.vs10.sourcefiles.filters" Source Files Source Files Source Files diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin index cc6cc6ba18..02429966bc 100644 --- a/build/win32/vs10/gtk.vcxprojin +++ b/build/win32/vs10/gtk.vcxprojin @@ -196,7 +196,7 @@ -#include "libgtk.vs10.sourcefiles" +#include "gtk.vs10.sourcefiles" diff --git a/build/win32/vs10/gtk3-demo-application.vcxproj.filtersin b/build/win32/vs10/gtk3-demo-application.vcxproj.filtersin new file mode 100644 index 0000000000..5b356ef76b --- /dev/null +++ b/build/win32/vs10/gtk3-demo-application.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 "gtk3-demo-application.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/gtk3-demo-application.vcxprojin b/build/win32/vs10/gtk3-demo-application.vcxprojin new file mode 100644 index 0000000000..c22dfb7f23 --- /dev/null +++ b/build/win32/vs10/gtk3-demo-application.vcxprojin @@ -0,0 +1,173 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3281202A-CD26-4C67-B892-EB34BDBC612F} + gtk3demoapplication + Win32Proj + + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level3 + ProgramDatabase + + + true + Console + false + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level3 + ProgramDatabase + + + true + Console + false + true + MachineX64 + + + +#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.vcxproj.filtersin b/build/win32/vs10/gtk3-demo.vcxproj.filtersin new file mode 100644 index 0000000000..a8fa97ddc6 --- /dev/null +++ b/build/win32/vs10/gtk3-demo.vcxproj.filtersin @@ -0,0 +1,16 @@ + + + + + {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 + + + +#include "gtk3-demo.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/gtk3-demo.vcxprojin b/build/win32/vs10/gtk3-demo.vcxprojin new file mode 100644 index 0000000000..a3586892bb --- /dev/null +++ b/build/win32/vs10/gtk3-demo.vcxprojin @@ -0,0 +1,187 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} + gtk3demo + Win32Proj + + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + ..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories) + _DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + CompileAsC + + + %(AdditionalDependencies) + true + Console + false + + + MachineX86 + + + + + Disabled + ..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories) + _DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + false + + + MachineX64 + + + + + ..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories) + $(GtkPrefixDefine);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + false + false + true + false + + + MachineX86 + + + + + ..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories) + $(GtkPrefixDefine);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + false + false + true + false + + + MachineX64 + + + +#include "gtk3-demo.vs10.sourcefiles" + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7} + false + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5} + false + + + + + + diff --git a/build/win32/vs10/gtk3-icon-browser.vcxproj.filtersin b/build/win32/vs10/gtk3-icon-browser.vcxproj.filtersin new file mode 100644 index 0000000000..2063a07e95 --- /dev/null +++ b/build/win32/vs10/gtk3-icon-browser.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 "gtk3-icon-browser.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/gtk3-icon-browser.vcxprojin b/build/win32/vs10/gtk3-icon-browser.vcxprojin new file mode 100644 index 0000000000..f8a81b510b --- /dev/null +++ b/build/win32/vs10/gtk3-icon-browser.vcxprojin @@ -0,0 +1,177 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3281202A-CD26-4C67-B892-EB34BDBC612E} + gtk3iconbrowser + Win32Proj + + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + ..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + ..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + true + %(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level3 + ProgramDatabase + + + true + Console + false + true + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + ..\..\..\demos\icon-browser;%(AdditionalIncludeDirectories) + true + %(PreprocessorDefinitions) + MultiThreadedDLL + false + + + Level3 + ProgramDatabase + + + true + Console + false + true + MachineX64 + + + +#include "gtk3-icon-browser.vs10.sourcefiles" + + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7} + false + + + {fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5} + false + + + + + + diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index a7144024b0..b6fa800c5c 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -1,28 +1,49 @@ include $(top_srcdir)/Makefile.decl -EXTRA_DIST += \ - README.txt \ - gtk+.sln \ - gtk-prebuild.vcproj \ - gdk-win32.vcproj \ - gdk.vcproj \ - gdk.vcprojin \ - gtk.vcproj \ - gtk.vcprojin \ - gtk-encode-symbolic-svg.vcproj \ - gtk3-demo.vcproj \ +GENERATED_ITEMS = \ + gdk-win32.vcproj \ + gdk-broadway.vcproj \ + broadwayd.vcproj \ + gdk.vcproj \ + gtk.vcproj \ + gtk3-demo.vcproj \ gtk3-demo-application.vcproj \ gtk3-icon-browser.vcproj \ - gailutil.vcproj \ - gtk-install.vcproj \ - broadwayd.vcproj \ - gdk-broadway.vcproj \ - gtk-build-defines.vsprops \ - gtk-copy-gdk-broadway.vsprops \ - gtk-gen-srcs.vsprops \ - gtk-ignore-broadway.vsprops \ - gtk-install.vsprops \ - gtk-version-paths.vsprops.in \ + gailutil.vcproj \ + gtk-install.vsprops \ gtk-version-paths.vsprops +EXTRA_DIST += \ + README.txt \ + gtk+.sln \ + gtk-prebuild.vcproj \ + gdk-win32.vcprojin \ + gdk.vcprojin \ + gtk.vcprojin \ + gtk-encode-symbolic-svg.vcproj \ + gtk3-demo.vcprojin \ + gtk3-demo-application.vcprojin \ + gtk3-icon-browser.vcprojin \ + gailutil.vcprojin \ + gtk-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 \ + $(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 + +DISTCLEANFILES = $(GENERATED_ITEMS) + -include $(top_srcdir)/git.mk diff --git a/build/win32/vs9/broadwayd.vcprojin b/build/win32/vs9/broadwayd.vcprojin new file mode 100644 index 0000000000..4d3bd4c42d --- /dev/null +++ b/build/win32/vs9/broadwayd.vcprojin @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "broadwayd.sourcefiles" + + + + + + + + + diff --git a/build/win32/vs9/gailutil.vcprojin b/build/win32/vs9/gailutil.vcprojin new file mode 100644 index 0000000000..6f474722e4 --- /dev/null +++ b/build/win32/vs9/gailutil.vcprojin @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "gailutil.sourcefiles" + + + + + + + + + diff --git a/build/win32/vs9/gdk-broadway.vcprojin b/build/win32/vs9/gdk-broadway.vcprojin new file mode 100644 index 0000000000..fd367bd5a6 --- /dev/null +++ b/build/win32/vs9/gdk-broadway.vcprojin @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "gdk-broadway.sourcefiles" + + + diff --git a/build/win32/vs9/gdk-win32.vcprojin b/build/win32/vs9/gdk-win32.vcprojin new file mode 100644 index 0000000000..d15a86ad0b --- /dev/null +++ b/build/win32/vs9/gdk-win32.vcprojin @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "gdk-win32.sourcefiles" + + + diff --git a/build/win32/vs9/gdk.vcprojin b/build/win32/vs9/gdk.vcprojin index 69b5ca8d24..3efa95f2f3 100644 --- a/build/win32/vs9/gdk.vcprojin +++ b/build/win32/vs9/gdk.vcprojin @@ -297,7 +297,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > -#include "libgdk.sourcefiles" +#include "gdk.sourcefiles" diff --git a/build/win32/vs9/gtk-install.vspropsin b/build/win32/vs9/gtk-install.vspropsin new file mode 100644 index 0000000000..75e33c5ac3 --- /dev/null +++ b/build/win32/vs9/gtk-install.vspropsin @@ -0,0 +1,122 @@ + + + + + + diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin index ec3eca9474..a622e70a70 100644 --- a/build/win32/vs9/gtk.vcprojin +++ b/build/win32/vs9/gtk.vcprojin @@ -230,7 +230,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > -#include "libgtk.sourcefiles" +#include "gtk.sourcefiles" diff --git a/build/win32/vs9/gtk3-demo-application.vcprojin b/build/win32/vs9/gtk3-demo-application.vcprojin new file mode 100644 index 0000000000..f8cc1cfa8d --- /dev/null +++ b/build/win32/vs9/gtk3-demo-application.vcprojin @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "gtk3-demo-application.sourcefiles" + + + + + + + + + diff --git a/build/win32/vs9/gtk3-demo.vcprojin b/build/win32/vs9/gtk3-demo.vcprojin new file mode 100644 index 0000000000..dc616d2129 --- /dev/null +++ b/build/win32/vs9/gtk3-demo.vcprojin @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "gtk3-demo.sourcefiles" + + + + + + + diff --git a/build/win32/vs9/gtk3-icon-browser.vcprojin b/build/win32/vs9/gtk3-icon-browser.vcprojin new file mode 100644 index 0000000000..5c610714e4 --- /dev/null +++ b/build/win32/vs9/gtk3-icon-browser.vcprojin @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "gtk3-icon-browser.sourcefiles" + + + + + + + + + diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 21efdd0f4c..fc1cae43cc 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -171,6 +171,21 @@ uninstall-update-icon-cache: $(AM_V_at)$(POST_UNINSTALL) test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)" +# ------------------- MSVC Build Items ---------------- +MSVCPROJS = gtk3-demo gtk3-demo-application + +gtk3_demo_FILES = $(gtk3_demo_SOURCES) +gtk3_demo_EXCLUDES = pagesetup.c + +gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES) +gtk3_demo_application_EXCLUDES = dummy + +include $(top_srcdir)/build/Makefile.msvcproj + +dist-hook: \ + $(top_builddir)/build/win32/vs9/gtk3-demo.vcproj \ + $(top_builddir)/build/win32/vs9/gtk3-demo-application.vcproj + DISTCLEANFILES = demos.h demos.h.win32 -include $(top_srcdir)/git.mk diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am index ddaf2c7547..8ec59d4861 100644 --- a/demos/icon-browser/Makefile.am +++ b/demos/icon-browser/Makefile.am @@ -35,4 +35,14 @@ EXTRA_DIST = \ iconbrowser.gresource.xml \ window.ui +# ------------------- MSVC Build Items ---------------- +MSVCPROJS = gtk3-icon-browser + +gtk3_icon_browser_FILES = $(gtk3_icon_browser_SOURCES) +gtk3_icon_browser_EXCLUDES = dummy + +include $(top_srcdir)/build/Makefile.msvcproj + +dist-hook: $(top_builddir)/build/win32/vs9/gtk3-icon-browser.vcproj + -include $(top_srcdir)/git.mk diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 684a01d97d..3efb6fde98 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -433,37 +433,25 @@ stamp-gc-h: $(top_builddir)/config.status $(AM_V_at) cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h \ && echo timestamp > gdk/$(@F) -dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../build/win32/vs10/gdk.vcxproj.filters +# ------------------- MSVC Build Items ---------------- +MSVCPROJS = gdk -../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin - for F in `echo $(libgdk_3_la_SOURCES) | tr '/' '\\'`; do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libgdk.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gdk.vcprojin >$@ - rm libgdk.sourcefiles +gdk_FILES = $(libgdk_3_la_SOURCES) +gdk_EXCLUDES = dummy +gdk_HEADERS_DIR = $(gdkincludedir) -../build/win32/vs10/gdk.vcxproj: ../build/win32/vs10/gdk.vcxprojin - for F in `echo $(libgdk_3_la_SOURCES) | tr '/' '\\'`; do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libgdk.vs10.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxprojin >$@ - rm libgdk.vs10.sourcefiles +gdk_HEADERS_INST = \ + $(gdkinclude_HEADERS) \ + $(deprecatedinclude_HEADERS) \ + $(nodist_gdkinclude_HEADERS) -../build/win32/vs10/gdk.vcxproj.filters: ../build/win32/vs10/gdk.vcxproj.filtersin - for F in `echo $(libgdk_3_la_SOURCES) | tr '/' '\\'`; do \ - case $$F in \ - *.c) echo ' Source Files' \ - ;; \ - esac; \ - done >libgdk.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxproj.filtersin >$@ - rm libgdk.vs10.sourcefiles.filters +gdk_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 DISTCLEANFILES = gdkconfig.h stamp-gc-h diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am index 9e4c471cd3..a5e8bc68e0 100644 --- a/gdk/broadway/Makefile.am +++ b/gdk/broadway/Makefile.am @@ -101,4 +101,25 @@ EXTRA_DIST += $(broadway_built_sources) BUILT_SOURCES = $(broadway_built_sources) +# ------------------- MSVC Build Items ---------------- +MSVCPROJS = gdk-broadway broadwayd + +gdk_broadway_FILES = $(libgdk_broadway_la_SOURCES) +gdk_broadway_EXCLUDES = dummy +gdk_broadway_HEADERS_DIR = $(libgdkbroadwayincludedir) + +gdk_broadway_HEADERS_INST = $(libgdkbroadwayinclude_HEADERS) + +gdk_broadway_HEADERS_EXCLUDES = dummy + +broadwayd_FILES = $(broadwayd_SOURCES) +broadwayd_EXCLUDES = dummy + +include $(top_srcdir)/build/Makefile.msvcproj + +dist-hook: \ + $(top_builddir)/build/win32/vs9/gdk-broadway.vcproj \ + $(top_builddir)/build/win32/vs9/broadwayd.vcproj \ + $(top_builddir)/build/win32/vs9/gdk-broadway.headers + -include $(top_srcdir)/git.mk diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index 9366867780..65308529d8 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -84,4 +84,21 @@ libgdkwin32include_HEADERS = \ gdkwin32screen.h \ gdkwin32window.h +# ------------------- MSVC Build Items ---------------- +MSVCPROJS = gdk-win32 + +gdk_win32_FILES = $(libgdk_win32_la_SOURCES) +gdk_win32_EXCLUDES = dummy +gdk_win32_HEADERS_DIR = $(libgdkwin32includedir) + +gdk_win32_HEADERS_INST = $(libgdkwin32include_HEADERS) + +gdk_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 + -include $(top_srcdir)/git.mk diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 4fd509cdac..efe5d9d04a 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1301,37 +1301,30 @@ install-mac-key-theme: uninstall-mac-key-theme: endif -dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../build/win32/vs10/gtk.vcxproj.filters +# ------------------- MSVC Build Items ---------------- +MSVCPROJS = gtk -../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin - for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) $(gtk_dbus_built_sources) | tr '/' '\\'`; do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libgtk.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk.vcprojin >$@ - rm libgtk.sourcefiles +gtk_FILES = \ + $(gtk_base_c_sources) \ + $(gtk_os_win32_c_sources) \ + $(gtk_use_win32_c_sources) \ + $(gtk_dbus_built_sources) -../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin - for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) $(gtk_dbus_built_sources) | tr '/' '\\'`; do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libgtk.vs10.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxprojin >$@ - rm libgtk.vs10.sourcefiles +gtk_EXCLUDES = dummy +gtk_HEADERS_DIR = $(gtkincludedir) -../build/win32/vs10/gtk.vcxproj.filters: ../build/win32/vs10/gtk.vcxproj.filtersin - for F in `echo $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources) $(gtk_dbus_built_sources) | tr '/' '\\'`; do \ - case $$F in \ - *.c) echo ' Source Files' \ - ;; \ - esac; \ - done >libgtk.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxproj.filtersin >$@ - rm libgtk.vs10.sourcefiles.filters +gtk_HEADERS_INST = \ + $(gtkinclude_HEADERS) \ + $(a11y_h_sources) \ + $(deprecated_h_sources) + +gtk_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 # 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 8ac0264a9d..a5709039e9 100644 --- a/libgail-util/Makefile.am +++ b/libgail-util/Makefile.am @@ -81,4 +81,22 @@ install-data-local: install-ms-lib install-def-file uninstall-local: uninstall-ms-lib uninstall-def-file +# ------------------- MSVC Build Items ---------------- +MSVCPROJS = gailutil + +gailutil_FILES = $(libgailutil_3_la_SOURCES) + +gailutil_EXCLUDES = dummy +gailutil_HEADERS_DIR = $(libgailutilincludedir) + +gailutil_HEADERS_INST = $(libgailutilinclude_HEADERS) + +gailutil_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 + -include $(top_srcdir)/git.mk