diff options
| author | Boris Pek <tehnick-8@yandex.ru> | 2016-05-04 16:10:26 (GMT) |
|---|---|---|
| committer | Boris Pek <tehnick-8@yandex.ru> | 2016-05-04 16:16:46 (GMT) |
| commit | adc74c9aef335a24c859c0316f24f6f929ab0c12 (patch) | |
| tree | cb9f7d1330c717cbd12120f270956bd719efb236 /src | |
| parent | 0f813cdff46324946674f0802dcd2061ce2eee61 (diff) | |
| download | mxe-adc74c9aef335a24c859c0316f24f6f929ab0c12.zip mxe-adc74c9aef335a24c859c0316f24f6f929ab0c12.tar.gz mxe-adc74c9aef335a24c859c0316f24f6f929ab0c12.tar.bz2 | |
freeimage: update patch: fix build with GCC >= 6.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/freeimage-1-fixes.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/freeimage-1-fixes.patch b/src/freeimage-1-fixes.patch index ba6bdbc..bcc626c 100644 --- a/src/freeimage-1-fixes.patch +++ b/src/freeimage-1-fixes.patch @@ -76,3 +76,22 @@ index 1111111..2222222 100644 CXXFLAGS += $(INCLUDE)
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
+
+From: Boris Pek <tehnick-8@mail.ru> +Date: Wed, 04 May 2016 18:43:16 +0300 +Subject: [PATCH] fix build with GCC >= 6.x +
+diff --git a/Makefile.mingw b/Makefile.mingw
+index 1111111..2222222 100644
+--- a/Makefile.mingw
++++ b/Makefile.mingw
+@@ -67,7 +67,7 @@
+ RESOURCE = $(RCFILE:.rc=.coff)
+ CFLAGS ?= -O3 -fexceptions -DNDEBUG $(WIN32_CFLAGS)
+ CFLAGS += $(INCLUDE)
+-CXXFLAGS ?= -O3 -fexceptions -Wno-ctor-dtor-privacy -DNDEBUG $(WIN32_CXXFLAGS)
++CXXFLAGS ?= -O3 -fexceptions -Wno-ctor-dtor-privacy -Wno-narrowing -DNDEBUG $(WIN32_CXXFLAGS)
+ CXXFLAGS += $(INCLUDE)
+ RCFLAGS ?= -DNDEBUG
+ LDFLAGS ?= -s -shared -static -Wl,-soname,$(SOLIBNAME) $(WIN32_LDFLAGS)
+
|