Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 643270: VS 2010 support (autotools part)

Browse Source 
-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.
This commit is contained in:
Chun-wei Fan
2011-04-27 00:17:13 +08:00
parent 7f6cc796cb
commit 334ff9781e
5 changed files with 64 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/win32/Makefile.am
View File

@@ -1,4 +1,5 @@
include $(top_srcdir)/Makefile.decl
SUBDIRS = \
vs9
vs9 \
vs10

19
build/win32/vs10/Makefile.am Normal file
View File

@@ -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

1
configure.ac
View File

@@ -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

22
gdk/Makefile.am
View File

@@ -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

22
gtk/Makefile.am
View File

@@ -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