diff options
| -rw-r--r-- | build/win32/Makefile.am | 3 | ||||
| -rw-r--r-- | build/win32/vs10/Makefile.am | 19 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | gdk/Makefile.am | 22 | ||||
| -rw-r--r-- | gtk/Makefile.am | 22 |
5 files changed, 64 insertions, 3 deletions
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am index 14e08c059e..050539c35d 100644 --- a/build/win32/Makefile.am +++ b/build/win32/Makefile.am @@ -1,4 +1,5 @@ include $(top_srcdir)/Makefile.decl SUBDIRS = \ - vs9 + vs9 \ + vs10 diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am new file mode 100644 index 0000000000..6aa2f86a6e --- /dev/null +++ b/build/win32/vs10/Makefile.am @@ -0,0 +1,19 @@ +include $(top_srcdir)/Makefile.decl + +EXTRA_DIST += \ + README.txt \ + gtk+.sln \ + gtk+.props \ + 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-demo.vcxproj \ + gtk-demo.vcxproj.filters \ + install.vcxproj diff --git a/configure.ac b/configure.ac index 3f73ffda7b..e493012bae 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ docs/tools/Makefile build/Makefile build/win32/Makefile build/win32/vs9/Makefile +build/win32/vs10/Makefile gdk/Makefile gdk/broadway/Makefile gdk/x11/Makefile diff --git a/gdk/Makefile.am b/gdk/Makefile.am index cb1fd545aa..9f4a570b0d 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -349,7 +349,7 @@ stamp-gc-h: $(top_builddir)/config.status $(AM_V_at) cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h echo timestamp > stamp-gc-h -dist-hook: ../build/win32/vs9/gdk.vcproj +dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../build/win32/vs10/gdk.vcxproj.filters ../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin for F in $(libgdk_3_la_SOURCES); do \ @@ -360,6 +360,26 @@ dist-hook: ../build/win32/vs9/gdk.vcproj done >libgdk.sourcefiles $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gdk.vcprojin >$@ rm libgdk.sourcefiles + +../build/win32/vs10/gdk.vcxproj: ../build/win32/vs10/gdk.vcxprojin + for F in $(libgdk_3_la_SOURCES); do \ + case $$F in \ + *.c) echo ' <ClCompile Include="..\..\..\gdk\'$$F'" />' \ + ;; \ + esac; \ + done >libgdk.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxprojin >$@ + rm libgdk.vs10.sourcefiles + +../build/win32/vs10/gdk.vcxproj.filters: ../build/win32/vs10/gdk.vcxproj.filtersin + for F in $(libgdk_3_la_SOURCES); do \ + case $$F in \ + *.c) echo ' <ClCompile Include="..\..\..\gdk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \ + ;; \ + esac; \ + done >libgdk.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxproj.filtersin >$@ + rm libgdk.vs10.sourcefiles.filters DISTCLEANFILES = gdkconfig.h stamp-gc-h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index efe93154b7..0279dec662 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -918,7 +918,7 @@ install-mac-key-theme: uninstall-mac-key-theme: endif -dist-hook: ../build/win32/vs9/gtk.vcproj +dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../build/win32/vs10/gtk.vcxproj.filters ../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \ @@ -929,6 +929,26 @@ dist-hook: ../build/win32/vs9/gtk.vcproj done >libgtk.sourcefiles $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk.vcprojin >$@ rm libgtk.sourcefiles + +../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin + for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \ + case $$F in \ + *.c) echo ' <ClCompile Include="..\..\..\gtk\'$$F'" />' \ + ;; \ + esac; \ + done >libgtk.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxprojin >$@ + rm libgtk.vs10.sourcefiles + +../build/win32/vs10/gtk.vcxproj.filters: ../build/win32/vs10/gtk.vcxproj.filtersin + for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \ + case $$F in \ + *.c) echo ' <ClCompile Include="..\..\..\gtk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \ + ;; \ + esac; \ + done >libgtk.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxproj.filtersin >$@ + rm libgtk.vs10.sourcefiles.filters # 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 |