- Getting things ready for the next releasev1.8.0

5 files changed, 64 insertions, 3 deletions

diff --git a/DevIL/CREDITS b/DevIL/CREDITS
index b30dc468..4bca96fa 100644
--- a/DevIL/CREDITS
+++ b/DevIL/CREDITS
@@ -1,4 +1,4 @@
-Credits as of 02/06/2009
+Credits as of 01/01/2017
 ------------------------
 
 If I inadvertently omitted anyone's name from this list, please e-mail me at
@@ -79,7 +79,7 @@ me how Microsoft does their .bmp padding.  He then wrote most of the
 iluEqualize() code from the base code on
 http://www.manning.com/Kabir/Files.html .
 
-Joel Wilsson, alias Siigron (siigron@hotmail.com) for pointing-out several
+Joel Wilsson, alias Siigron (siigron@hotmail.com) for pointing out several
 design flaws that I (Denton) had introduced and posing very useful
 suggestions.
 
@@ -246,6 +246,8 @@ http://gaia.fdi.ucm.es/grupo/projects/javy/devzone.html#DevILNotes.
 
 Jesse Maurais for support of X11 component
 
+Ben Campbell (https://github.com/bcampbell) for overhauling the CMake build system and various bugfixes
+
 
 Translations:
 -------------
diff --git a/DevIL/ChangeLog b/DevIL/ChangeLog
index 5cf6ded3..921ead27 100644
--- a/DevIL/ChangeLog
+++ b/DevIL/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-01 Denton Woods <doomwiz@users.sf.net>
+	* Added iluSepia and iluEqualize2
+	* Added ktx file format support
+	* Much updated CMake build system
+	* Various bugfixes from GitHub users
+
 2009-06-16 Matěj Týč <bubla@users.sf.net>
 	* m4/devil-definitions.m4: Fixed handling of nvtt and libsquish as C++
 	libraries instead of C (caused header found but could not be compiled
diff --git a/DevIL/README.md b/DevIL/README.md
index c8a0f2c8..d04b1e22 100644
--- a/DevIL/README.md
+++ b/DevIL/README.md
@@ -1,4 +1,4 @@
-Developer's Image Library version 1.7.8 Readme, Notes and Quick Use
+Developer's Image Library version 1.8.0 Readme, Notes and Quick Use
 -------------------------------------------------------------------
 
 <DZA[afk]> DevIL song: "la la la, a cross-platform image library utilizing a
diff --git a/DevIL/cmake/cmake_build.bat b/DevIL/cmake/cmake_build.bat
new file mode 100644
index 00000000..a6ed402a
--- /dev/null
+++ b/DevIL/cmake/cmake_build.bat
@@ -0,0 +1,51 @@
+rem @echo off
+
+rem BUILD 1 - 32-BIT ANSI
+rem =====================
+
+rm CMakeCache.txt
+rm -rf cmakefiles
+
+cmake . -G "Visual Studio 14 2015" -DUNICODE=0 -DJPEG_LIBRARY="D:\Coding\Libraries\jpeg-9b\libjpeg.lib" -DJPEG_INCLUDE_DIR="D:\Coding\Libraries\jpeg-9b" -DJPEG_INCLUDE_DIRS="D:\Coding\Libraries\jpeg-9b" -DPNG_LIBRARY="D:\Coding\Libraries\libpng-1.6.21\Release\libpng16_static.lib" -DPNG_PNG_INCLUDE_DIR="D:\Coding\Libraries\libpng-1.6.21" -DZLIB_LIBRARY="D:\Coding\Libraries\zlib-1.2.8\Release\zlibstatic.lib" -DZLIB_INCLUDE_DIR="D:\Coding\Libraries\zlib-1.2.8" -DTIFF_LIBRARY="D:\Coding\Libraries\tiff-4.0.6\libtiff\Release\tiff.lib" -DTIFF_INCLUDE_DIR="D:\Coding\Libraries\tiff-4.0.6\libtiff" -DJASPER_LIBRARIES="D:\Coding\Libraries\jasper-1.900.1\src\msvc\Win32_Release\libjasper.lib" -DJASPER_INCLUDE_DIR="D:\Coding\Libraries\jasper-1.900.1\src\libjasper\include" -DLIBSQUISH_LIBRARY="D:\Coding\Libraries\libsquish-1.14\Release\squish.lib" -DLIBSQUISH_LIBRARY_DEBUG="D:\Coding\Libraries\libsquish-1.14\Debug\squishd.lib" -DLIBSQUISH_INCLUDE_DIR="D:\Coding\Libraries\libsquish-1.14" -DLCMS2_LIBRARY="D:\Coding\Libraries\lcms2-2.7\Lib\MS\lcms2_static.lib" -DLCMS2_INCLUDE_DIR="D:\Coding\Libraries\lcms2-2.7\include" -DMNG_LIBRARY="D:\Coding\Libraries\libmng-2.0.3\bin\Release\libmng.lib" -DMNG_INCLUDE_DIR="D:\Coding\Libraries\libmng-2.0.3"
+
+devenv ImageLib.sln /Rebuild Release
+devenv ImageLib.sln /Rebuild Debug
+
+
+
+rem BUILD 2 - 32-BIT UNICODE
+rem ========================
+
+rm CMakeCache.txt
+rm -rf cmakefiles
+
+cmake . -G "Visual Studio 14 2015" -DUNICODE=1 -DJPEG_LIBRARY="D:\Coding\Libraries\jpeg-9b\libjpeg.lib" -DJPEG_INCLUDE_DIR="D:\Coding\Libraries\jpeg-9b" -DJPEG_INCLUDE_DIRS="D:\Coding\Libraries\jpeg-9b" -DPNG_LIBRARY="D:\Coding\Libraries\libpng-1.6.21\Release\libpng16_static.lib" -DPNG_PNG_INCLUDE_DIR="D:\Coding\Libraries\libpng-1.6.21" -DZLIB_LIBRARY="D:\Coding\Libraries\zlib-1.2.8\Release\zlibstatic.lib" -DZLIB_INCLUDE_DIR="D:\Coding\Libraries\zlib-1.2.8" -DTIFF_LIBRARY="D:\Coding\Libraries\tiff-4.0.6\libtiff\Release\tiff.lib" -DTIFF_INCLUDE_DIR="D:\Coding\Libraries\tiff-4.0.6\libtiff" -DJASPER_LIBRARIES="D:\Coding\Libraries\jasper-1.900.1\src\msvc\Win32_Release\libjasper.lib" -DJASPER_INCLUDE_DIR="D:\Coding\Libraries\jasper-1.900.1\src\libjasper\include" -DLIBSQUISH_LIBRARY="D:\Coding\Libraries\libsquish-1.14\Release\squish.lib" -DLIBSQUISH_LIBRARY_DEBUG="D:\Coding\Libraries\libsquish-1.14\Debug\squishd.lib" -DLIBSQUISH_INCLUDE_DIR="D:\Coding\Libraries\libsquish-1.14" -DLCMS2_LIBRARY="D:\Coding\Libraries\lcms2-2.7\Lib\MS\lcms2_static.lib" -DLCMS2_INCLUDE_DIR="D:\Coding\Libraries\lcms2-2.7\include" -DMNG_LIBRARY="D:\Coding\Libraries\libmng-2.0.3\bin\Release\libmng.lib" -DMNG_INCLUDE_DIR="D:\Coding\Libraries\libmng-2.0.3"
+
+devenv ImageLib.sln /Build Release
+devenv ImageLib.sln /Build Debug
+
+
+
+rem BUILD 3 - 64-BIT ANSI
+rem =====================
+
+rm CMakeCache.txt
+rm -rf cmakefiles
+
+cmake . -G "Visual Studio 14 2015 Win64" -DUNICODE=0 -DPNG_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\libpng-1.6.21\Release\libpng16_static.lib" -DPNG_PNG_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\libpng-1.6.21" -DJASPER_LIBRARIES="D:\Coding\Libraries\64-bit for DevIL\jasper-1.900.1\src\msvc\Win64_Release\libjasper.lib" -DJASPER_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\jasper-1.900.1\src\libjasper\include" -DZLIB_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\zlib-1.2.8\Release\zlibstatic.lib" -DZLIB_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\zlib-1.2.8" -DTIFF_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\tiff-4.0.6\libtiff\Release\tiff.lib" -DTIFF_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\tiff-4.0.6\libtiff" -DJPEG_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\jpeg-9b\x64\Release\libjpeg.lib" -DJPEG_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\jpeg-9b" -DJPEG_INCLUDE_DIRS="D:\Coding\Libraries\64-bit for DevIL\jpeg-9b" -DLIBSQUISH_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\libsquish-1.14\Release\squish.lib" -DLIBSQUISH_LIBRARY_DEBUG="D:\Coding\Libraries\64-bit for DevIL\libsquish-1.14\Debug\squishd.lib" -DLIBSQUISH_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\libsquish-1.14" -DLCMS2_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\lcms2-2.7\Lib\MS\lcms2_static.lib" -DLCMS2_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\lcms2-2.7\include" -DMNG_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\libmng-2.0.3\bin\Release\libmng.lib" -DMNG_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\libmng-2.0.3"
+
+devenv ImageLib.sln /Build Release
+devenv ImageLib.sln /Build Debug
+
+
+
+rem BUILD 4 - 64-BIT UNICODE
+rem ========================
+
+rm CMakeCache.txt
+rm -rf cmakefiles
+
+cmake . -G "Visual Studio 14 2015 Win64" -DUNICODE=1 -DPNG_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\libpng-1.6.21\Release\libpng16_static.lib" -DPNG_PNG_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\libpng-1.6.21" -DJASPER_LIBRARIES="D:\Coding\Libraries\64-bit for DevIL\jasper-1.900.1\src\msvc\Win64_Release\libjasper.lib" -DJASPER_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\jasper-1.900.1\src\libjasper\include" -DZLIB_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\zlib-1.2.8\Release\zlibstatic.lib" -DZLIB_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\zlib-1.2.8" -DTIFF_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\tiff-4.0.6\libtiff\Release\tiff.lib" -DTIFF_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\tiff-4.0.6\libtiff" -DJPEG_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\jpeg-9b\x64\Release\libjpeg.lib" -DJPEG_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\jpeg-9b" -DJPEG_INCLUDE_DIRS="D:\Coding\Libraries\64-bit for DevIL\jpeg-9b" -DLIBSQUISH_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\libsquish-1.14\Release\squish.lib" -DLIBSQUISH_LIBRARY_DEBUG="D:\Coding\Libraries\64-bit for DevIL\libsquish-1.14\Debug\squishd.lib" -DLIBSQUISH_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\libsquish-1.14" -DLCMS2_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\lcms2-2.7\Lib\MS\lcms2_static.lib" -DLCMS2_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\lcms2-2.7\include" -DMNG_LIBRARY="D:\Coding\Libraries\64-bit for DevIL\libmng-2.0.3\bin\Release\libmng.lib" -DMNG_INCLUDE_DIR="D:\Coding\Libraries\64-bit for DevIL\libmng-2.0.3"
+
+devenv ImageLib.sln /Build Release
+devenv ImageLib.sln /Build Debug
diff --git a/DevIL/src-ILU/msvc/ilu.def b/DevIL/src-ILU/msvc/ilu.def
index b9587839..171d5452 100644
--- a/DevIL/src-ILU/msvc/ilu.def
+++ b/DevIL/src-ILU/msvc/ilu.def
@@ -18,6 +18,7 @@ iluEmboss
 iluEnlargeCanvas
 iluEnlargeImage
 iluEqualize
+iluEqualize2
 iluErrorString
 iluFlipImage
 iluGenImage
@@ -44,6 +45,7 @@ iluSaturate4f
 iluScaleColours
 iluScale
 iluScaleAlpha
+iluSepia
 iluSetLanguage
 iluSharpen
 iluSwapColours