From 61b9bcf1d528bc02af62fb8336d5dfa7016dc591 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 3 Jun 2014 17:03:40 +0800 Subject: [PATCH] MSVC Projects: "Generate" the gtk-inspector Projects Like the GDK and GTK portions, use autotools scripts to generate the complete projects for gtk-inspector as sources there seem to change from time to time. It might be so that this, like the a11y sources, will be referenced from the main Makefile.am of GTK directly, but just do this so that the projects can build properly. --- build/win32/vs10/Makefile.am | 2 + .../win32/vs10/gtk-inspector.vcxproj.filters | 38 ------------------- .../vs10/gtk-inspector.vcxproj.filtersin | 20 ++++++++++ ...pector.vcxproj => gtk-inspector.vcxprojin} | 20 +--------- build/win32/vs9/Makefile.am | 1 + ...nspector.vcproj => gtk-inspector.vcprojin} | 20 +--------- gtk/inspector/Makefile.am | 32 ++++++++++++++++ 7 files changed, 57 insertions(+), 76 deletions(-) delete mode 100644 build/win32/vs10/gtk-inspector.vcxproj.filters create mode 100644 build/win32/vs10/gtk-inspector.vcxproj.filtersin rename build/win32/vs10/{gtk-inspector.vcxproj => gtk-inspector.vcxprojin} (84%) rename build/win32/vs9/{gtk-inspector.vcproj => gtk-inspector.vcprojin} (71%) diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 071626d911..96b8db34be 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -19,7 +19,9 @@ EXTRA_DIST += \ gtk3-demo-application.vcxproj \ gtk3-demo-application.vcxproj.filters \ gtk-inspector.vcxproj \ + gtk-inspector.vcxprojin \ gtk-inspector.vcxproj.filters \ + gtk-inspector.vcxproj.filtersin \ gailutil.vcxproj \ gailutil.vcxproj.filters \ install.vcxproj \ diff --git a/build/win32/vs10/gtk-inspector.vcxproj.filters b/build/win32/vs10/gtk-inspector.vcxproj.filters deleted file mode 100644 index 7913b08fdc..0000000000 --- a/build/win32/vs10/gtk-inspector.vcxproj.filters +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - Source Files - - diff --git a/build/win32/vs10/gtk-inspector.vcxproj.filtersin b/build/win32/vs10/gtk-inspector.vcxproj.filtersin new file mode 100644 index 0000000000..faa7212c00 --- /dev/null +++ b/build/win32/vs10/gtk-inspector.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 "libgtk-inspector.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/gtk-inspector.vcxproj b/build/win32/vs10/gtk-inspector.vcxprojin similarity index 84% rename from build/win32/vs10/gtk-inspector.vcxproj rename to build/win32/vs10/gtk-inspector.vcxprojin index b97c515b5f..441186d3ad 100644 --- a/build/win32/vs10/gtk-inspector.vcxproj +++ b/build/win32/vs10/gtk-inspector.vcxprojin @@ -117,25 +117,7 @@ - - - - - - - - - - - - - - - - - - - +#include "libgtk-inspector.vs10.sourcefiles" diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index ec5789fdc6..8583084e40 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -12,6 +12,7 @@ EXTRA_DIST += \ gtk3-demo.vcproj \ gtk3-demo-application.vcproj \ gtk-inspector.vcproj \ + gtk-inspector.vcprojin \ gailutil.vcproj \ install.vcproj \ broadwayd.vcproj \ diff --git a/build/win32/vs9/gtk-inspector.vcproj b/build/win32/vs9/gtk-inspector.vcprojin similarity index 71% rename from build/win32/vs9/gtk-inspector.vcproj rename to build/win32/vs9/gtk-inspector.vcprojin index bfecdbcec3..838ea93224 100644 --- a/build/win32/vs9/gtk-inspector.vcproj +++ b/build/win32/vs9/gtk-inspector.vcprojin @@ -124,25 +124,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - - - - - - - - - - - - - - - - +#include "libgtk-inspector.sourcefiles" diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am index 67e9c4ed88..79b32192ea 100644 --- a/gtk/inspector/Makefile.am +++ b/gtk/inspector/Makefile.am @@ -119,4 +119,36 @@ distclean-local: rm -f $(MAINTAINERCLEANFILES); \ fi +dist-hook: $(top_builddir)/build/win32/vs9/gtk-inspector.vcproj $(top_builddir)/build/win32/vs10/gtk-inspector.vcxproj $(top_builddir)/build/win32/vs10/gtk-inspector.vcxproj.filters + +$(top_builddir)/build/win32/vs9/gtk-inspector.vcproj: $(top_srcdir)/build/win32/vs9/gtk-inspector.vcprojin + for F in `echo $(libgtkinspector_la_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >libgtk-inspector.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk-inspector.vcprojin >$@ + rm libgtk-inspector.sourcefiles + +$(top_builddir)/build/win32/vs10/gtk-inspector.vcxproj: $(top_srcdir)/build/win32/vs10/gtk-inspector.vcxprojin + for F in `echo $(libgtkinspector_la_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >libgtk-inspector.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk-inspector.vcxprojin >$@ + rm libgtk-inspector.vs10.sourcefiles + +$(top_builddir)/build/win32/vs10/gtk-inspector.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gtk-inspector.vcxproj.filtersin + for F in `echo $(libgtkinspector_la_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *.c) echo ' Source Files' \ + ;; \ + esac; \ + done >libgtk-inspector.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk-inspector.vcxproj.filtersin >$@ + rm libgtk-inspector.vs10.sourcefiles.filters + -include $(top_srcdir)/git.mk