[gtk+/gtk-3-0] Bug 643270: VS 2010 support (autotools part)



commit 334ff9781e391bb58008d85a4c9f15afe7d0bbdc
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Apr 27 00:17:13 2011 +0800

    Bug 643270: VS 2010 support (autotools part)
    
    -Added distribution for the VS 2010 project files
    -Added rules in the GDK/GTK+ Makefile.am to fill in the template
     project/filter files during "make dist" to ensure the source file
     listing is up-to-date to simplify maintenance.
    
    This was checked with "make dist" on Ubuntu.
    
    Any comments on the use of the VS 2010 Projects are welcome.

 build/win32/Makefile.am      |    3 ++-
 build/win32/vs10/Makefile.am |   19 +++++++++++++++++++
 configure.ac                 |    1 +
 gdk/Makefile.am              |   22 +++++++++++++++++++++-
 gtk/Makefile.am              |   22 +++++++++++++++++++++-
 5 files changed, 64 insertions(+), 3 deletions(-)
---
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 14e08c0..050539c 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 0000000..6aa2f86
--- /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 f57614e..3ac190b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1629,6 +1629,7 @@ docs/tools/Makefile
 build/Makefile
 build/win32/Makefile
 build/win32/vs9/Makefile
+build/win32/vs10/Makefile
 gdk/Makefile
 gdk/x11/Makefile
 gdk/win32/Makefile
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 8a746c5..46a2b93 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -341,7 +341,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 \
@@ -352,6 +352,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 8274001..776f901 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -917,7 +917,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 \
@@ -928,6 +928,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



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]