From 7aeb286cf854c698c8e89c49b3fff32307d818c3 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Wed, 4 Oct 2017 01:19:31 -0400
Subject: [PATCH] add jpeg support for Gem under Windows
---
README.md | 1 +
externals/Makefile | 3 +++
packages/win32_inno/Makefile | 1 +
3 files changed, 5 insertions(+)
diff --git a/README.md b/README.md
index 625605d6c..f85540b27 100644
--- a/README.md
+++ b/README.md
@@ -219,6 +219,7 @@ that case, but I haven't tested doing it like that. Sorry. Get a better OS...)
mingw-w64-i686-ladspa-sdk mingw-w64-i686-lame \
mingw-w64-i686-libsndfile mingw-w64-i686-libvorbis \
mingw-w64-i686-lua mingw-w64-i686-toolchain \
+ mingw-w64-i686-libjpeg-turbo \
rsync unzip wget
5. Download the source code *(3-6 minutes)*
diff --git a/externals/Makefile b/externals/Makefile
index 10554ccf4..e60a73c99 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -642,6 +642,9 @@ $(gem_src)/Gem.dll: $(gem_src)/configure
CXXFLAGS="-DHAVE_S_STUFF_H" \
--host=i686-w64-mingw32 \
--without-ALL \
+ --with-jpeg \
+ --with-jpeg-cflags="-I/mingw32/include" \
+ --with-jpeg-libs="-L/mingw32/lib -ljpeg" \
--with-ftgl \
--with-ftgl-cflags="-I/mingw32/include -I/mingw32/include/freetype2" \
--with-ftgl-libs="-L/mingw32/lib -lftgl" \
diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile
index 9c41bbfa0..3d93c5681 100755
--- a/packages/win32_inno/Makefile
+++ b/packages/win32_inno/Makefile
@@ -118,6 +118,7 @@ lib_install:
install -p $(bin_src)/zlib1.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libpcre-1.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libgraphite2.dll $(DESTDIR)$(bindir)/
+ install -p $(bin_src)/libjpeg-8.dll $(DESTDIR)$(bindir)/
# Apparently these Gem dependencies must be in the bindir
# to be found on Windows
-install -p $(DESTDIR)/extra/Gem/gem_film*.dll $(DESTDIR)$(bindir)/
--
GitLab