Visual C++ 2010 Project Files: autotools files

These are the updates to the autotools files to
ensure the expansion of the GIO, GLib and GObject
project files (*.vcxproj, *.vcxproj.filters) and to
enable the distribution of the VS2010 project files

The actual VS2010 project files will follow shortly

diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 06f04e4..30ccc95 100644 (file)
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS =      \
        dirent  \
-       vs9
+       vs9     \
+       vs10
 
 EXTRA_DIST =           \
        make.msc        \

diff --git a/configure.ac b/configure.ac
index fbb065b..adc2da8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3752,6 +3752,7 @@ build/Makefile
 build/win32/Makefile
 build/win32/dirent/Makefile
 build/win32/vs9/Makefile
+build/win32/vs10/Makefile
 glib/Makefile
 glib/glib.stp
 glib/libcharset/Makefile

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 0fa675f..03a5a0e 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -634,7 +634,7 @@ EXTRA_DIST += $(completion_SCRIPTS)
 
 # ------------------------------------------------------------------------
 
-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj
+dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10/gio.vcxproj ../build/win32/vs10/gio.vcxproj.filters
        files='$(BUILT_EXTRA_DIST)'; \
        for f in $$files; do \
          if test -f $$f; then d=.; else d=$(srcdir); fi; \
@@ -650,6 +650,28 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj
        done | sort -u >libgio.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gio.vcprojin >$@
        rm libgio.sourcefiles
+       
+../build/win32/vs10/gio.vcxproj: $(top_srcdir)/build/win32/vs10/gio.vcxprojin
+       for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_actual_more_sources_for_vcproj) | tr '/' '\\'`; do \
+               case $$F in \
+               gunix*.c|gdesktopappinfo.c) ;; \
+               *.c) echo '    <ClCompile Include="..\..\..\gio\'$$F'" />' \
+                    ;; \
+               esac; \
+       done | sort -u >libgio.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gio.vcxprojin >$@
+       rm libgio.vs10.sourcefiles
+
+../build/win32/vs10/gio.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin
+       for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_actual_more_sources_for_vcproj) | tr '/' '\\'`; do \
+               case $$F in \
+               gunix*.c|gdesktopappinfo.c) ;; \
+               *.c) echo '    <ClCompile Include="..\..\..\gio\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+                    ;; \
+               esac; \
+       done | sort -u >libgio.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin >$@
+       rm libgio.vs10.sourcefiles.filters
 
 if HAVE_GLIB_RUNTIME_LIBDIR
 install-data-hook:

diff --git a/glib/Makefile.am b/glib/Makefile.am
index d757773..a76f25e 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -423,7 +423,7 @@ endif
 glib-2.0.lib: libglib-2.0.la glib.def
        lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@
 
-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj
+dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs10/glib.vcxproj ../build/win32/vs10/glib.vcxproj.filters
        files='$(BUILT_EXTRA_DIST)'; \
        for f in $$files; do \
          if test -f $$f; then d=.; else d=$(srcdir); fi; \
@@ -439,6 +439,27 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj
                esac; \
        done >libglib.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib.vcprojin >$@
+       rm libglib.sourcefiles
+
+../build/win32/vs10/glib.vcxproj: $(top_srcdir)/build/win32/vs10/glib.vcxprojin
+       for F in $(libglib_2_0_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '    <ClCompile Include="..\..\..\glib\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libglib.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxprojin >$@
+       rm libglib.vs10.sourcefiles
+       
+../build/win32/vs10/glib.vcxproj.filters: $(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin
+       for F in $(libglib_2_0_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '    <ClCompile Include="..\..\..\glib\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+                    ;; \
+               esac; \
+       done >libglib.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin >$@  
+       rm libglib.vs10.sourcefiles.filters
 
 distclean-local:
        if test $(srcdir) = .; then :; else \

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index a9bc8a0..d27a18b 100644 (file)
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -265,7 +265,7 @@ gobject-win32-res.o: gobject.rc
 gobject-2.0.lib: libgobject-2.0.la gobject.def
        lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgobject-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gobject.def -out:$@
 
-dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gobject.vcproj
+dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gobject.vcproj ../build/win32/vs10/gobject.vcxproj ../build/win32/vs10/gobject.vcxproj.filters
        files='$(BUILT_EXTRA_DIST)'; \
        for f in $$files; do \
          if test -f $$f; then d=.; else d=$(srcdir); fi; \
@@ -279,7 +279,28 @@ dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gobject.vcproj
                esac; \
        done >libgobject.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gobject.vcprojin >$@
+       rm libgobject.sourcefiles
 
+../build/win32/vs10/gobject.vcxproj: $(top_srcdir)/build/win32/vs10/gobject.vcxprojin
+       for F in $(libgobject_2_0_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '    <ClCompile Include="..\..\..\gobject\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgobject.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gobject.vcxprojin >$@
+       rm libgobject.vs10.sourcefiles
+       
+../build/win32/vs10/gobject.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gobject.vcxproj.filtersin
+       for F in $(libgobject_2_0_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '    <ClCompile Include="..\..\..\gobject\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+                    ;; \
+               esac; \
+       done >libgobject.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gobject.vcxproj.filtersin >$@       
+       rm libgobject.vs10.sourcefiles.filters
+       
 install-data-local: install-ms-lib install-def-file
 
 uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-gdb