- Fixes for libsquish

DentonW · Jan 1, 2017 · 845185a · 845185a
1 parent 1e02ea2
commit 845185a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
@@ -217,10 +217,16 @@ if(IL_USE_DXTC_NVIDIA)
     list(APPEND libs ${NVTT_LIBRARY} )
 endif(IL_USE_DXTC_NVIDIA)
 
-# TODO: does Squish require linking/includes?
 if(IL_USE_DXTC_SQUISH)
     list(APPEND incs ${LIBSQUISH_INCLUDE_DIR} )
-    list(APPEND libs ${LIBSQUISH_LIBRARY} )
+    #list(APPEND libs ${LIBSQUISH_LIBRARY} )
+	# Deals with strangeness in Visual Studio linking DevIL debug to libsquish release
+	if(LIBSQUISH_LIBRARY_DEBUG)
+		set(SQUISH_LINK_LIBRARY optimized ${LIBSQUISH_LIBRARY} debug ${LIBSQUISH_LIBRARY_DEBUG})
+	else(LIBSQUISH_LIBRARY_DEBUG)
+		set(SQUISH_LINK_LIBRARY ${LIBSQUISH_LIBRARY})
+	endif(LIBSQUISH_LIBRARY_DEBUG)
+	list(APPEND libs ${SQUISH_LINK_LIBRARY} )
 endif(IL_USE_DXTC_SQUISH)
 
 

diff --git a/DevIL/src-IL/src/il_dds-save.cpp b/DevIL/src-IL/src/il_dds-save.cpp
@@ -629,11 +629,11 @@ void CompressToRXGB(ILimage *Image, ILushort** xgb, ILubyte** r)
 ILuint Compress(ILimage *Image, ILenum DXTCFormat)
 {
 	ILushort	*Data, Block[16], ex0, ex1, *Runner16, t0, t1;
-	ILuint		x, y, z, i, BitMask;//, DXTCSize;//, Rms1, Rms2;
+	ILuint		x, y, z, i, BitMask, DXTCSize;//, Rms1, Rms2;
 	ILubyte		*Alpha, AlphaBlock[16], AlphaBitMask[6], /*AlphaOut[16],*/ a0, a1;
 	ILboolean	HasAlpha;
 	ILuint		Count = 0;
-	ILubyte		*Data3Dc, *Runner8;//, *ByteData, *BlockData;
+	ILubyte		*Data3Dc, *Runner8, *ByteData, *BlockData;
 
 	if (DXTCFormat == IL_3DC) {
 		Data3Dc = CompressTo88(Image);