diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-10-12 17:05:13 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-10-12 17:12:03 +0800 |
| commit | c28b4ac6083a41a92b22fd88ad289cb1d39cebd6 (patch) | |
| tree | afb32f50b96e00ca9fa726e56afa3294372f1d9d | |
| parent | 86f5e96213ec98003a871f6af68bf958458ce364 (diff) | |
| download | gdk-pixbuf-c28b4ac6083a41a92b22fd88ad289cb1d39cebd6.tar.gz | |
MSVC builds: Move math.h compatibility header
Move the math.h compatibility header from build/win32/math-compat to
build/win32/vs9, and copy it to build/win32/vs10 and build/win32/vs11
during 'make dist'. This is because we don't need the header for
Visual Studio 2013 and later, and the math.h header shipped with
Visual Studio 2015 is now included in Windows 10 SDK's UCRT directory,
so the old way of including the compiler-shipped math.h by doing
'#include <../include/math.h>' would not work there.
This will fix the build on Visual Studio 2015.
https://bugzilla.gnome.org/show_bug.cgi?id=756381
| -rw-r--r-- | build/win32/Makefile.am | 2 | ||||
| -rw-r--r-- | build/win32/vs10/Makefile.am | 8 | ||||
| -rw-r--r-- | build/win32/vs10/gdk-pixbuf-build-defines.props | 2 | ||||
| -rw-r--r-- | build/win32/vs11/Makefile.am | 6 | ||||
| -rw-r--r-- | build/win32/vs9/Makefile.am | 3 | ||||
| -rw-r--r-- | build/win32/vs9/gdk-pixbuf-build-defines.vsprops | 2 | ||||
| -rw-r--r-- | build/win32/vs9/math.h (renamed from build/win32/math-compat/math.h) | 0 |
7 files changed, 15 insertions, 8 deletions
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am index c6f1aa4a5..6a7b4b17b 100644 --- a/build/win32/Makefile.am +++ b/build/win32/Makefile.am @@ -5,6 +5,4 @@ SUBDIRS = \ vs12 \ vs14 -EXTRA_DIST = math-compat/math.h - -include $(top_srcdir)/git.mk diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index dd891edb9..d25fb7596 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -19,12 +19,16 @@ EXTRA_DIST = \ gdk-pixbuf-pixdata.vcxproj \ gdk-pixbuf-pixdata.vcxproj.filters \ gdk-pixbuf-install.vcxproj \ - $(GENERATED_ITEMS) + $(GENERATED_ITEMS) \ + math.h gdk-pixbuf-install.props: $(top_srcdir)/build/win32/vs10/gdk-pixbuf-install.propsin gdk-pixbuf.vs10.headers $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk-pixbuf-install.propsin >$@ rm gdk-pixbuf.vs10.headers -DISTCLEANFILES = $(GENERATED_ITEMS) +math.h: $(top_srcdir)/build/win32/vs9/math.h + cp $< $@ + +DISTCLEANFILES = $(GENERATED_ITEMS) math.h -include $(top_srcdir)/git.mk diff --git a/build/win32/vs10/gdk-pixbuf-build-defines.props b/build/win32/vs10/gdk-pixbuf-build-defines.props index d95b62afa..42598652f 100644 --- a/build/win32/vs10/gdk-pixbuf-build-defines.props +++ b/build/win32/vs10/gdk-pixbuf-build-defines.props @@ -23,7 +23,7 @@ </PropertyGroup> <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>..\..\..;..\..\..\gdk-pixbuf;..\math-compat;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..;..\..\..\gdk-pixbuf;.;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions> <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles> <MultiProcessorCompilation>true</MultiProcessorCompilation> diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am index fa74c9c65..282b4f1f1 100644 --- a/build/win32/vs11/Makefile.am +++ b/build/win32/vs11/Makefile.am @@ -13,7 +13,8 @@ EXTRA_DIST = \ gdk-pixbuf-query-loaders.vcxproj.filters \ gdk-pixbuf-pixdata.vcxproj \ gdk-pixbuf-pixdata.vcxproj.filters \ - gdk-pixbuf-install.vcxproj + gdk-pixbuf-install.vcxproj \ + math.h DISTCLEANFILES = $(EXTRA_DIST) @@ -23,4 +24,7 @@ MSVC_FORMAT_VER = 12 include $(top_srcdir)/build/Makefile-newvs.am +math.h: $(top_srcdir)/build/win32/vs9/math.h + cp $< $@ + -include $(top_srcdir)/git.mk diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 0e35530c7..871133742 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -14,7 +14,8 @@ EXTRA_DIST = \ gdk-pixbuf-query-loaders.vcproj \ gdk-pixbuf-pixdata.vcproj \ gdk-pixbuf-install.vcproj \ - $(GENERATED_ITEMS) + $(GENERATED_ITEMS) \ + math.h gdk-pixbuf-install.vsprops: $(top_srcdir)/build/win32/vs9/gdk-pixbuf-install.vspropsin gdk-pixbuf.headers $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gdk-pixbuf-install.vspropsin >$@ diff --git a/build/win32/vs9/gdk-pixbuf-build-defines.vsprops b/build/win32/vs9/gdk-pixbuf-build-defines.vsprops index ccad986f6..d4a767eef 100644 --- a/build/win32/vs9/gdk-pixbuf-build-defines.vsprops +++ b/build/win32/vs9/gdk-pixbuf-build-defines.vsprops @@ -9,7 +9,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..;..\..\..\gdk-pixbuf;..\math-compat;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include" + AdditionalIncludeDirectories="..\..\..;..\..\..\gdk-pixbuf;.;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include" PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES" ForcedIncludeFiles="msvc_recommended_pragmas.h" AdditionalOptions="/MP" diff --git a/build/win32/math-compat/math.h b/build/win32/vs9/math.h index a442179d2..a442179d2 100644 --- a/build/win32/math-compat/math.h +++ b/build/win32/vs9/math.h |