32 files changed, 155 insertions, 58 deletions
diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in
deleted file mode 100644
index ef33a30b48..0000000000
--- a/tools/TexturePacker/Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
-DEFINES       += -DTARGET_POSIX -DUSE_LZO_PACKING
-ifneq ($(or $(findstring powerpc,@ARCH@),$(findstring ppc, @ARCH@)),)
-DEFINES       += -DHOST_BIGENDIAN
-endif
-
-SRCS           = \
-  md5.cpp \
-  XBTFWriter.cpp \
-  TexturePacker.cpp \
-  DecoderManager.cpp \
-  decoder/PNGDecoder.cpp \
-  decoder/JPGDecoder.cpp \
-  decoder/GifHelper.cpp \
-  decoder/GIFDecoder.cpp \
-  @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
-
-TARGET         = TexturePacker
-CLEAN_FILES    = $(TARGET)
-
-CXXFLAGS_FOR_BUILD += \
-  -I. \
-  -I./decoder \
-  -I@abs_top_srcdir@/lib \
-  -I@abs_top_srcdir@/xbmc \
-  -I@abs_top_srcdir@/xbmc/linux
-
-LDFLAGS_FOR_BUILD += -L@abs_top_srcdir@/lib/libsquish -lsquish-native -lpng -ljpeg -lgif -llzo2
-
-ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
-DEFINES += -DTARGET_DARWIN
-NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
-endif
-
-all: $(TARGET)
-
-$(TARGET): $(SRCS) @abs_top_srcdir@/xbmc/guilib/XBTF.h
-# TexturePacker run native on build system, build it with native tools
-	make -C @abs_top_srcdir@/lib/libsquish/ libsquish-native.so
-	$(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $(DEFINES) $(NATIVE_ARCH) $(SRCS) $(LDFLAGS_FOR_BUILD) -o $(TARGET)
-
-include @abs_top_srcdir@/Makefile.include
diff --git a/tools/depends/native/Makefile b/tools/depends/native/Makefile
index feda47e68e..9b42c196d2 100644
--- a/tools/depends/native/Makefile
+++ b/tools/depends/native/Makefile
@@ -7,9 +7,9 @@ endif
 NATIVE= m4-native gettext-native autoconf-native automake-native \
         libtool-native pkg-config-native yasm-native cmake-native \
         gas-preprocessor-native python26-native zlib-native \
-        pcre-native swig-native rpl-native libsdl_image-native \
+        pcre-native swig-native rpl-native libsdl_image-native libsquish-native \
         tiff-native libpng-native libjpeg-turbo-native liblzo2-native giflib-native \
-        libsdl-native distribute-native distutilscross-native JsonSchemaBuilder
+        libsdl-native distribute-native distutilscross-native JsonSchemaBuilder TexturePacker
 
 
 ifeq ($(OS),ios)
@@ -41,6 +41,7 @@ python26-native: zlib-native
 #liblzo2 has stale packaged automake files that cause borked host/build detection
 liblzo2-native: automake-native
 JsonSchemaBuilder: automake-native
+TexturePacker: automake-native pkg-config-native libsquish-native libpng-native liblzo2-native giflib-native libpng-native
 
 native: $(NATIVE)
 $(NATIVE):
diff --git a/tools/depends/native/TexturePacker/Makefile b/tools/depends/native/TexturePacker/Makefile
new file mode 100644
index 0000000000..060c502a41
--- /dev/null
+++ b/tools/depends/native/TexturePacker/Makefile
@@ -0,0 +1,53 @@
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+-include ../../Makefile.include
+
+ifeq ($(NATIVEPREFIX),)
+  PREFIX = $(ROOT_DIR)
+else
+  PREFIX = $(NATIVEPREFIX)
+endif
+
+ifeq ($(NATIVEPLATFORM),)
+  PLATFORM = native
+  EXTRA_CONFIGURE = --enable-static
+else
+  PLATFORM = $(NATIVEPLATFORM)
+endif
+
+ifeq ($(OS), linux)
+  EXTRA_CONFIGURE = --enable-static
+endif
+ifeq ($(OS), android)
+  EXTRA_CONFIGURE = --enable-static
+endif
+
+SOURCE=$(ROOT_DIR)/src
+
+APP=$(PLATFORM)/TexturePacker
+APPBIN=$(PREFIX)/bin/TexturePacker
+
+all: .installed-$(PLATFORM)
+
+$(PLATFORM): ../libsquish-native/.installed-$(PLATFORM)
+	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+	cd $(PLATFORM); cp -a $(SOURCE)/* .
+	cd $(PLATFORM); ./autogen.sh
+	cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(ARCH_DEFINES)"
+
+
+$(APP): $(PLATFORM)
+	$(MAKE) -C $(PLATFORM)
+
+../libsquish-native/.installed-$(PLATFORM):
+	$(MAKE) -C ../libsquish-native
+
+.installed-$(PLATFORM): $(APP)
+	$(MAKE) -C $(PLATFORM) install
+	touch $@
+
+clean:
+	$(MAKE) -C $(PLATFORM) clean
+
+distclean::
+	rm -rf $(PLATFORM) .installed-$(PLATFORM)
+	-rm -rf bin
diff --git a/tools/TexturePacker/TexturePacker.exe b/tools/depends/native/TexturePacker/TexturePacker.exe
index 1325f3919c..1325f3919c 100644
--- a/tools/TexturePacker/TexturePacker.exe
+++ b/tools/depends/native/TexturePacker/TexturePacker.exe
diff --git a/tools/TexturePacker/DecoderManager.cpp b/tools/depends/native/TexturePacker/src/DecoderManager.cpp
index fab7234fe2..3daf430286 100644
--- a/tools/TexturePacker/DecoderManager.cpp
+++ b/tools/depends/native/TexturePacker/src/DecoderManager.cpp
@@ -17,6 +17,7 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
+#include <cstdio>
 #include "DecoderManager.h"
 
 std::vector<IDecoder *> DecoderManager::m_decoders;
diff --git a/tools/TexturePacker/DecoderManager.h b/tools/depends/native/TexturePacker/src/DecoderManager.h
index e129f0cb06..e129f0cb06 100644
--- a/tools/TexturePacker/DecoderManager.h
+++ b/tools/depends/native/TexturePacker/src/DecoderManager.h
diff --git a/tools/depends/native/TexturePacker/src/Makefile.am b/tools/depends/native/TexturePacker/src/Makefile.am
new file mode 100644
index 0000000000..709bd63464
--- /dev/null
+++ b/tools/depends/native/TexturePacker/src/Makefile.am
@@ -0,0 +1,31 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
+AM_CFLAGS = -DTARGET_POSIX -DUSE_LZO_PACKING
+AM_CFLAGS += @EXTRA_DEFINES@
+AM_CXXFLAGS = $(AM_CFLAGS)
+
+AM_CPPFLAGS = \
+  -I. \
+  -I./decoder \
+  -I@KODI_SRC_DIR@/lib \
+  -I@KODI_SRC_DIR@/xbmc \
+  -I@KODI_SRC_DIR@/xbmc/guilib \
+  -I@KODI_SRC_DIR@/xbmc/linux \
+  @CPPFLAGS@
+
+AM_LDFLAGS = @LIBS@ @STATIC_FLAG@
+
+
+bin_PROGRAMS = TexturePacker
+TexturePacker_SOURCES =  md5.cpp \
+  XBTFWriter.cpp \
+  TexturePacker.cpp \
+  DecoderManager.cpp \
+  decoder/PNGDecoder.cpp \
+  decoder/JPGDecoder.cpp \
+  decoder/GifHelper.cpp \
+  decoder/GIFDecoder.cpp \
+  XBTF.cpp
+
+XBTF.cpp:
+	@cp @KODI_SRC_DIR@/xbmc/guilib/XBTF.cpp .
diff --git a/tools/TexturePacker/SimpleFS.h b/tools/depends/native/TexturePacker/src/SimpleFS.h
index c48814c0ad..c48814c0ad 100644
--- a/tools/TexturePacker/SimpleFS.h
+++ b/tools/depends/native/TexturePacker/src/SimpleFS.h
diff --git a/tools/TexturePacker/TexturePacker.cpp b/tools/depends/native/TexturePacker/src/TexturePacker.cpp
index cc5eafee76..a84a4606ef 100644
--- a/tools/TexturePacker/TexturePacker.cpp
+++ b/tools/depends/native/TexturePacker/src/TexturePacker.cpp
@@ -38,7 +38,7 @@
 #include "XBTFWriter.h"
 #include "md5.h"
 #include "cmdlineargs.h"
-#include "libsquish/squish.h"
+#include "squish.h"
 
 #ifdef TARGET_WINDOWS
 #define strncasecmp _strnicmp
@@ -46,7 +46,7 @@
 
 #ifdef USE_LZO_PACKING
 #ifdef TARGET_WINDOWS
-#include "../../lib/win32/liblzo/LZO1X.H"
+#include "win32/liblzo/LZO1X.H"
 #else
 #include <lzo/lzo1x.h>
 #endif
diff --git a/tools/TexturePacker/Win32/TexturePacker.sln b/tools/depends/native/TexturePacker/src/Win32/TexturePacker.sln
index 07cd920b3f..07cd920b3f 100644
--- a/tools/TexturePacker/Win32/TexturePacker.sln
+++ b/tools/depends/native/TexturePacker/src/Win32/TexturePacker.sln
diff --git a/tools/TexturePacker/Win32/TexturePacker.vcxproj b/tools/depends/native/TexturePacker/src/Win32/TexturePacker.vcxproj
index 0349365dc7..1c75bae91c 100644
--- a/tools/TexturePacker/Win32/TexturePacker.vcxproj
+++ b/tools/depends/native/TexturePacker/src/Win32/TexturePacker.vcxproj
@@ -45,15 +45,15 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;..\..\..\project\BuildDependencies\include</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;..\..\..\project\BuildDependencies\lib</LibraryPath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;..\..\..\project\BuildDependencies\include</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;..\..\..\project\BuildDependencies\lib</LibraryPath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;..\..\..\..\..\..\project\BuildDependencies\include</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;..\..\..\..\..\..\project\BuildDependencies\lib</LibraryPath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;..\..\..\..\..\..\project\BuildDependencies\include</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;..\..\..\..\..\..\project\BuildDependencies\lib</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\decoder;..\..\..\xbmc;..\..\..\lib;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;..\decoder;..\..\..\..\..\..\xbmc;..\..\..\..\..\..\lib;..\..\..\libsquish-native\src;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;TARGET_WINDOWS;_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -64,7 +64,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\..\project\VS2010Express\libs\squish\Debug\squishd.lib;..\..\..\project\BuildDependencies\lib\jpeg-static.lib;..\..\..\project\BuildDependencies\lib\libpng15d.lib;..\..\..\project\BuildDependencies\lib\libgif-static.lib;..\..\..\project\BuildDependencies\lib\zlibd-static.lib;..\..\..\lib\win32\liblzo\lzo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\..\..\project\VS2010Express\libs\squish\Debug\squishd.lib;..\..\..\..\..\..\project\BuildDependencies\lib\jpeg-static.lib;..\..\..\..\..\..\project\BuildDependencies\lib\libpng15d.lib;..\..\..\..\..\..\project\BuildDependencies\lib\libgif-static.lib;..\..\..\..\..\..\project\BuildDependencies\lib\zlibd-static.lib;..\..\..\..\..\..\lib\win32\liblzo\lzo.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -77,7 +77,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>.;..;..\decoder;..\..\..\xbmc;..\..\..\lib;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;..\decoder;..\..\..\..\..\..\xbmc;..\..\..\..\..\..\lib;..\..\..\libsquish-native\src;$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;USE_LZO_PACKING;TARGET_WINDOWS;_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -87,7 +87,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\..\..\project\VS2010Express\libs\squish\Release\squish.lib;..\..\..\project\BuildDependencies\lib\jpeg-static.lib;..\..\..\project\BuildDependencies\lib\libpng15.lib;..\..\..\project\BuildDependencies\lib\libgif-static.lib;..\..\..\project\BuildDependencies\lib\zlib-static.lib;..\..\..\lib\win32\liblzo\lzo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\..\..\project\VS2010Express\libs\squish\Release\squish.lib;..\..\..\..\..\..\project\BuildDependencies\lib\jpeg-static.lib;..\..\..\..\..\..\project\BuildDependencies\lib\libpng15.lib;..\..\..\..\..\..\project\BuildDependencies\lib\libgif-static.lib;..\..\..\..\..\..\project\BuildDependencies\lib\zlib-static.lib;..\..\..\..\..\..\lib\win32\liblzo\lzo.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libc.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -107,7 +107,7 @@
     <ClCompile Include="..\md5.cpp" />
     <ClCompile Include="..\TexturePacker.cpp" />
     <ClCompile Include="dirent.c" />
-    <ClCompile Include="..\..\..\xbmc\guilib\XBTF.cpp" />
+    <ClCompile Include="..\..\..\..\..\..\xbmc\guilib\XBTF.cpp" />
     <ClCompile Include="..\XBTFWriter.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -123,7 +123,7 @@
     <ClInclude Include="dirent.h" />
     <ClInclude Include="..\md5.h" />
     <ClInclude Include="..\SDL_anigif.h" />
-    <ClInclude Include="..\..\..\xbmc\guilib\XBTF.h" />
+    <ClInclude Include="..\..\..\..\..\..\xbmc\guilib\XBTF.h" />
     <ClInclude Include="..\XBTFWriter.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tools/TexturePacker/Win32/TexturePacker.vcxproj.filters b/tools/depends/native/TexturePacker/src/Win32/TexturePacker.vcxproj.filters
index fc37165d50..a0dbdb2953 100644
--- a/tools/TexturePacker/Win32/TexturePacker.vcxproj.filters
+++ b/tools/depends/native/TexturePacker/src/Win32/TexturePacker.vcxproj.filters
@@ -21,7 +21,7 @@
     <ClCompile Include="dirent.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\xbmc\guilib\XBTF.cpp">
+    <ClCompile Include="..\..\..\..\..\..\xbmc\guilib\XBTF.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\XBTFWriter.cpp">
@@ -62,7 +62,7 @@
     <ClInclude Include="..\SDL_anigif.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\xbmc\guilib\XBTF.h">
+    <ClInclude Include="..\..\..\..\..\..\xbmc\guilib\XBTF.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\XBTFWriter.h">
diff --git a/tools/TexturePacker/Win32/dirent.c b/tools/depends/native/TexturePacker/src/Win32/dirent.c
index 7b38291c6f..7b38291c6f 100644
--- a/tools/TexturePacker/Win32/dirent.c
+++ b/tools/depends/native/TexturePacker/src/Win32/dirent.c
diff --git a/tools/TexturePacker/Win32/dirent.h b/tools/depends/native/TexturePacker/src/Win32/dirent.h
index 6c85abdb58..6c85abdb58 100644
--- a/tools/TexturePacker/Win32/dirent.h
+++ b/tools/depends/native/TexturePacker/src/Win32/dirent.h
diff --git a/tools/TexturePacker/XBTFWriter.cpp b/tools/depends/native/TexturePacker/src/XBTFWriter.cpp
index 339990c412..339990c412 100644
--- a/tools/TexturePacker/XBTFWriter.cpp
+++ b/tools/depends/native/TexturePacker/src/XBTFWriter.cpp
diff --git a/tools/TexturePacker/XBTFWriter.h b/tools/depends/native/TexturePacker/src/XBTFWriter.h
index c8fb44450c..c8fb44450c 100644
--- a/tools/TexturePacker/XBTFWriter.h
+++ b/tools/depends/native/TexturePacker/src/XBTFWriter.h
diff --git a/tools/depends/native/TexturePacker/src/autogen.sh b/tools/depends/native/TexturePacker/src/autogen.sh
new file mode 100755
index 0000000000..bbec436c4c
--- /dev/null
+++ b/tools/depends/native/TexturePacker/src/autogen.sh
@@ -0,0 +1,3 @@
+#/bin/sh
+
+autoreconf -vif
diff --git a/tools/TexturePacker/cmdlineargs.h b/tools/depends/native/TexturePacker/src/cmdlineargs.h
index 740c9038a2..740c9038a2 100644
--- a/tools/TexturePacker/cmdlineargs.h
+++ b/tools/depends/native/TexturePacker/src/cmdlineargs.h
diff --git a/tools/depends/native/TexturePacker/src/configure.ac b/tools/depends/native/TexturePacker/src/configure.ac
new file mode 100644
index 0000000000..896ca18b43
--- /dev/null
+++ b/tools/depends/native/TexturePacker/src/configure.ac
@@ -0,0 +1,47 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT(TexturePacker, 1.0)
+AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR(TexturePacker.cpp)
+AM_INIT_AUTOMAKE([foreign])
+AC_PROG_CXX
+AC_LANG([C++])
+AC_C_BIGENDIAN
+
+abs_top_srcdir=${abs_top_srcdir=$(cd $srcdir; pwd)}
+KODI_SRC_DIR=${KODI_SRC_DIR:-"${abs_top_srcdir}/../../../../.."}
+
+AC_ARG_ENABLE([static],
+  [AS_HELP_STRING([--enable-static],
+  [build static TexturePacker (default is no)])],
+  [STATIC_FLAG="-static"],
+  [STATIC_FLAG=""])
+
+# we don't compile with default upstream squish, so we use our own one
+# even on non unified deps platforms
+export PKG_CONFIG_PATH="${abs_top_srcdir}/../../libsquish-native/squish-install/lib/pkgconfig:$PKG_CONFIG_PATH"
+PKG_CHECK_MODULES([SQUISH], [squish],
+ [CPPFLAGS="$CPPFLAGS $SQUISH_CFLAGS" LIBS="$LIBS $SQUISH_LIBS"],
+ AC_MSG_ERROR("libsquish not found"))
+
+PKG_CHECK_MODULES([PNG], [libpng],
+  [INCLUDES="$PNG_CFLAGS"; LIBS="$LIBS $(pkg-config --silence-errors --static --libs libpng)"],
+  AC_MSG_ERROR("libpng not found"))
+
+AC_CHECK_HEADER([gif_lib.h],, AC_MSG_ERROR("gif_lib.h not found"))
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gif_lib.h>]], [[
+#if !defined GIFLIB_MAJOR || GIFLIB_MAJOR < 5
+#error libgif version < 5;
+#endif ]])], [], [AC_MSG_ERROR([[libgif version must be 5.0.5 or higher.]])])
+
+AC_CHECK_LIB([gif],[main],, AC_MSG_ERROR("libgif not found"))
+AC_CHECK_HEADER([jpeglib.h],, AC_MSG_ERROR("jpeglib.h not found"))
+AC_CHECK_LIB([jpeg],[main],, AC_MSG_ERROR("libjpeg not found"))
+AC_CHECK_HEADER([lzo/lzo1x.h],, AC_MSG_ERROR("lzo/lzo1x.h not found"))
+AC_CHECK_LIB([lzo2],[main],, AC_MSG_ERROR("liblzo2 not found"))
+
+AC_SUBST(KODI_SRC_DIR)
+AC_SUBST(STATIC_FLAG)
+AC_SUBST(EXTRA_DEFINES)
+
+AC_OUTPUT(Makefile)
diff --git a/tools/TexturePacker/decoder/GIFDecoder.cpp b/tools/depends/native/TexturePacker/src/decoder/GIFDecoder.cpp
index 8b3a435093..67e6d24389 100644
--- a/tools/TexturePacker/decoder/GIFDecoder.cpp
+++ b/tools/depends/native/TexturePacker/src/decoder/GIFDecoder.cpp
@@ -18,6 +18,7 @@
  *
  */
 
+#include <cstring>
 #include "GIFDecoder.h"
 #include "GifHelper.h"
 
diff --git a/tools/TexturePacker/decoder/GIFDecoder.h b/tools/depends/native/TexturePacker/src/decoder/GIFDecoder.h
index ce826daeb6..ce826daeb6 100644
--- a/tools/TexturePacker/decoder/GIFDecoder.h
+++ b/tools/depends/native/TexturePacker/src/decoder/GIFDecoder.h
diff --git a/tools/TexturePacker/decoder/GifHelper.cpp b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
index 08fc36d556..19d72c3ea4 100644
--- a/tools/TexturePacker/decoder/GifHelper.cpp
+++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
@@ -21,6 +21,7 @@
 #include "GifHelper.h"
 #include <algorithm>
 #include <stdlib.h>
+#include <cstring>
 
 #define UNSIGNED_LITTLE_ENDIAN(lo, hi)	((lo) | ((hi) << 8))
 #define GIF_MAX_MEMORY 82944000U // about 79 MB, which is equivalent to 10 full hd frames.
diff --git a/tools/TexturePacker/decoder/GifHelper.h b/tools/depends/native/TexturePacker/src/decoder/GifHelper.h
index dae24589e0..dae24589e0 100644
--- a/tools/TexturePacker/decoder/GifHelper.h
+++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.h
diff --git a/tools/TexturePacker/decoder/IDecoder.h b/tools/depends/native/TexturePacker/src/decoder/IDecoder.h
index def1eca8b1..def1eca8b1 100644
--- a/tools/TexturePacker/decoder/IDecoder.h
+++ b/tools/depends/native/TexturePacker/src/decoder/IDecoder.h
diff --git a/tools/TexturePacker/decoder/JPGDecoder.cpp b/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp
index 53f5e9beb7..53f5e9beb7 100644
--- a/tools/TexturePacker/decoder/JPGDecoder.cpp
+++ b/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp
diff --git a/tools/TexturePacker/decoder/JPGDecoder.h b/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.h
index 598a62b98b..598a62b98b 100644
--- a/tools/TexturePacker/decoder/JPGDecoder.h
+++ b/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.h
diff --git a/tools/TexturePacker/decoder/PNGDecoder.cpp b/tools/depends/native/TexturePacker/src/decoder/PNGDecoder.cpp
index 38b8afa738..38b8afa738 100644
--- a/tools/TexturePacker/decoder/PNGDecoder.cpp
+++ b/tools/depends/native/TexturePacker/src/decoder/PNGDecoder.cpp
diff --git a/tools/TexturePacker/decoder/PNGDecoder.h b/tools/depends/native/TexturePacker/src/decoder/PNGDecoder.h
index 78c7fe4ca8..78c7fe4ca8 100644
--- a/tools/TexturePacker/decoder/PNGDecoder.h
+++ b/tools/depends/native/TexturePacker/src/decoder/PNGDecoder.h
diff --git a/tools/TexturePacker/md5.cpp b/tools/depends/native/TexturePacker/src/md5.cpp
index ce0c310963..ce0c310963 100644
--- a/tools/TexturePacker/md5.cpp
+++ b/tools/depends/native/TexturePacker/src/md5.cpp
diff --git a/tools/TexturePacker/md5.h b/tools/depends/native/TexturePacker/src/md5.h
index 456e5be17f..456e5be17f 100644
--- a/tools/TexturePacker/md5.h
+++ b/tools/depends/native/TexturePacker/src/md5.h
diff --git a/tools/TexturePacker/xwinapi.h b/tools/depends/native/TexturePacker/src/xwinapi.h
index 8f31384dd2..8f31384dd2 100644
--- a/tools/TexturePacker/xwinapi.h
+++ b/tools/depends/native/TexturePacker/src/xwinapi.h
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index 205e83f6f5..d1a0e69044 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -10,7 +10,7 @@ DEPENDS = \
 	openssl gmp nettle gnutls libssh2 curl \
 	libjpeg-turbo tiff jasper libpng \
 	libogg libvorbis libflac fribidi libmpeg2 \
-	libass \
+	libass libsquish \
 	libmodplug librtmp libxml2 yajl libmicrohttpd mysql libffi \
 	python26 afpfs-ng libshairplay \
 	libplist libcec libbluray boost tinyxml dummy-libxbmc \