diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am new file mode 100644 index 0000000000000000000000000000000000000000..2479b09bffdbc8c4726ad64a7f707763abf1b60d --- /dev/null +++ b/build/Makefile-newvs.am @@ -0,0 +1,32 @@ +# Centralized autotools file +# Create the Visual Studio 2012 from the +# Visual Studio 2010 project files + +# Author: Fan, Chun-wei +# November 05, 2012 + +# MSVC_SLN: name of root project + +VCXPROJ_FILES = + +$(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln create_vcxproj copy_filters + cat $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln | sed 's/11\.00/12\.00/g' | sed 's/2010/2012/g' > $(top_builddir)/build/win32/vs11/$(MSVC_SLN).sln + +$(MSVC_SLN).props: $(top_builddir)/build/win32/vs10/$(MSVC_SLN).props + cat $(top_builddir)/build/win32/vs10/$(MSVC_SLN).props | sed 's/10/11/g' > $(top_builddir)/build/win32/vs11/$(MSVC_SLN).props + +README.txt: $(top_srcdir)/build/win32/vs10/README.txt + cat $(top_srcdir)/build/win32/vs10/README.txt | sed 's/vs10/vs11/g' | sed 's/VS10/VS11/g' > $(top_builddir)/build/win32/vs11/README.txt + +create_vcxproj: + for F in `(cd $(top_builddir)/build/win32/vs10 && ls *.vcxproj)`; do \ + case $$F in \ + *) cat $(top_builddir)/build/win32/vs10/$$F | sed 's/v100/v110/g' > $(top_builddir)/build/win32/vs11/$$F \ + ;; \ + esac; \ + done + +copy_filters: + cp $(top_builddir)/build/win32/vs10/*.vcxproj.filters $(top_builddir)/build/win32/vs11/ + + diff --git a/build/win32/vs11/.gitignore b/build/win32/vs11/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..846cbaa005fa0390ea5646c32103e76d082ff873 --- /dev/null +++ b/build/win32/vs11/.gitignore @@ -0,0 +1,30 @@ +gio.vcxproj +gio.vcxproj.filters +glib-compile-resources.vcxproj +glib-compile-resources.vcxproj.filters +glib-compile-schemas.vcxproj +glib-compile-schemas.vcxproj.filters +glib-genmarshal.vcxproj +glib-genmarshal.vcxproj.filters +glib.vcxproj +glib.vcxproj.filters +gmodule.vcxproj +gmodule.vcxproj.filters +gobject.vcxproj +gobject.vcxproj.filters +gresource.vcxproj +gresource.vcxproj.filters +gsettings.vcxproj +gsettings.vcxproj.filters +gspawn-win32-helper-console.vcxproj +gspawn-win32-helper-console.vcxproj.filters +gspawn-win32-helper.vcxproj +gspawn-win32-helper.vcxproj.filters +gthread.vcxproj +gthread.vcxproj.filters +testglib.vcxproj +testglib.vcxproj.filters +install.vcxproj +glib.props +glib.sln +README.txt diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am new file mode 100644 index 0000000000000000000000000000000000000000..5b351bc3a268e6f780b1e815a28e0b8127108fd2 --- /dev/null +++ b/build/win32/vs11/Makefile.am @@ -0,0 +1,36 @@ +EXTRA_DIST = \ + README.txt \ + glib.sln \ + glib.props \ + glib.vcxproj \ + glib.vcxproj.filters \ + glib-genmarshal.vcxproj \ + glib-genmarshal.vcxproj.filters \ + gspawn-win32-helper-console.vcxproj \ + gspawn-win32-helper-console.vcxproj.filters \ + gspawn-win32-helper.vcxproj \ + gspawn-win32-helper.vcxproj.filters \ + gmodule.vcxproj \ + gmodule.vcxproj.filters \ + gobject.vcxproj \ + gobject.vcxproj.filters \ + gthread.vcxproj \ + gthread.vcxproj.filters \ + gio.vcxproj \ + gio.vcxproj.filters \ + testglib.vcxproj \ + testglib.vcxproj.filters \ + glib-compile-schemas.vcxproj \ + glib-compile-schemas.vcxproj.filters \ + gsettings.vcxproj \ + gsettings.vcxproj.filters \ + glib-compile-resources.vcxproj \ + glib-compile-resources.vcxproj.filters \ + gresource.vcxproj \ + gresource.vcxproj.filters \ + install.vcxproj + +MSVC_SLN = glib + +include $(top_srcdir)/build/Makefile-newvs.am + diff --git a/configure.ac b/configure.ac index 859dd2a7e72926027747f7c0d2799d9b19341672..f8ef232b0c12bbc3b3461e3ac68aba5cc161566f 100644 --- a/configure.ac +++ b/configure.ac @@ -3604,6 +3604,7 @@ build/win32/Makefile build/win32/dirent/Makefile build/win32/vs9/Makefile build/win32/vs10/Makefile +build/win32/vs11/Makefile glib/Makefile glib/glib.stp glib/libcharset/Makefile