daemonratte/gtk2-ng
Watch
1
0
Fork
You've already forked gtk2-ng
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: avoid duplicate MSVC_TOOLSET definition

Browse source
This commit is contained in:
Daemonratte 2026-04-29 09:40:46 +02:00
commit 861f9e4f94
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build/Makefile-newvs.am
View file

@ -18,9 +18,11 @@ MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
endif endif
if MSVC_NO_TOOLSET_SET if MSVC_NO_TOOLSET_SET
MSVC_TOOLSET = $(MSVC_VER)0 MSVC_TOOLSET_DEFAULT = $(MSVC_VER)0
endif endif
MSVC_TOOLSET_FINAL = $(MSVC_TOOLSET)$(MSVC_TOOLSET_DEFAULT)
%.sln: %.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/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)/$@ sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
@ -33,9 +35,9 @@ endif
%.vcxproj: %.vcxproj:
if test -e $(top_srcdir)/build/win32/vs10/$@; then \ if test -e $(top_srcdir)/build/win32/vs10/$@; then \
sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ sed 's/v100/v$(MSVC_TOOLSET_FINAL)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
else \ else \
sed 's/v100/v$(MSVC_TOOLSET)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ sed 's/v100/v$(MSVC_TOOLSET_FINAL)/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
fi fi
%.props: $(top_builddir)/build/win32/vs10/Makefile %.props: $(top_builddir)/build/win32/vs10/Makefile