Skip to content
Snippets Groups Projects
Unverified Commit 7d0a32df authored by Lars Kanis's avatar Lars Kanis
Browse files

Replace libjpeg-9b by libjpeg-turbo-1.5.2 for Windows

It is faster than libjpeg and is used in MSYS2-fox as well.
parent 57567d50
No related merge requests found
......@@ -138,7 +138,7 @@ Rake::ExtensionTask.new("fox16_c", gem_spec) do |ext|
dlls += [
"libfxscintilla-20.dll",
"libFOX-1.6-0.dll",
"libjpeg-9.dll",
"libjpeg-62.dll",
"libpng16-16.dll",
"libtiff-5.dll",
"zlib1.dll",
......@@ -179,7 +179,12 @@ task 'gem:windows' => 'gem' do
sh "bundle package"
debug = "FXRUBY_MINGW_DEBUG=#{ENV['FXRUBY_MINGW_DEBUG'].inspect}" if ENV['FXRUBY_MINGW_DEBUG']
RakeCompilerDock.sh "bundle --local --without=test && rake cross native gem MAKE=\"nice make V=1 -j `nproc`\" #{debug}"
RakeCompilerDock.sh <<-EOT
sudo apt update &&
sudo apt install yasm &&
bundle --local --without=test &&
rake cross native gem MAKE=\"nice make V=1 -j `nproc`\" #{debug}
EOT
end
# Set environment variable SWIG_LIB to
......
......@@ -27,8 +27,11 @@ LIBZ_SOURCE_URI = "http://zlib.net/fossils/zlib-#{LIBZ_VERSION}.tar.gz"
LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.29'
LIBPNG_SOURCE_URI = "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_VERSION}.tar.gz"
LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '9b'
LIBJPEG_SOURCE_URI = "http://www.ijg.org/files/jpegsrc.v#{LIBJPEG_VERSION}.tar.gz"
# LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '9b'
# LIBJPEG_SOURCE_URI = "http://www.ijg.org/files/jpegsrc.v#{LIBJPEG_VERSION}.tar.gz"
LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '1.5.2'
LIBJPEG_SOURCE_URI = "https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-#{LIBJPEG_VERSION}.tar.gz"
LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.0.8'
LIBTIFF_SOURCE_URI = "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment