Merge pull request #51 from abma/master

fix linux compile + add travis-ci support

27 files changed, 146 insertions, 1191 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..2a514253
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+CMakeFiles/
+Makefile
+cmake_install.cmake
+*.swp
+
+/src-IL/IL.pc
+/src-ILU/ILU.pc
+/src-ILUT/ILUT.pc
+/DevIL/src-IL/include/config.h
+/CMakeCache.txt
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..4bb7db1d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+#
+# libdevil travis hook
+#
+
+language: cpp
+dist: trusty
+sudo: required
+
+compiler:
+    - clang
+    - gcc
+before_script:
+    - sudo apt-get install libpng12-dev zlib1g-dev libjpeg-dev libtiff4-dev libmng-dev libjasper-dev liblcms1-dev freeglut3-dev libsdl1.2-dev liblcms2-dev libcppunit-dev
+script:
+    - cmake DevIL
+    - make all UnitTest benchmark
diff --git a/DevIL/CMakeLists.txt b/DevIL/CMakeLists.txt
index a26f8eac..e342f93d 100644
--- a/DevIL/CMakeLists.txt
+++ b/DevIL/CMakeLists.txt
@@ -7,4 +7,9 @@ set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 add_subdirectory(src-IL)
 add_subdirectory(src-ILU)
 add_subdirectory(src-ILUT)
+option(IL_TESTS "build DevIL tests" ON)
+if (IL_TESTS)
+    ENABLE_TESTING()
+    Add_Subdirectory(test)
+endif()
 
diff --git a/DevIL/configure.ac b/DevIL/configure.ac
deleted file mode 100644
index 2268246a..00000000
--- a/DevIL/configure.ac
+++ /dev/null
@@ -1,456 +0,0 @@
-dnl 
-dnl Autoconf script for DevIL Library
-dnl Originally written by Meloni Dario
-dnl rewritten by Matěj Týč
-dnl
-
-dnl
-dnl configure.ac initialization
-dnl we use some macros that are in m4 directory
-dnl
-AC_INIT([DevIL], 
-	1.7.8,
-	[bubla@users.sourceforge.net])
-dnl Minimum Autoconf version
-AC_PREREQ(2.52)
-dnl What header will be generated by configure script
-AC_CONFIG_HEADERS([include/IL/config.h])
-dnl Where are some sources?
-AC_CONFIG_SRCDIR([src-IL/src/il_main.c])
-dnl Where are other macro definitions?
-AC_CONFIG_MACRO_DIR([m4])
-dnl Where to put various auxiliary files
-AC_CONFIG_AUX_DIR([build-aux])
-dnl Libtool init with message that we want to build DLLs
-dnl LT_INIT([win32-dll])
-dnl LT_PROG_RC
-dnl THE ABOVE IS LIBTOOL INIT IS THE GOOD ONE, BUT MAYBE TOO UP-TO-DATE FOR MOST PEOPLE
-AC_PROG_LIBTOOL
-AC_LIBTOOL_WIN32_DLL
-dnl Automake init with all warnings reported
-AM_INIT_AUTOMAKE([-Wall])
-
-dnl
-dnl Note that the libtool version has nothing to do
-dnl with the actual DevIL version, it is a version number
-dnl describing the interface version (see libtool doc)
-dnl wich only changes when the interface changes  
-dnl
-dnl format is <current>:<revision>:<age>
-dnl If nothing notable changes, increment revision
-dnl current is an interface number
-dnl library supports interfaces from current - age to current
-dnl
-DEVIL_LTVERSION=2:0:1
-AC_SUBST([DEVIL_LTVERSION])
-
-dnl
-dnl Test build options
-dnl
-AC_ARG_ENABLE([debug],
-	      [AS_HELP_STRING([--enable-debug],
-			      [Compile a debug version of the library])],
-              [],
-	      [enable_debug="no"])
-
-AC_ARG_ENABLE([release],
-	      [AS_HELP_STRING([--disable-release],
-			      [Compile a debug version of the library, default enabled if not building debug version])],
-              [],
-	      [enable_release="yes"
-	       test "x$enable_debug" = "xyes" && enable_release="no"])
-
-AC_ARG_ENABLE([asm],
-	      [AS_HELP_STRING([--disable-asm],
-			      [Use assembler routines if possible, default enable if not building debug version])],
-	      [],
-	      [enable_asm="yes"
-	       test "x$enable_debug" = "xyes" && enable_asm="no"])
-
-dnl Set right flags regarding whether we explicitly debug or release
-AS_IF([test "x$enable_release" = "xyes"],
-      [AS_IF([test "x$CFLAGS" = "x"],
-	     [CFLAGS="-O3"])
-       AS_IF([test "x$CXXFLAGS" = "x"],
-	     [CXXFLAGS="-O3"]) ],
-      [test "x$enable_debug" = "xyes"],
-      [CFLAGS="-DNOINLINE -Wextra -g -O0"
-       CXXFLAGS="-DNOINLINE -Wextra -g -O0"
-       AC_DEFINE([DEBUG],
-		 [],
-		 ["Enable debug code features"]) ])
-
-dnl
-dnl Basic conf
-dnl
-SUPPORTED_FORMATS=""
-SUPPORTED_API=""
-SUPPORTED_EXTENSION=""
-AC_REVISION([$Revision: 1.48 $])
-dnl AC_PREFIX_DEFAULT(/usr/local)
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-dnl AC_LANG([C++])
-AC_LANG([C])
-AM_PROG_CC_C_O
-AC_PROG_CXX
-AC_PROG_MAKE_SET
-AC_C_BIGENDIAN
-
-dnl checks for X are to be done later...
-dnl AC_PATH_XTRA
-
-dnl Settling whether the user will want to build examples or not
-AC_ARG_WITH([examples],
-	    [AS_HELP_STRING([--with-examples[[=yes/no]]],
-			    [Whether to build and install examples as well. Default is without examples])],
-	    [],
-	    [with_examples="no"])
-AM_CONDITIONAL([BUILD_EXAMPLES],
-	       [test "x$with_examples" = "xyes"])
-
-dnl Do we want monolithic library (DevIL instead of IL, ILU, ILUT). Useful probably only on Windows... Discouraged.
-dnl Whether to build IL. You have to anyway :-)
-dnl AC_ARG_ENABLE([IL],
-dnl	      [AS_HELP_STRING([--enable-IL[[=yes/no]]],
-dnl	                      [Build IL part of DevIL. You  that. Default set to yes])],
-dnl              [],
-dnl	      [enable_IL="yes"])
-enable_IL="yes"
-AM_CONDITIONAL([BUILD_IL],
-	       [test "x$enable_IL" = "xyes"])
-
-dnl Whether to build ILU...
-AC_ARG_ENABLE([ILU],
-	      [AS_HELP_STRING([--enable-ILU[[=yes/no]]],
-			      [Build ILU part of DevIL. Default set to no])],
-              [],
-	      [enable_ILU="no"])
-
-dnl Whether to build ILUT...
-AC_ARG_ENABLE([ILUT],
-	      [AS_HELP_STRING([--enable-ILUT[[=yes/no]]],
-			      [Build ILUT part of DevIL. Default set to no. ILU will be built along whether you want it or not since ILUT depends upon it.])],
-              [],
-	      [enable_ILUT="no"])
-dnl We have to build ILU if we want ILUT as well...
-AM_CONDITIONAL([BUILD_ILU],
-	       [test "x$enable_ILU" = "xyes" -o "x$enable_ILUT" = "xyes"])
-AM_CONDITIONAL([BUILD_ILUT],
-	       [test "x$enable_ILUT" = "xyes"])
-
-dnl
-dnl We want to build ILU, so let's tell it (useful for examples/tests)
-dnl while iluErrorString is still in ILU
-dnl
-AS_IF([test "x$enable_ILU" = "xyes" -o "x$enable_ILUT" = "xyes"],
-      [AC_DEFINE([ILU_ENABLED],,
-		 [Define if you want to build ILU part of DevIL (used in DevIL examples/tests)]) ])
-
-dnl Test for restrict c/c++ keyword
-DEVIL_CHECK_RESTRICT
-
-
-
-dnl must add AC_CACHE_CHECK support where possible
-
-dnl AM_MAINTAINER_MODE
-
-dnl Now the phase of testing of extensions...
-TEST_EXT([Altivec],
-	 [-faltivec -maltivec],
-	 [vector int vec;vec=vec_splat_u32(0);],
-	 [ALTIVEC_GCC],
-	 [],
-	 [altivec])
-
-TEST_EXT([SSE],
-	 [-msse],
-	 [__m128 v;v=_mm_sub_ss(v,v);],
-	 [SSE],
-	 [#include <xmmintrin.h>],
-	 [sse])
-
-TEST_EXT([SSE2],
-	 [-msse2],
-	 [__m128i v;v=_mm_add_epi32(v,v);],
-	 [SSE2],
-	 [#include <emmintrin.h>],
-	 [sse2])
-
-TEST_EXT([SSE3],
-	 [-msse3],
-	 [__m128d v;v=_mm_addsub_pd(v,v);],
-	 [SSE3],
-	 [#include <pmmintrin.h>],
-	 [sse3])
-
-dnl Do we want to use ASM routines?
-AS_IF([test "x$enable_asm" = "xyes"],
-      [TEST_ASM([i[[3456]]86*],
-                [X86_ASM],
-	        [GCC_X86_ASM],
-                [x86])
-       TEST_ASM([x86_64*],
-                [X86_64_ASM],
-                [GCC_X86_64_ASM],
-                [x86_64])
-       TEST_ASM([powerpc*],
-                [PPC_ASM],
-                [GCC_PCC_ASM],
-                [ppc]) 
-	AS_IF([test -n "$SUPPORTED_EXTENSION"],
-	      [AC_DEFINE([IL_INLINE_ASM],
-			 [1],
-			 [Define if you can support at least some ASM]) ]) ])
-
-dnl
-dnl Memory alignment functions
-dnl
-AC_CHECK_FUNC([valloc], 
-	      [AC_DEFINE([VALLOC],
-			 [1],
-			 [define if you have valloc memory allocation]) ])
-AC_CHECK_FUNC([posix_memalign], 
-	      [AC_DEFINE([POSIX_MEMALIGN],
-			 [1],
-			 [define if you have posix_memalign memory allocation]) ])
-
-AC_CHECK_FUNC([memalign], 
-	      [AC_DEFINE([MEMALIGN],
-			 [1],
-			 [define if you have memalign memory allocation]) ])
-
-AC_CHECK_HEADER([mm_malloc.h],
-		[AC_DEFINE([MM_MALLOC],
-			   [1],
-			   [define if you have mm_malloc.h header]) ])
-
-dnl
-dnl Libraries development checking
-dnl
-AC_ARG_WITH([zlib],
-            [AC_HELP_STRING([--with-zlib[[=yes/no]]],
-                            [Do wou want to use zlib?])],
-	    [],
-            [enable_zlib="yes"])
-
-AS_IF([test "x$enable_zlib" = "xyes"],
-      [AC_CHECK_HEADER([zlib.h], 
-		       [use_z="yes"], 
-		       [use_z="no"]) 
-       AS_IF([test "$enable_zlib" = "yes"],
-             [AC_CHECK_LIB([z],
-                           [main]) ]) ])
-
-dnl 
-dnl We need to link in math stuff, maybe we have to do it manually here...
-dnl
-AC_CHECK_LIB([m],
-	     [main])
-
-dnl
-dnl DevIL now supports a lot of game image formats.
-dnl Some people may not like it, so let's give'em a choice!
-dnl
-AC_ARG_ENABLE([game-formats],
-	       [AS_HELP_STRING([--enable-game-formats[[=yes/no]]],
-			       [Enable support for various game formats. Some people may consider that redundant. (default=yes)]) ],
-	       [],
-	       [enable_game_formats="yes"])
-AS_IF([test "x$enable_game_formats" = "xno"],
-      [AC_DEFINE([IL_NO_GAMES],,
-		 [Define if you want to disable support for various game formats]) ])
-
-dnl 
-dnl Ask here whether the user wants to support a format, optionally do some tests whether it can be supported
-dnl
-TEST_FORMAT([blp], [BLP], [BLP is the texture format for Blizzard games.])
-TEST_FORMAT([bmp], [BMP], [BMP is a standard Windows bitmap.])
-TEST_FORMAT([dcx], [DCX], [DCX is a multi-page PCX file.])
-TEST_FORMAT([dds], [DDS], [DDS (DirectDraw Surface) is used by DirectX to load images (usually DXTC).])
-TEST_FORMAT([dicom], [DICOM], [DICOM (Digital Imaging and Communications in Medicine) is used extensively in medical imaging.])
-TEST_FORMAT([doom],[WAD], [WAD is the format for graphics in the original DooM I/II.])
-TEST_FORMAT([exr], [EXR], [EXR is a HDR image file format standardized by Industrial Light and Magic. OpenEXR powered], [SETTLE_OPENEXR])
-TEST_FORMAT([fits], [FITS], [FITS (Flexible Image Transport System) is used for storing scientific images and is used extensively in astronomy.])
-TEST_FORMAT([gif], [GIF], [GIF is lossy and proprietary format used mainly to make animations])
-TEST_FORMAT([hdr], [HDR], [HDR is the Radiance High Dynamic Range format, using more bits per channel than normal.])
-TEST_FORMAT([icns],[ICNS], [ICNS is the icon format for the Mac OS X operation system.])
-TEST_FORMAT([icon],[ICON], [ICO is the icon format for the Windows operating system.])
-TEST_FORMAT([iff], [IFF], [IFF (Interchange File Format) is used to transfer images between software from different companies.])
-TEST_FORMAT([ilbm], [ILBM], [ILBM (Amiga Interleaved BitMap Format).])
-TEST_FORMAT([iwi], [IWI], [IWI is the Infinity Ward Image format used in the Call of Duty games.])
-TEST_FORMAT([jpeg],[JPG], [JPEG is most common lossy format. libjpeg powered], [SETTLE_JPEG])
-TEST_FORMAT([jp2], [JP2], [JP2 (JPEG 2000) is a better, but not so widespread, alternative to JPEG. JasPer powered], [SETTLE_JASPER])
-TEST_FORMAT([lcms],[LCMS], [],[SETTLE_LCMS])
-TEST_FORMAT([lif], [LIF], [LIF is the image format of the game Homeworld.])
-TEST_FORMAT([mdl], [MDL], [MDL is the format for models in the game Half-Life.])
-TEST_FORMAT([mng], [MNG], [MNG is basically the animated version of PNG but is not widespread.], [SETTLE_MNG])
-TEST_FORMAT([mp3], [MP3], [MP3 (MPEG-1 Audio Layer 3) sometimes have images in them, such as cover art.])
-TEST_FORMAT([pcx], [PCX], [PCX is one of the first widely accepted DOS imaging standards])
-TEST_FORMAT([pcd], [PCD], [PCD is the Kodak PhotoCD format.])
-TEST_FORMAT([pic], [PIC], [PIC is used by SoftImage software.])
-TEST_FORMAT([pix], [PIX], [])
-TEST_FORMAT([png], [PNG], [PNG is a smart, loseless and even open format. libpng powered.], [SETTLE_PNG])
-TEST_FORMAT([pnm], [PNM], [PNM (Portable aNy Map format) is considered the least-common-denominator for converting pixmap, graymap, or bitmap files between different platforms.])
-TEST_FORMAT([psd], [PSD], [PSD is the PhotoShop native file format.])
-TEST_FORMAT([psp], [PSP], [PSP is the Paint Shop Pro native file format.])
-TEST_FORMAT([pxr], [PXR], [PXR is used by Pixar.])
-TEST_FORMAT([raw], [RAW], [RAW is simply raw data.])
-TEST_FORMAT([rot], [ROT], [ROT is the image format for the game Homeworld 2.])
-TEST_FORMAT([sgi], [SGI], [SGI is the native raster graphics file format for Silicon Graphics workstations])
-TEST_FORMAT([sun], [SUN], [SUN is the image format used on Sun's operating systems.])
-TEST_FORMAT([texture], [TEXTURE], [TEXTURE is the format used in Medieval II: Total War (similar to DDS).])
-TEST_FORMAT([tga], [TGA], [TGA (aka TARGA file format) has been used mainly in games. It is open and simple.])
-TEST_FORMAT([tiff],[TIF], [TIFF is a lossless format supporting greater color depths. libtiff powered], [SETTLE_TIFF])
-TEST_FORMAT([tpl], [TPL], [TPL is the format used by many GameCube and Wii games.])
-TEST_FORMAT([utx], [UTX], [UTX is the format used in the Unreal Tournament game series.])
-TEST_FORMAT([vtf], [VTF], [VTF (Valve Texture Format) is used by games based on Valve's Source engine.])
-TEST_FORMAT([wal], [WAL], [WAL is the image format used for the game Quake 2.])
-TEST_FORMAT([wbmp], [WBMP], [WBMP (Wireless Application Protocol Bitmap) is a monochrome graphics file format optimized for mobile computing devices])
-TEST_FORMAT([wdp], [WDP], [WDP is Microsoft's successor to JPEG, able to store many different image types either lossy or losslessly, also known as HD Photo.])
-TEST_FORMAT([xpm], [XPM], [XPM (X PixMap) is an ASCII-based image used in X Windows.])
-
-dnl
-dnl Give users chance to disable check for these two libraries that can't be disabled 
-dnl by any other means...
-dnl 
-AC_ARG_WITH([libsquish],
-	    [AS_HELP_STRING([--with-squish[[=yes/no]]],
-			    [Do you want to use the squish library if possible? (enables HW accelerated DXT compression, default="yes")]) ],
-	    [],
-	    [with_libsquish="yes"])
-AS_IF([test "x$with_libsquish" = "xyes"],
-      [DEVIL_CHECK_LIBSQUISH])
-
-AC_ARG_WITH([nvtt],
-	    [AS_HELP_STRING([--with-nvtt[[=yes/no]]],
-			    [Do you want to use the Nvidia texture tools if possible? (enables GPU accelerated image manipulation, default="yes")]) ],
-	    [],
-	    [with_nvtt="yes"])
-AS_IF([test "x$with_nvtt" = "xyes"],
-      [DEVIL_CHECK_NVIDIA_TEXTOOLS])
-
-dnl
-dnl ILUT APIs library checking
-dnl
-AS_IF([test "x$enable_ILUT" = "xyes"],
-      [SETTLE_ALLEGRO
-       SETTLE_DX8
-       SETTLE_DX9
-       SETTLE_OPENGL
-       SETTLE_SDL
-       SETTLE_W32
-       SETTLE_X11])
- 
-dnl
-dnl AM_COND_IF([condition],[do-if-true]) has to be kept in sync with examples/Makefile.am
-dnl The AM_COND_IF seems to be too new at the moment, let's wait a little bit till things settle...
-dnl
-
-dnl AM_COND_IF([BUILD_ILU],
-AS_IF([test "x$enable_ILU" != "xyes"],
-	   [EXAMPLES_TO_BUILD="$EXAMPLES_TO_BUILD IL_override IL_read IL_simple"])
-
-AS_IF([test "x$enable_ILU" = "xyes"],
-	   [EXAMPLES_TO_BUILD="$EXAMPLES_TO_BUILD ILU_override ILU_read ILU_simple"])
-
-dnl AM_COND_IF([BUILD_ILUT],
-AS_IF([test "x$enable_ILUT" = "xyes"],
-	   [EXAMPLES_TO_BUILD="$EXAMPLES_TO_BUILD ILUT_cpp_wrapper"])
-
-AM_CONDITIONAL([USE_ALLEGRO], 
-	       [test "x$use_allegro" = "xyes"])
-dnl AM_COND_IF([USE_ALLEGRO],
-AS_IF([test "x$use_allegro" = "xyes"],
-	   [EXAMPLES_TO_BUILD="$EXAMPLES_TO_BUILD ILUT_allegro"])
-
-AM_CONDITIONAL([USE_DIRECTX8],
-               [test "x$use_directx8" = "xyes"])
-
-AM_CONDITIONAL([USE_DIRECTX9],
-               [test "x$use_directx9" = "xyes"])
-
-AM_CONDITIONAL([USE_DIRECTX],
-               [test "x$use_directx8" = "xyes" -o "x$use_directx9" = "xyes"])
-dnl AM_COND_IF([USE_DIRECTX],
-AS_IF([test "x$use_directx8" = "xyes" -o "x$use_directx9" = "xyes"],
-	   [EXAMPLES_TO_BUILD="$EXAMPLES_TO_BUILD ILUT_d3d ILUT_windows"])
-
-AM_CONDITIONAL([USE_OPENGL],
-               [test "x$use_ogl" = "xyes"])
-
-AM_CONDITIONAL([HAVE_GLUT],
-	       [test "x$have_glut" = "xyes"])
-
-AM_CONDITIONAL([USE_SDL],
-               [test "x$use_sdl" = "xyes"])
-dnl AM_COND_IF([USE_SDL],
-AS_IF([test "x$use_sdl" = "xyes"],
-	   [EXAMPLES_TO_BUILD="$EXAMPLES_TO_BUILD ILUT_sdl"])
-
-AM_CONDITIONAL([USE_W32],
-               [test "x$use_w32" = "xyes"])
-dnl AM_COND_IF([USE_W32],
-AS_IF([test "x$use_w32" = "xyes"],
-	   [EXAMPLES_TO_BUILD="$EXAMPLES_TO_BUILD ILUT_animation"])
-
-AM_CONDITIONAL([USE_X11],
-               [test "x$use_x11" = "xyes"])
-#this is instedad AM_COND_IF([USE_OPENGL && USE_X11])
-AS_IF([test "x$have_glut" = "xyes" -a "x$use_x11" = "xyes"],
-      [EXAMPLES_TO_BUILD="$EXAMPLES_TO_BUILD ILUT_gl ILUT_volume"])
-
-dnl Win32
-AS_CASE([$host],
-        [*mingw32*],
-        [PLATFORM="MINGW32"],
-        [*cygwin*],
-        [ADD_CFLAGS([-mno-cygwin])
-	 LIBILUT_WIN32LIBPATH="-L/usr/lib/w32api"
-	 PLATFORM="CYGWIN"],
-        [*darwin*],
-	[AC_DEFINE([MAX_OS_X],
-		   [],
-		   [Building on Mac OS X]) 
-	 PLATFORM="OSX"],
-	 [*linux*],
-	 [PLATFORM="LINUX"])
-AC_SUBST([PLATFORM])
-
-AM_CONDITIONAL([WINDOWS_BUILD],
-	       [test "x$PLATFORM" = "xMINGW32" -o "x$PLATFORM" = "xCYGWIN"])
-
-dnl Final substitution
-AC_SUBST([GENERAL_CFLAGS])
-AC_SUBST([IL_CFLAGS])
-AC_SUBST([IL_LIBS])
-AC_SUBST([ILU_CFLAGS])
-AC_SUBST([ILU_LIBS])
-AC_SUBST([ILUT_CFLAGS])
-AC_SUBST([ILUT_LIBS])
-AC_SUBST([LIBILUT_WIN32LIBPATH])
-AC_SUBST([SUPPORTED_FORMATS])
-
-dnl
-dnl Ouput files to generate
-dnl note: keep the list on one line separated by single spaces 
-dnl (otherwise MSYS compilation breaks)
-AC_CONFIG_FILES([Makefile 
-		 lib/Makefile 
-		 bin/Makefile
-		 test/Makefile 
-		 docs/Makefile 
-		 data/Makefile 
-		 data/IL.pc data/ILU.pc data/ILUT.pc
-		 test/format_test/format_checks.sh test/format_test/ilu_checks.sh])
-dnl		 projects/Makefile]) 
-# src-IL/Makefile  src-IL/src/Makefile  src-IL/include/Makefile  src-ILU/Makefile  src-ILU/src/Makefile  src-ILU/include/Makefile  src-ILUT/Makefile  src-ILUT/src/Makefile  src-ILUT/include/Makefile  include/Makefile  include/IL/Makefile
-AC_OUTPUT
-
-dnl And a nice report in the end!
-IL_REPORT
-ILU_REPORT
-ILUT_REPORT
-EXTENSIONS_REPORT
-EXAMPLES_REPORT
diff --git a/DevIL/docs/Makefile.am b/DevIL/docs/Makefile.am
deleted file mode 100644
index 0dd67eab..00000000
--- a/DevIL/docs/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-info_TEXINFOS = DevIL_manual.texi
-
-dvi:
-	echo "The DVI documentation won't be built. It is not feasible since it contains a lot of images. Build PDF or HTML docs instead..."
-
-EXTRA_DIST = generate-images.sh
-EXTRA_DIST += images/DevIL.jpg\
-	     images/DevIL.png\
-	     images/devil_msvc_include.png\
-	     images/devil_msvc_lib.png\
-	     images/ilu_small_stairway_alienify.jpg\
-	     images/ilu_small_stairway_blurAvg_10.jpg\
-	     images/ilu_small_stairway_blurGaussian_10.jpg\
-	     images/ilu_small_stairway_contrast_0.4.jpg\
-	     images/ilu_small_stairway_contrast_1.7.jpg\
-	     images/ilu_small_stairway_emboss.jpg\
-	     images/ilu_small_stairway_equalize.jpg\
-	     images/ilu_small_stairway_gammaCorrect_0.7.jpg\
-	     images/ilu_small_stairway_gammaCorrect_1.6.jpg\
-	     images/ilu_small_stairway_mirror.jpg\
-	     images/ilu_small_stairway_negative.jpg\
-	     images/ilu_small_stairway_noisify_0.1.jpg\
-	     images/ilu_small_stairway_noisify_0.8.jpg\
-	     images/ilu_small_stairway_pixelize_5.jpg\
-	     images/ilu_small_stairway_saturate1f_0.6.jpg\
-	     images/ilu_small_stairway_sharpen_1.8_2.jpg\
-	     images/ilu_small_stairway_sharpen_2.1_3.jpg\
-	     images/ilu_small_stairway_wave_1.2.jpg\
-	     images/original_stairway.jpg\
-	     images/small_stairway.jpg
diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
index 7a0f87d8..2547a81b 100644
--- a/DevIL/src-IL/CMakeLists.txt
+++ b/DevIL/src-IL/CMakeLists.txt
@@ -6,7 +6,9 @@ include (TestBigEndian)
 option(BUILD_SHARED_LIBS "Build with shared (.DLL .SO) libraries." ON)
 
 # libSquish not currently supported by CMake
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${DevIL_SOURCE_DIR}/cmake/Modules")
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 file(GLOB DevIL_SRCS src/*.cpp)
 file(GLOB DevIL_INC include/*.h ../include/config.h ../include/IL/devil_internal_exports.h ../include/IL/il.h)
diff --git a/DevIL/src-IL/include/Makefile.am b/DevIL/src-IL/include/Makefile.am
deleted file mode 100644
index fb02f398..00000000
--- a/DevIL/src-IL/include/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-noinst_HEADERS  = il_targa.h    il_doompal.h \
-                  il_jpeg.h     il_pnm.h     \
-                  il_endian.h   il_lif.h     \
-                  il_q2pal.h    il_alloc.h   \
-                  il_manip.h 	il_hdr.h     \
-                  il_register.h il_bits.h    \
-                  il_files.h    il_mdl.h     \
-                  il_rle.h      il_bmp.h     \
-                  il_icon.h     il_pal.h     \
-                  il_sgi.h      il_dcx.h     \
-                  il_internal.h il_pcx.h     \
-                  il_states.h   il_dds.h     \
-                  il_stack.h    il_pic.h     \
-                  il_psd.h      il_psp.h     \
-                  il_gif.h		il_vtf.h     \
-				  il_exr.h \
-				  altivec_common.h \
-                  altivec_typeconversion.h
diff --git a/DevIL/src-IL/src/Makefile.am b/DevIL/src-IL/src/Makefile.am
deleted file mode 100644
index c49e6190..00000000
--- a/DevIL/src-IL/src/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-lib_LTLIBRARIES = libIL.la
-
-libIL_la_SOURCES = il_alloc.c     il_doom.c      il_stack.c    il_pcx.c        il_rle.c \
-                   il_bits.c      il_endian.c    il_jpeg.c     il_pic.c        il_sgi.c \
-                   il_bmp.c       il_error.c     il_lif.c      il_png.c        il_states.c \
-                   il_convbuff.c  il_files.c     il_main.c     il_pnm.c        il_targa.c \
-                   il_convert.c   il_gif.c       il_manip.c    il_profiles.c   il_tiff.c \
-                   il_cut.c       il_header.c    il_mdl.c      il_quantizer.c  il_utility.c \
-                   il_dcx.c       il_icon.c      il_mng.c      il_raw.c        il_wal.c \
-                   il_dds.c       il_internal.c  il_pal.c      il_rawdata.c    il_devil.c \
-                   il_io.c        il_pcd.c       il_register.c il_psd.c        il_fastconv.c \
-                   il_neuquant.c  il_dds-save.c  il_psp.c      il_pix.c        il_pxr.c \
-                   il_xpm.c       il_hdr.c       il_icns.c     il_jp2.c        il_vtf.c \
-                   il_wbmp.c      il_exr.cpp     il_nvidia.cpp il_squish.cpp   il_iff.c \
-                   il_size.c      il_tpl.c       il_fits.c     il_iwi.c        il_blp.c \
-                   il_ftx.c       il_dicom.c     il_rot.c	   il_ilbm.c \
-                   altivec_common.c altivec_typeconversion.c
-
-AM_CFLAGS = @LIBIL_CFLAGS@
-libIL_la_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ @VERSIONINFO@
-libIL_la_LIBADD = @LIBPNG@ @LIBJPG@ @LIBTIFF@ @LIBMNG@ @LIBLCMS@ @LIBZ@
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src-IL/include -I$(top_builddir)/include @LIBPNG_INCLUDE@
diff --git a/DevIL/src-IL/src/il_dds.cpp b/DevIL/src-IL/src/il_dds.cpp
index 46e64344..a1df617b 100644
--- a/DevIL/src-IL/src/il_dds.cpp
+++ b/DevIL/src-IL/src/il_dds.cpp
@@ -632,7 +632,7 @@ ILuint DecodePixelFormat(ILuint *CompFormat)
 //--------------------------------------------------------------------------------------
 // Return the BPP for a particular format.
 //--------------------------------------------------------------------------------------
-static size_t BitsPerPixel(_In_ DXGI_FORMAT fmt)
+static size_t BitsPerPixel(DXGI_FORMAT fmt)
 {
 	switch (fmt)
 	{
diff --git a/DevIL/src-IL/src/il_pnm.cpp b/DevIL/src-IL/src/il_pnm.cpp
index 2b057035..dc87cc9a 100644
--- a/DevIL/src-IL/src/il_pnm.cpp
+++ b/DevIL/src-IL/src/il_pnm.cpp
@@ -466,8 +466,10 @@ ILboolean ilReadPam()
 			Info.Depth = atoi((const char*)SmallBuff);
 		else if (!strncmp(TempStr.c_str(), "MAXVAL", 6))
 			Info.MaxColour = atoi((const char*)SmallBuff);
-		else if (!strncmp(TempStr.c_str(), "TUPLTYPE", 8))
-			Info.TuplType = DecodeTupleType(string((char*)SmallBuff));
+		else if (!strncmp(TempStr.c_str(), "TUPLTYPE", 8)) {
+			string tmp = (char*)SmallBuff;
+			Info.TuplType = DecodeTupleType(tmp);
+		}
 	}
 
 	//@TODO: Handle other max colors and tuple types
diff --git a/DevIL/src-ILU/include/Makefile.am b/DevIL/src-ILU/include/Makefile.am
deleted file mode 100644
index a606cbf3..00000000
--- a/DevIL/src-ILU/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-noinst_HEADERS  = ilu_alloc.h  ilu_filter.h   \
-                  ilu_mipmap.h ilu_region.h   \
-                  ilu_internal.h  ilu_states.h
diff --git a/DevIL/src-ILU/src/Makefile.am b/DevIL/src-ILU/src/Makefile.am
deleted file mode 100644
index 16102174..00000000
--- a/DevIL/src-ILU/src/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-lib_LTLIBRARIES = libILU.la
-
-libILU_la_SOURCES = ilu_alloc.c       ilu_internal.c  ilu_noise.c \
-                    ilu_scale.c       ilu_error.c     ilu_main.c \
-                    ilu_rotate.c      ilu_scaling.c   ilu_filter.c \
-                    ilu_manip.c       ilu_scale2d.c   ilu_states.c \
-                    ilu_filter_rcg.c  ilu_mipmap.c    ilu_scale3d.c \
-                    ilu_utilities.c	  ilu_region.c
-
-AM_CFLAGS = @LIBILU_CFLAGS@
-
-libILU_la_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ @VERSIONINFO@ \
-                    $(top_srcdir)/src-IL/src/libIL.la
-
-INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/src-ILU/include
diff --git a/DevIL/src-ILUT/include/Makefile.am b/DevIL/src-ILUT/include/Makefile.am
deleted file mode 100644
index dbbc0677..00000000
--- a/DevIL/src-ILUT/include/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-noinst_HEADERS  = ilut_allegro.h \
-                  ilut_internal.h  ilut_opengl.h \
-                  ilut_states.h
diff --git a/DevIL/src-ILUT/src/Makefile.am b/DevIL/src-ILUT/src/Makefile.am
deleted file mode 100644
index 3eb23121..00000000
--- a/DevIL/src-ILUT/src/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-lib_LTLIBRARIES = libILUT.la
-
-libILUT_la_SOURCES = ilut_allegro.c     ilut_main.c \
-                     ilut_sdlsurface.c  ilut_states.c \
-                     ilut_internal.c    ilut_opengl.c \
-                     ilut_win32.c       ilut_directx.c \
-					 ilut_directx9.c    ilut_x11.c
-
-AM_CFLAGS = @LIBILUT_CFLAGS@
-
-libILUT_la_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ @VERSIONINFO@ \
-                     $(top_builddir)/src-IL/src/libIL.la \
-                     $(top_builddir)/src-ILU/src/libILU.la \
-                     @LIBSDL@ @LIBALLEGRO@ @LIBILUT_WIN32LIBPATH@
-
-libILUT_la_LIBADD = @LIBGL@ @LIBGDI32@ @X_LIBS@ @LIBX11@
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src-ILUT/include \
-           @HSDL@ @HALLEGRO@
diff --git a/DevIL/test/Benchmark/.cvsignore b/DevIL/test/Benchmark/.cvsignore
deleted file mode 100644
index d59a4c21..00000000
--- a/DevIL/test/Benchmark/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.depends
-.objects
-benchmark
-Debug
-Release
diff --git a/DevIL/test/Benchmark/Benchmark.dsp b/DevIL/test/Benchmark/Benchmark.dsp
deleted file mode 100644
index 9366b69a..00000000
--- a/DevIL/test/Benchmark/Benchmark.dsp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Benchmark" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Benchmark - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Benchmark.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Benchmark.mak" CFG="Benchmark - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Benchmark - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Benchmark - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Benchmark - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\bin"
-# PROP Intermediate_Dir "obj"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /machine:I386
-
-!ELSEIF  "$(CFG)" == "Benchmark - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\bin\debug"
-# PROP Intermediate_Dir "obj/debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Benchmark - Win32 Release"
-# Name "Benchmark - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\benchmark.c
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/DevIL/test/Benchmark/CMakeLists.txt b/DevIL/test/Benchmark/CMakeLists.txt
new file mode 100644
index 00000000..4a57fae1
--- /dev/null
+++ b/DevIL/test/Benchmark/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_executable(benchmark EXCLUDE_FROM_ALL benchmark.c)
+target_link_libraries(benchmark IL ILU)
+target_include_directories(benchmark PRIVATE ${DevIL_SOURCE_DIR}/../include)
+
diff --git a/DevIL/test/CMakeLists.txt b/DevIL/test/CMakeLists.txt
new file mode 100644
index 00000000..1b91e06d
--- /dev/null
+++ b/DevIL/test/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_subdirectory(Benchmark)
+add_subdirectory(UnitTest)
+# TODO
+#add_subdirectory(DDrawTest)
+#add_subdirectory(Fltk)
+#add_subdirectory(format_test)
+#add_subdirectory(MdiTest)
+#add_subdirectory(old)
+#add_subdirectory(Stress)
+#add_subdirectory(Unzip)
+#add_subdirectory(URar)
+#add_subdirectory(VolTex)
diff --git a/DevIL/test/Makefile.am b/DevIL/test/Makefile.am
deleted file mode 100644
index 472961ee..00000000
--- a/DevIL/test/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-all_include = $(srcdir)/../include
-AM_CPPFLAGS = -I $(all_include)
-
-check_PROGRAMS = testil
-check_SCRIPTS = format_test/format_checks.sh 
-
-if BUILD_ILU
-check_SCRIPTS += format_test/ilu_checks.sh
-endif #BUILD_ILU
-
-testil_SOURCES = format_test/testil.c
-testil_LDADD =
-if BUILD_ILU
-testil_LDADD += ../lib/libILU.la
-else
-testil_LDADD += ../lib/libIL.la
-endif
-
-TESTS_ENVIRONMENT = /bin/bash
-TESTS = $(check_SCRIPTS)
diff --git a/DevIL/test/UnitTest/CMakeLists.txt b/DevIL/test/UnitTest/CMakeLists.txt
new file mode 100644
index 00000000..1ec5db90
--- /dev/null
+++ b/DevIL/test/UnitTest/CMakeLists.txt
@@ -0,0 +1,13 @@
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+find_package(cppunit)
+
+if(CPPUNIT_FOUND)
+    add_executable(UnitTest EXCLUDE_FROM_ALL ILTest.cpp ILUTest.cpp UnitTest.cpp)
+    target_include_directories(UnitTest PRIVATE ${cppunit_INCLUDE_DIRECTORIES})
+    target_link_libraries(UnitTest IL ILU ${CPPUNIT_LIBRARIES})
+    target_include_directories(UnitTest PRIVATE ${DevIL_SOURCE_DIR}/../include)
+else()
+    Message(STATUS "UnitTest disabled, cppunit wasn't found!")
+endif()
diff --git a/DevIL/test/UnitTest/ILTest.cpp b/DevIL/test/UnitTest/ILTest.cpp
index bedd556a..179061bf 100644
--- a/DevIL/test/UnitTest/ILTest.cpp
+++ b/DevIL/test/UnitTest/ILTest.cpp
@@ -13,6 +13,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( ILTest );
 #include <limits.h>
 #include <stdio.h>
 #include <iostream>
+#include <stdlib.h>
 
 void ILTest::setUp()
 {
@@ -73,7 +74,7 @@ void ILTest::TestilActiveImage()
   {
 	ilBindImage(MainImage);
 	ilActiveImage(i);
-	itoa (i,lBuffer,10);
+	sprintf(lBuffer, "%d", i);
 	lFinalFilename = lFilename + lBuffer + ".bmp";
 	FILE * lBuffer = fopen(lFinalFilename.c_str() , "wb");
 	CPPUNIT_ASSERT(lBuffer != NULL);
@@ -203,4 +204,4 @@ void ILTest::TestilSaveF()
   ilLoadImage(".\\Data\\Logo.png");
   ilSaveF(IL_BMP,lBuffer);
   fclose(lBuffer);
-}
\ No newline at end of file
+}
diff --git a/DevIL/test/UnitTest/ReadMe.txt b/DevIL/test/UnitTest/ReadMe.txt
deleted file mode 100644
index 809282e7..00000000
--- a/DevIL/test/UnitTest/ReadMe.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-========================================================================
-       CONSOLE APPLICATION : UnitTest
-========================================================================
-
-
-This file contains a summary of what you will find in each of the files that
-make up your UnitTest application.
-
-UnitTest.dsp
-    This file (the project file) contains information at the project level and
-    is used to build a single project or subproject. Other users can share the
-    project (.dsp) file, but they should export the makefiles locally.
-
-UnitTest.cpp
-    This is the main application source file.
-
-
-/////////////////////////////////////////////////////////////////////////////
-This program allows to see how each interface method can be used in openIL
-
-NOTE: This program depends on cppunit, which can be found on Sourceforge.net. 
-      Currently this test several routines in ILTest.
- 
-      It runs the test on the shell and reports its results.
-
-
diff --git a/DevIL/test/UnitTest/UnitTest.dsp b/DevIL/test/UnitTest/UnitTest.dsp
deleted file mode 100644
index 2a7a9f8b..00000000
--- a/DevIL/test/UnitTest/UnitTest.dsp
+++ /dev/null
@@ -1,124 +0,0 @@
-# Microsoft Developer Studio Project File - Name="UnitTest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=UnitTest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "UnitTest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "UnitTest.mak" CFG="UnitTest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "UnitTest - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "UnitTest - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "UnitTest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE RSC /l 0x1009 /d "NDEBUG"
-# ADD RSC /l 0x1009 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 cppunit.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "UnitTest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE RSC /l 0x1009 /d "_DEBUG"
-# ADD RSC /l 0x1009 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 cppunitd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "UnitTest - Win32 Release"
-# Name "UnitTest - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\ILTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ILUTest.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\UnitTest.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\ILTest.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ILUTest.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=.\ReadMe.txt
-# End Source File
-# End Target
-# End Project
diff --git a/DevIL/test/UnitTest/UnitTest.dsw b/DevIL/test/UnitTest/UnitTest.dsw
deleted file mode 100644
index a46b4b6a..00000000
--- a/DevIL/test/UnitTest/UnitTest.dsw
+++ /dev/null
@@ -1,74 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "IL"="..\..\src-IL\msvc\IL.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ILU"="..\..\src-ILU\msvc\ILU.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ILUT"="..\..\src-ILUT\msvc\ILUT.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "UnitTest"=.\UnitTest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name IL
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ILU
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ILUT
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/DevIL/test/UnitTest/UnitTest.sln b/DevIL/test/UnitTest/UnitTest.sln
deleted file mode 100644
index 2abe8801..00000000
--- a/DevIL/test/UnitTest/UnitTest.sln
+++ /dev/null
@@ -1,57 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "UnitTest.vcproj", "{0034DB28-C836-4002-B277-5B7BCD9893CB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{60313301-5E8F-4404-987F-CA8BAE815B1F} = {60313301-5E8F-4404-987F-CA8BAE815B1F}
-		{0F088168-B0B4-4350-9E6A-7FB271C76D39} = {0F088168-B0B4-4350-9E6A-7FB271C76D39}
-		{55B66AD7-F031-4B89-86DD-55E19636CB54} = {55B66AD7-F031-4B89-86DD-55E19636CB54}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IL", "..\..\src-IL\msvc\IL.vcproj", "{0F088168-B0B4-4350-9E6A-7FB271C76D39}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ILU", "..\..\src-ILU\msvc\ILU.vcproj", "{55B66AD7-F031-4B89-86DD-55E19636CB54}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ILUT", "..\..\src-ILUT\msvc\ILUT.vcproj", "{60313301-5E8F-4404-987F-CA8BAE815B1F}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Dynamic = Dynamic
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{0034DB28-C836-4002-B277-5B7BCD9893CB}.Debug.ActiveCfg = Debug|Win32
-		{0034DB28-C836-4002-B277-5B7BCD9893CB}.Debug.Build.0 = Debug|Win32
-		{0034DB28-C836-4002-B277-5B7BCD9893CB}.Dynamic.ActiveCfg = Debug|Win32
-		{0034DB28-C836-4002-B277-5B7BCD9893CB}.Dynamic.Build.0 = Debug|Win32
-		{0034DB28-C836-4002-B277-5B7BCD9893CB}.Release.ActiveCfg = Release|Win32
-		{0034DB28-C836-4002-B277-5B7BCD9893CB}.Release.Build.0 = Release|Win32
-		{0F088168-B0B4-4350-9E6A-7FB271C76D39}.Debug.ActiveCfg = Debug|Win32
-		{0F088168-B0B4-4350-9E6A-7FB271C76D39}.Debug.Build.0 = Debug|Win32
-		{0F088168-B0B4-4350-9E6A-7FB271C76D39}.Dynamic.ActiveCfg = Dynamic|Win32
-		{0F088168-B0B4-4350-9E6A-7FB271C76D39}.Dynamic.Build.0 = Dynamic|Win32
-		{0F088168-B0B4-4350-9E6A-7FB271C76D39}.Release.ActiveCfg = Release|Win32
-		{0F088168-B0B4-4350-9E6A-7FB271C76D39}.Release.Build.0 = Release|Win32
-		{55B66AD7-F031-4B89-86DD-55E19636CB54}.Debug.ActiveCfg = Debug|Win32
-		{55B66AD7-F031-4B89-86DD-55E19636CB54}.Debug.Build.0 = Debug|Win32
-		{55B66AD7-F031-4B89-86DD-55E19636CB54}.Dynamic.ActiveCfg = Dynamic|Win32
-		{55B66AD7-F031-4B89-86DD-55E19636CB54}.Dynamic.Build.0 = Dynamic|Win32
-		{55B66AD7-F031-4B89-86DD-55E19636CB54}.Release.ActiveCfg = Release|Win32
-		{55B66AD7-F031-4B89-86DD-55E19636CB54}.Release.Build.0 = Release|Win32
-		{60313301-5E8F-4404-987F-CA8BAE815B1F}.Debug.ActiveCfg = Debug|Win32
-		{60313301-5E8F-4404-987F-CA8BAE815B1F}.Debug.Build.0 = Debug|Win32
-		{60313301-5E8F-4404-987F-CA8BAE815B1F}.Dynamic.ActiveCfg = Dynamic|Win32
-		{60313301-5E8F-4404-987F-CA8BAE815B1F}.Dynamic.Build.0 = Dynamic|Win32
-		{60313301-5E8F-4404-987F-CA8BAE815B1F}.Release.ActiveCfg = Release|Win32
-		{60313301-5E8F-4404-987F-CA8BAE815B1F}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/DevIL/test/UnitTest/UnitTest.vcproj b/DevIL/test/UnitTest/UnitTest.vcproj
deleted file mode 100644
index 072d4121..00000000
--- a/DevIL/test/UnitTest/UnitTest.vcproj
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="UnitTest"
-	ProjectGUID="{0034DB28-C836-4002-B277-5B7BCD9893CB}"
-	RootNamespace="UnitTest"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/UnitTest.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="devil_dbg.lib libjpeg.lib libmng.lib libpng.lib libtiff.lib cppunitd.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\Debug/UnitTest.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/UnitTest.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/UnitTest.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="4105"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				PrecompiledHeaderFile=".\Release/UnitTest.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="devil.lib libjpeg.lib libmng.lib libpng.lib libtiff.lib cppunit.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\Release/UnitTest.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/UnitTest.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/UnitTest.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="4105"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="ILTest.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="ILUTest.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="UnitTest.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="ILTest.h">
-			</File>
-			<File
-				RelativePath="ILUTest.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-		</Filter>
-		<File
-			RelativePath="..\..\lib\DevIL_DBG.lib">
-		</File>
-		<File
-			RelativePath="ReadMe.txt">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/DevIL/test/UnitTest/cmake/Findcppunit.cmake b/DevIL/test/UnitTest/cmake/Findcppunit.cmake
new file mode 100644
index 00000000..69150167
--- /dev/null
+++ b/DevIL/test/UnitTest/cmake/Findcppunit.cmake
@@ -0,0 +1,75 @@
+# - try to find cppunit library
+#
+# Cache Variables: (probably not for direct use in your scripts)
+#  CPPUNIT_INCLUDE_DIR
+#  CPPUNIT_LIBRARY
+#
+# Non-cache variables you might use in your CMakeLists.txt:
+#  CPPUNIT_FOUND
+#  CPPUNIT_INCLUDE_DIRS
+#  CPPUNIT_LIBRARIES
+#
+# Requires these CMake modules:
+#  SelectLibraryConfigurations (included with CMake >= 2.8.0)
+#  FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
+#
+# Original Author:
+# 2009-2011 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2011.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+set(CPPUNIT_ROOT_DIR
+	"${CPPUNIT_ROOT_DIR}"
+	CACHE
+	PATH
+	"Directory to search")
+
+find_library(CPPUNIT_LIBRARY_RELEASE
+	NAMES
+	cppunit
+	HINTS
+	"${CPPUNIT_ROOT_DIR}")
+
+find_library(CPPUNIT_LIBRARY_DEBUG
+	NAMES
+	cppunitd
+	HINTS
+	"${CPPUNIT_ROOT_DIR}")
+
+include(SelectLibraryConfigurations)
+select_library_configurations(CPPUNIT)
+
+# Might want to look close to the library first for the includes.
+get_filename_component(_libdir "${CPPUNIT_LIBRARY_RELEASE}" PATH)
+
+find_path(CPPUNIT_INCLUDE_DIR
+	NAMES
+	cppunit/TestCase.h
+	HINTS
+	"${_libdir}/.."
+	PATHS
+	"${CPPUNIT_ROOT_DIR}"
+	PATH_SUFFIXES
+	include/)
+
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(cppunit
+	DEFAULT_MSG
+	CPPUNIT_LIBRARY
+	CPPUNIT_INCLUDE_DIR)
+
+if(CPPUNIT_FOUND)
+	set(CPPUNIT_LIBRARIES ${CPPUNIT_LIBRARY} ${CMAKE_DL_LIBS})
+	set(CPPUNIT_INCLUDE_DIRS "${CPPUNIT_INCLUDE_DIR}")
+	mark_as_advanced(CPPUNIT_ROOT_DIR)
+endif()
+
+mark_as_advanced(CPPUNIT_INCLUDE_DIR
+	CPPUNIT_LIBRARY_RELEASE
+	CPPUNIT_LIBRARY_DEBUG)