[gtk+] MSVC Builds: "Add" Visual Studio 2015 Projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] MSVC Builds: "Add" Visual Studio 2015 Projects
- Date: Tue, 15 Sep 2015 11:59:20 +0000 (UTC)
commit 9a4990f4ca91a845660c0c4640dd237a0bec1bce
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Sep 15 19:40:48 2015 +0800
MSVC Builds: "Add" Visual Studio 2015 Projects
"Add" Visual Studio 2015 projects by what we did before: Copy the Visual
Studio 2010 project files and replace the items in there as needed, as
the formats of the 2010 and 2015 projects are largely the same.
build/Makefile-newvs.am | 22 ++++++++++++--------
build/win32/Makefile.am | 3 +-
build/win32/vs11/Makefile.am | 4 +--
build/win32/vs12/Makefile.am | 4 +--
build/win32/vs14/Makefile.am | 43 ++++++++++++++++++++++++++++++++++++++++++
configure.ac | 1 +
6 files changed, 61 insertions(+), 16 deletions(-)
---
diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am
index e3acd91..33ee29f 100644
--- a/build/Makefile-newvs.am
+++ b/build/Makefile-newvs.am
@@ -5,15 +5,19 @@
# Author: Fan, Chun-wei
# November 05, 2012
-# MSVC_SLN: name of root project
-
-MSVC_FORMAT_VER=$(shell echo $$(expr $(MSVC_VER) + 1))
-
-$(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln
- cat $< | sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' | sed 's/2010/$(MSVC_VER_LONG)/g' >
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
-
-README.txt: $(top_srcdir)/build/win32/vs10/README.txt
- cat $< | sed 's/vs10/vs$(MSVC_VER)/g' | sed 's/VS10/VS$(MSVC_VER)/g' >
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 2015 and so on)
+# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on)
+# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015
+
+%.sln:
+ sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ >
$(top_builddir)/build/win32/vs$(MSVC_VER)/$ tmp
+ sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$ tmp >
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+ rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$ tmp
+
+%.txt:
+ sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ >
$(top_builddir)/build/win32/vs$(MSVC_VER)/$ tmp
+ sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$ tmp >
$(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+ rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$ tmp
%.vcxproj:
if test -e $(top_srcdir)/build/win32/vs10/$@; then \
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 6cbb596..e235327 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -5,7 +5,8 @@ SUBDIRS = \
vs9 \
vs10 \
vs11 \
- vs12
+ vs12 \
+ vs14
EXTRA_DIST += process-in-win32.py
diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
index bde8249..db8e87c 100644
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -34,10 +34,8 @@ EXTRA_DIST += \
DISTCLEANFILES = $(EXTRA_DIST)
-MSVC_SLN = gtk+
-
MSVC_VER = 11
-
+MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 2012
include $(top_srcdir)/build/Makefile-newvs.am
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index e51d9a7..643d9d8 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -34,10 +34,8 @@ EXTRA_DIST += \
DISTCLEANFILES = $(EXTRA_DIST)
-MSVC_SLN = gtk+
-
MSVC_VER = 12
-
+MSVC_FORMAT_VER = 12
MSVC_VER_LONG = 2013
include $(top_srcdir)/build/Makefile-newvs.am
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
new file mode 100644
index 0000000..b04c063
--- /dev/null
+++ b/build/win32/vs14/Makefile.am
@@ -0,0 +1,43 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST += \
+ README.txt \
+ gtk+.sln \
+ gtk3-prebuild.vcxproj \
+ gdk3-win32.vcxproj \
+ gdk3-win32.vcxproj.filters \
+ gdk-3.vcxproj \
+ gdk-3.vcxproj.filters \
+ gtk-3.vcxproj \
+ gtk-3.vcxproj.filters \
+ gtk-encode-symbolic-svg.vcxproj \
+ gtk-encode-symbolic-svg.vcxproj.filters \
+ gtk3-demo.vcxproj \
+ gtk3-demo.vcxproj.filters \
+ gtk3-demo-application.vcxproj \
+ gtk3-demo-application.vcxproj.filters \
+ gtk3-icon-browser.vcxproj \
+ gtk3-icon-browser.vcxproj.filters \
+ gailutil-3.vcxproj \
+ gailutil-3.vcxproj.filters \
+ gtk3-install.vcxproj \
+ broadwayd.vcxproj \
+ broadwayd.vcxproj.filters \
+ gdk3-broadway.vcxproj \
+ gdk3-broadway.vcxproj.filters \
+ gtk3-build-defines.props \
+ gtk3-copy-gdk-broadway.props \
+ gtk3-gen-srcs.props \
+ gtk3-ignore-broadway.props \
+ gtk3-install.props \
+ gtk3-version-paths.props
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_VER = 14
+MSVC_FORMAT_VER = 12
+MSVC_VER_LONG = 14
+
+include $(top_srcdir)/build/Makefile-newvs.am
+
+-include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 037ccf7..46794ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1942,6 +1942,7 @@ build/win32/vs10/Makefile
build/win32/vs10/gtk3-version-paths.props
build/win32/vs11/Makefile
build/win32/vs12/Makefile
+build/win32/vs14/Makefile
gdk/Makefile
gdk/broadway/Makefile
gdk/x11/Makefile
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]