luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 17:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Visual Studio builds: Fix previous commit

Browse Source 
Pushed the wrong version of the patch, sorry!
This commit is contained in:
Chun-wei Fan 2017-02-15 14:14:05 +08:00
parent 0baaac786e
commit fa074cf3c7
6 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -3278,6 +3278,10 @@ AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
AC_CHECK_PROGS([DBUS_DAEMON], [dbus-daemon]) AC_CHECK_PROGS([DBUS_DAEMON], [dbus-daemon])
AM_CONDITIONAL([HAVE_DBUS_DAEMON], [test x$DBUS_DAEMON = xdbus-daemon ]) AM_CONDITIONAL([HAVE_DBUS_DAEMON], [test x$DBUS_DAEMON = xdbus-daemon ])
# Check whether MSVC toolset is explicitly set
AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
dnl dnl
dnl Check for -Bsymbolic-functions linker flag used to avoid dnl Check for -Bsymbolic-functions linker flag used to avoid
dnl intra-library PLT jumps, if available. dnl intra-library PLT jumps, if available.

18
win32/Makefile-newvs.am
View File

@ -10,8 +10,18 @@
# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (100 for 2010, 120 for 2013) # MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (100 for 2010, 120 for 2013)
# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15) # MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15)
# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) # MSVC_BASE_TOOLSET: Use if baseline MSVC toolset is not in the form v$(MSVC_BASE_VER)0, meaning v$(MSVC_BASE_TOOLSET)
# MSVC_VER: Short Version of Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017) # MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017)
# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
if MSVC_BASE_NO_TOOLSET_SET
MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
endif
if MSVC_NO_TOOLSET_SET
MSVC_TOOLSET = $(MSVC_VER)0
endif
%.sln: %.sln:
sed 's/11\.00/12\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp sed 's/11\.00/12\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
@ -25,9 +35,9 @@
%.vcxproj: %.vcxproj:
if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \ if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
sed 's/v$(MSVC_BASE_VER)/v$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
else \ else \
sed 's/v$(MSVC_BASE_VER)/v$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \ sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
fi fi
%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile %.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile

4
win32/vs11/Makefile.am
View File

@ -40,9 +40,9 @@ EXTRA_DIST = \
DISTCLEANFILES = $(EXTRA_DIST) DISTCLEANFILES = $(EXTRA_DIST)
MSVC_BASE_VER = 100 MSVC_BASE_VER = 10
MSVC_BASE_VER_LONG = 2010 MSVC_BASE_VER_LONG = 2010
MSVC_VER = 110 MSVC_VER = 11
MSVC_VER_LONG = 2012 MSVC_VER_LONG = 2012
include $(top_srcdir)/win32/Makefile-newvs.am include $(top_srcdir)/win32/Makefile-newvs.am

4
win32/vs12/Makefile.am
View File

@ -40,9 +40,9 @@ EXTRA_DIST = \
DISTCLEANFILES = $(EXTRA_DIST) DISTCLEANFILES = $(EXTRA_DIST)
MSVC_BASE_VER = 100 MSVC_BASE_VER = 10
MSVC_BASE_VER_LONG = 2010 MSVC_BASE_VER_LONG = 2010
MSVC_VER = 120 MSVC_VER = 12
MSVC_VER_LONG = 2013 MSVC_VER_LONG = 2013
include $(top_srcdir)/win32/Makefile-newvs.am include $(top_srcdir)/win32/Makefile-newvs.am

4
win32/vs14/Makefile.am
View File

@ -40,9 +40,9 @@ EXTRA_DIST = \
DISTCLEANFILES = $(EXTRA_DIST) DISTCLEANFILES = $(EXTRA_DIST)
MSVC_BASE_VER = 100 MSVC_BASE_VER = 10
MSVC_BASE_VER_LONG = 2010 MSVC_BASE_VER_LONG = 2010
MSVC_VER = 140 MSVC_VER = 14
MSVC_VER_LONG = 14 MSVC_VER_LONG = 14
include $(top_srcdir)/win32/Makefile-newvs.am include $(top_srcdir)/win32/Makefile-newvs.am

5
win32/vs15/Makefile.am
View File

@ -40,9 +40,10 @@ EXTRA_DIST = \
DISTCLEANFILES = $(EXTRA_DIST) DISTCLEANFILES = $(EXTRA_DIST)
MSVC_BASE_VER = 100 MSVC_BASE_VER = 10
MSVC_BASE_VER_LONG = 2010 MSVC_BASE_VER_LONG = 2010
MSVC_VER = 141 MSVC_VER = 15
MSVC_VER_LONG = 15 MSVC_VER_LONG = 15
MSVC_TOOLSET = 141
include $(top_srcdir)/win32/Makefile-newvs.am include $(top_srcdir)/win32/Makefile-newvs.am