- Updating Windows resource files

- More customization of CMake files for Windows

18 files changed, 936 insertions, 25 deletions

diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
index 425cacc9..433f3b7b 100644
--- a/DevIL/src-IL/CMakeLists.txt
+++ b/DevIL/src-IL/CMakeLists.txt
@@ -23,7 +23,11 @@ if(WIN32)
 		add_definitions(-DIL_DLL -DJPEGSTATIC)
         # note: .def not used for now - __declspec() in source handles export.
         set(DevIL_SRCS ${DevIL_SRCS} msvc/il.def)
-		set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" msvc/IL.rc)
+		if(UNICODE)
+			set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL Unicode.rc")
+		else(UNICODE)
+			set(DevIL_RSRC ${DevIL_RSRC} "msvc/resources/IL Logo.ico" "msvc/IL.rc")
+		endif(UNICODE)
         set(DevIL_TXT ${DevIL_TXT} ../AUTHORS ../ChangeLog ../CREDITS ../libraries.txt ../README ../README.cmake ../TODO)
 #		SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:msvcrt.lib ")
 		set(CMAKE_C_FLAGS_RELEASE "/MT /O2")
@@ -129,16 +133,27 @@ else(SQUISH_FOUND)
     set(IL_USE_DXTC_SQUISH 0)
 endif(SQUISH_FOUND)
 
-set_target_properties(IL PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib")
+if(UNICODE)
+	set_target_properties(IL PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/unicode")
+	set_target_properties(IL PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/unicode")
+	set_target_properties(IL PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/unicode")
+else(UNICODE)
+	set_target_properties(IL PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib")
+	set_target_properties(IL PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib")
+	set_target_properties(IL PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib")
+endif(UNICODE)
+
 if(WIN32)
 	# Linux uses libIL.so, libILU.so, and libILUT.so, but Windows uses
 	#  DevIL.dll, ILU.dll, and ILUT.dll.
 	set_target_properties(IL PROPERTIES OUTPUT_NAME "DevIL")
 endif(WIN32)
 
+if(UNICODE)
+	MESSAGE("Compiling IL Unicode")
+	add_definitions(-DUNICODE -D_UNICODE)
+endif(UNICODE)
 #if(COMPILER_MSVC)
-#    add_definitions(-DUNICODE -D_UNICODE)
-#endif()
 
 # configure include dirs and linkage for the optional external libs
 set(libs "")
diff --git a/DevIL/src-IL/include/il_dds.h b/DevIL/src-IL/include/il_dds.h
index c43ea5f3..6d3c7769 100644
--- a/DevIL/src-IL/include/il_dds.h
+++ b/DevIL/src-IL/include/il_dds.h
@@ -167,6 +167,10 @@ enum PixFormat
 
 #define CUBEMAP_SIDES 6
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Internal functions
 ILboolean	iLoadDdsInternal(void);
 ILboolean	iIsValidDds(void);
@@ -217,5 +221,8 @@ void		PreMult(ILushort *Data, ILubyte *Alpha);
 
 extern ILuint CubemapDirections[CUBEMAP_SIDES];
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif//DDS_H
diff --git a/DevIL/src-IL/msvc/IL Unicode.rc b/DevIL/src-IL/msvc/IL Unicode.rc
new file mode 100644
index 00000000..346758fc
--- /dev/null
+++ b/DevIL/src-IL/msvc/IL Unicode.rc
@@ -0,0 +1,120 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"


+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// English (United States) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION 1,8,0,0

+ PRODUCTVERSION 1,8,0,0

+ FILEFLAGSMASK 0x0L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "Comments", "DevIL: A portable image library in development"

+            VALUE "CompanyName", "Abysmal Software"

+            VALUE "FileDescription", "DevIL: A portable image library in development"

+            VALUE "FileVersion", "1.8.0.0"

+            VALUE "InternalName", "Developer's Image Library (DevIL)"

+            VALUE "LegalCopyright", "Copyright © 2000-2016"

+            VALUE "LegalTrademarks", "Under LGPL License"

+            VALUE "OriginalFilename", "DevIL.dll"

+            VALUE "PrivateBuild", "Open Source"

+            VALUE "ProductName", "Developer's Image Library (DevIL)"

+            VALUE "ProductVersion", "1.8.0 Unicode"

+            VALUE "SpecialBuild", "Unicode"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDI_ICON1               ICON                    "resources\\IL Logo.ico"

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.h\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "\r\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// String Table

+//

+

+STRINGTABLE

+BEGIN

+    IDC_OPENIL              "Developer's Image Library, Version 1.8.0"

+END

+

+#endif    // English (United States) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+


+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/DevIL/src-IL/msvc/IL.rc b/DevIL/src-IL/msvc/IL.rc
index 22bba201..8bfadf9c 100644
--- a/DevIL/src-IL/msvc/IL.rc
+++ b/DevIL/src-IL/msvc/IL.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource."

+#include "resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -87,12 +87,6 @@ BEGIN
     "\r\0"

 END

 

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

 #endif    // APSTUDIO_INVOKED

 

 

@@ -103,7 +97,7 @@ END
 

 STRINGTABLE

 BEGIN

-    IDC_OPENIL              "Developer's Image Library, Version 1.7.8"

+    IDC_OPENIL              "Developer's Image Library, Version 1.8.0"

 END

 

 #endif    // English (United States) resources

diff --git a/DevIL/src-IL/msvc/resource.h b/DevIL/src-IL/msvc/resource.h
index 668b4528..5cbdc7c7 100644
--- a/DevIL/src-IL/msvc/resource.h
+++ b/DevIL/src-IL/msvc/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by IL.rc
+// Used by IL Unicode.rc
 //
 #define SW_HIDE                         0
 #define HIDE_WINDOW                     0
@@ -1477,10 +1477,7 @@
 #define SC_CONTEXTHELP                  0xF180
 #define LVS_TYPESTYLEMASK               0xfc00
 #define SPVERSION_MASK                  0x0000FF00
-//#define HTERROR                         -2
-#define IDC_STATIC                      -1
 #define UNICODE_NOCHAR                  0xFFFF
-//#define PWR_FAIL                        -1
 #define HTTRANSPARENT                   -1
 
 // Next default values for new objects
diff --git a/DevIL/src-IL/msvc8/IL Unicode.rc b/DevIL/src-IL/msvc8/IL Unicode.rc
new file mode 100644
index 00000000..026ee499
--- /dev/null
+++ b/DevIL/src-IL/msvc8/IL Unicode.rc
@@ -0,0 +1,120 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION 0,1,7,8
+ PRODUCTVERSION 0,1,7,8
+ FILEFLAGSMASK 0x0L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "DevIL: A portable image library in development"
+            VALUE "CompanyName", "Abysmal Software"
+            VALUE "FileDescription", "DevIL: A portable image library in development"
+            VALUE "FileVersion", "1.7.8"
+            VALUE "InternalName", "Developer's Image Library (DevIL)"
+            VALUE "LegalCopyright", "Copyright © 2000-2008"
+            VALUE "LegalTrademarks", "Under LGPL License"
+            VALUE "OriginalFilename", "DevIL.dll"
+            VALUE "PrivateBuild", "Open Source"
+            VALUE "ProductName", "Developer's Image Library (DevIL)"
+            VALUE "ProductVersion", "1.7.8 Unicode"
+            VALUE "SpecialBuild", "Unicode"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "resources\\IL Logo.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDC_OPENIL              "Developer's Image Library, Version 1.7.8"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/DevIL/src-IL/msvc8/IL.rc b/DevIL/src-IL/msvc8/IL.rc
new file mode 100644
index 00000000..9301d415
--- /dev/null
+++ b/DevIL/src-IL/msvc8/IL.rc
@@ -0,0 +1,123 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+///////////////// FILEVERSION 0,1,7,8////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION 0,1,7,8
+ PRODUCTVERSION 0,1,7,8
+ FILEFLAGSMASK 0x0L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "DevIL: A portable image library in development"
+            VALUE "CompanyName", "Abysmal Software"
+            VALUE "FileDescription", "DevIL: A portable image library in development"
+            VALUE "FileVersion", "1.7.8"
+            VALUE "InternalName", "Developer's Image Library (DevIL)"
+            VALUE "LegalCopyright", "Copyright © 2000-2008"
+            VALUE "LegalTrademarks", "Under LGPL License"
+            VALUE "OriginalFilename", "DevIL.dll"
+            VALUE "PrivateBuild", "Open Source"
+            VALUE "ProductName", "Developer's Image Library (DevIL)"
+            VALUE "ProductVersion", "1.7.8 Ansi"
+            VALUE "SpecialBuild", "Ansi"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "resources\\IL Logo.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDC_OPENIL              "Developer's Image Library, Version 1.7.8"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/DevIL/src-IL/msvc9/IL Unicode.rc b/DevIL/src-IL/msvc9/IL Unicode.rc
new file mode 100644
index 00000000..d0dff4f6
--- /dev/null
+++ b/DevIL/src-IL/msvc9/IL Unicode.rc
@@ -0,0 +1,123 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+///////////////// FILEVERSION 0,1,7,8////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION 0,1,7,8
+ PRODUCTVERSION 0,1,7,8
+ FILEFLAGSMASK 0x0L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "DevIL: A portable image library in development"
+            VALUE "CompanyName", "Abysmal Software"
+            VALUE "FileDescription", "DevIL: A portable image library in development"
+            VALUE "FileVersion", "1.7.8"
+            VALUE "InternalName", "Developer's Image Library (DevIL)"
+            VALUE "LegalCopyright", "Copyright © 2000-2008"
+            VALUE "LegalTrademarks", "Under LGPL License"
+            VALUE "OriginalFilename", "DevIL.dll"
+            VALUE "PrivateBuild", "Open Source"
+            VALUE "ProductName", "Developer's Image Library (DevIL)"
+            VALUE "ProductVersion", "1.7.8 Unicode"
+            VALUE "SpecialBuild", "Unicode"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "resources\\IL Logo.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDC_OPENIL              "Developer's Image Library, Version 1.7.8"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/DevIL/src-IL/msvc9/IL.rc b/DevIL/src-IL/msvc9/IL.rc
new file mode 100644
index 00000000..9f5c7953
--- /dev/null
+++ b/DevIL/src-IL/msvc9/IL.rc
@@ -0,0 +1,120 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////// FILEVERSION 0,1,7,8//////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION 0,1,7,8
+ PRODUCTVERSION 0,1,7,8
+ FILEFLAGSMASK 0x0L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "DevIL: A portable image library in development"
+            VALUE "CompanyName", "Abysmal Software"
+            VALUE "FileDescription", "DevIL: A portable image library in development"
+            VALUE "FileVersion", "1.7.8"
+            VALUE "InternalName", "Developer's Image Library (DevIL)"
+            VALUE "LegalCopyright", "Copyright © 2000-2008"
+            VALUE "LegalTrademarks", "Under LGPL License"
+            VALUE "OriginalFilename", "DevIL.dll"
+            VALUE "PrivateBuild", "Open Source"
+            VALUE "ProductName", "Developer's Image Library (DevIL)"
+            VALUE "ProductVersion", "1.7.8 Ansi"
+            VALUE "SpecialBuild", "Ansi"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "resources\\IL Logo.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.\0"
+END
+
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDC_OPENIL              "Developer's Image Library, Version 1.7.8"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/DevIL/src-IL/src/il_jpeg.cpp b/DevIL/src-IL/src/il_jpeg.cpp
index 42682ce5..8b9096a0 100644
--- a/DevIL/src-IL/src/il_jpeg.cpp
+++ b/DevIL/src-IL/src/il_jpeg.cpp
@@ -33,7 +33,7 @@
 			#pragma warning(disable : 4142)  //  jmorecfg.h
 		#endif
 
-		#include "jpeglib.h"
+		#include <jpeglib.h>
 
 		#if JPEG_LIB_VERSION < 62
 			#warning DevIL was designed with libjpeg 6b or higher in mind.  Consider upgrading at www.ijg.org
diff --git a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt
index 4e95ff42..65c0f09c 100644
--- a/DevIL/src-ILU/CMakeLists.txt
+++ b/DevIL/src-ILU/CMakeLists.txt
@@ -14,7 +14,11 @@ if(WIN32)
 	if(BUILD_SHARED_LIBS)
 		add_definitions(-DILU_DLL)
         set(ILU_SRCS ${ILU_SRCS} msvc/ilu.def)
-		set(ILU_RSRC ${ILU_RSRC} "msvc/resources/IL Logo.ico" msvc/ILU.rc)
+		if(UNICODE)
+			set(ILU_RSRC ${ILU_RSRC} "msvc/resources/IL Logo.ico" "msvc/ILU Unicode.rc")
+		else(UNICODE)
+			set(ILU_RSRC ${ILU_RSRC} "msvc/resources/IL Logo.ico" "msvc/ILU.rc")
+		endif(UNICODE)
 		set(CMAKE_C_FLAGS_RELEASE "/MT /O2")
 	else(BUILD_SHARED_LIBS)
 		add_definitions(-DIL_STATIC_LIB)
@@ -41,8 +45,20 @@ target_link_libraries(ILU
 configure_file( pkgconfig/ILU.pc.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/ILU.pc @ONLY)
 
-set_target_properties(ILU PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib")
+if(UNICODE)
+	set_target_properties(ILU PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/unicode")
+	set_target_properties(ILU PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/unicode")
+	set_target_properties(ILU PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/unicode")
+else(UNICODE)
+	set_target_properties(ILU PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib")
+	set_target_properties(ILU PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib")
+	set_target_properties(ILU PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib")
+endif(UNICODE)
 
+if(UNICODE)
+	MESSAGE("Compiling ILU Unicode")
+	add_definitions(-DUNICODE -D_UNICODE)
+endif(UNICODE)
 
 # Installation
 install (TARGETS ILU
diff --git a/DevIL/src-ILU/msvc/ILU Unicode.rc b/DevIL/src-ILU/msvc/ILU Unicode.rc
new file mode 100644
index 00000000..1a4b5770
--- /dev/null
+++ b/DevIL/src-ILU/msvc/ILU Unicode.rc
@@ -0,0 +1,130 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "resource.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+2 TEXTINCLUDE 
+BEGIN
+    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""windows.h""\r\n"
+    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""resource.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,8,0,0
+ PRODUCTVERSION 1,8,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x29L
+#else
+ FILEFLAGS 0x28L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "ILU: A portable image library in development"
+            VALUE "CompanyName", "Abysmal Software"
+            VALUE "FileDescription", "ILU: A portable image library in development"
+            VALUE "FileVersion", "1.8.0.0"
+            VALUE "InternalName", "ILU"
+            VALUE "LegalCopyright", "Copyright © 2000-2016"
+            VALUE "LegalTrademarks", "Under LGPL License"
+            VALUE "OriginalFilename", "ILU.dll"
+            VALUE "PrivateBuild", "Open Source"
+            VALUE "ProductName", "Developer's Image Utilities Library"
+            VALUE "ProductVersion", "1.8.0 Unicode"
+            VALUE "SpecialBuild", "Unicode"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "resources\\IL Logo.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDC_OPENILU             "Developer's Image Utilities Library, Version 1.8.0"
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/DevIL/src-ILU/msvc/ILU.rc b/DevIL/src-ILU/msvc/ILU.rc
index 7a768206..bfdeb35b 100644
--- a/DevIL/src-ILU/msvc/ILU.rc
+++ b/DevIL/src-ILU/msvc/ILU.rc
@@ -110,7 +110,7 @@ IDI_ICON1               ICON                    "resources\\IL Logo.ico"
 
 STRINGTABLE
 BEGIN
-    IDC_OPENILU             "Developer's Image Utilities Library, Version 1.7.8"
+    IDC_OPENILU             "Developer's Image Utilities Library, Version 1.8.0"
 END
 
 #endif    // English (United States) resources
diff --git a/DevIL/src-ILU/msvc/resource.h b/DevIL/src-ILU/msvc/resource.h
index ef602253..f9f24ba4 100644
--- a/DevIL/src-ILU/msvc/resource.h
+++ b/DevIL/src-ILU/msvc/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by ILU.rc
+// Used by ILU Unicode.rc
 //
 #define IDC_OPENILU                     109
 #define IDI_ICON1                       155
diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
index f480f8e8..66d02019 100644
--- a/DevIL/src-ILUT/CMakeLists.txt
+++ b/DevIL/src-ILUT/CMakeLists.txt
@@ -15,7 +15,11 @@ if(WIN32)
 	if(BUILD_SHARED_LIBS)
 		add_definitions(-DILUT_DLL)
         set(ILUT_SRCS ${ILUT_SRCS} msvc/ilut.def)
-		set(ILUT_RSRC ${ILUT_RSRC} "msvc/resources/IL Logo.ico" msvc/ILUT.rc)
+		if(UNICODE)
+			set(ILUT_RSRC ${ILUT_RSRC} "msvc/resources/IL Logo.ico" "msvc/ILUT Unicode.rc")
+		else(UNICODE)
+			set(ILUT_RSRC ${ILUT_RSRC} "msvc/resources/IL Logo.ico" "msvc/ILUT.rc")
+		endif(UNICODE)
 		set(CMAKE_C_FLAGS_RELEASE "/MT /O2")
 	else(BUILD_SHARED_LIBS)
 		add_definitions(-DIL_STATIC_LIB)
@@ -39,8 +43,20 @@ target_link_libraries(ILUT
 configure_file( pkgconfig/ILUT.pc.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc @ONLY)
 
-set_target_properties(ILUT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib")
+if(UNICODE)
+	set_target_properties(ILUT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib/unicode")
+	set_target_properties(ILUT PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib/unicode")
+	set_target_properties(ILUT PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib/unicode")
+else(UNICODE)
+	set_target_properties(ILUT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../lib")
+	set_target_properties(ILUT PROPERTIES LIBRARY_OUTPUT_DIRECTORY "../lib")
+	set_target_properties(ILUT PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "../lib")
+endif(UNICODE)
 
+if(UNICODE)
+	MESSAGE("Compiling ILUT Unicode")
+	add_definitions(-DUNICODE -D_UNICODE)
+endif(UNICODE)
 
 # Installation
 install (TARGETS ILUT
diff --git a/DevIL/src-ILUT/msvc/ILUT Unicode.rc b/DevIL/src-ILUT/msvc/ILUT Unicode.rc
new file mode 100644
index 00000000..a217f8e7
--- /dev/null
+++ b/DevIL/src-ILUT/msvc/ILUT Unicode.rc
@@ -0,0 +1,130 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "resource.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+2 TEXTINCLUDE 
+BEGIN
+    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""windows.h""\r\n"
+    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""resource.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,8,0,0
+ PRODUCTVERSION 1,8,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x29L
+#else
+ FILEFLAGS 0x28L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "ILUT: A portable image library in development"
+            VALUE "CompanyName", "Abysmal Software"
+            VALUE "FileDescription", "ILUT: A portable image library in development"
+            VALUE "FileVersion", "1.8.0.0"
+            VALUE "InternalName", "ILUT"
+            VALUE "LegalCopyright", "Copyright © 2000-2016"
+            VALUE "LegalTrademarks", "Under LGPL License"
+            VALUE "OriginalFilename", "ILUT.dll"
+            VALUE "PrivateBuild", "Open Source"
+            VALUE "ProductName", "Developer's Image Utility Toolkit Library"
+            VALUE "ProductVersion", "1.8.0 Unicode"
+            VALUE "SpecialBuild", "Unicode"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "resources\\IL Logo.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDC_OPENILUT            "Developer's Image Utility Toolkit Library, Version 1.7.8"
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/DevIL/src-ILUT/msvc/ILUT.rc b/DevIL/src-ILUT/msvc/ILUT.rc
index ce2c3682..369c7944 100644
--- a/DevIL/src-ILUT/msvc/ILUT.rc
+++ b/DevIL/src-ILUT/msvc/ILUT.rc
@@ -110,7 +110,7 @@ IDI_ICON1               ICON                    "resources\\IL Logo.ico"
 
 STRINGTABLE
 BEGIN
-    IDC_OPENILUT            "Developer's Image Utility Toolkit Library, Version 1.7.8"
+    IDC_OPENILUT            "Developer's Image Utility Toolkit Library, Version 1.8.0"
 END
 
 #endif    // English (United States) resources
diff --git a/DevIL/src-ILUT/msvc/resource.h b/DevIL/src-ILUT/msvc/resource.h
index 2efce68d..f6707e83 100644
--- a/DevIL/src-ILUT/msvc/resource.h
+++ b/DevIL/src-ILUT/msvc/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by ILUT.rc
+// Used by ILUT Unicode.rc
 //
 #define IDC_OPENILUT                    109
 #define IDI_ICON1                       155