[configure] adjust to texturepacker and squish in depends

6 files changed, 38 insertions, 26 deletions

diff --git a/Makefile.in b/Makefile.in
index f88c88b558..4151266a44 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,9 +9,6 @@ AUTOGENERATED_MAKEFILES=@OUTPUT_FILES@
 EC_DIRS= \
 	tools/EventClients
 
-XBMCTEX_DIRS= \
-	tools/TexturePacker
-
 DVDPCODECS_DIRS= \
 	lib \
 	lib/libdvd 
@@ -34,7 +31,6 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
                    lib/libRTV/librtv.a \
                    lib/libXDAAP/libxdaap.a \
                    lib/libhts/libhts.a \
-                   lib/libsquish/libsquish.a \
                    xbmc/addons/addons.a \
                    xbmc/cdrip/cdrip.a \
                    xbmc/cores/AudioEngine/audioengine.a \
@@ -352,7 +348,7 @@ config.status: configure
 
 # skin textures
 ifeq (@USE_TEXTUREPACKER@,1)
-skins: tools/TexturePacker/TexturePacker force
+skins: @TEXTUREPACKER@
 	 $(MAKE) -C $(CONFLUENCE_MEDIA)
 ifeq (@USE_TOUCH_SKIN@,1)
 	 $(MAKE) -C $(TOUCH_SKIN_MEDIA)
@@ -460,7 +456,6 @@ externals: codecs libs visualizations screensavers libaddon pvraddons
 
 xcode_depends: \
 	codecs libs visualizations screensavers eventclients skins libaddon \
-	lib/libsquish/libsquish.a \
 	lib/libRTV/librtv.a \
 	lib/libXDAAP/libxdaap.a \
 	lib/SlingboxLib/SlingboxLib.a
@@ -508,7 +503,7 @@ OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC))
 
 BIN_DIRS = $(dir $(DIRECTORY_ARCHIVES)) $(dir $(NWAOBJSXBMC)) $(dir $(MAINOBJS))
 
-DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
+DIRS= $(BIN_DIRS) $(EC_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
 	$(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/main
 
 $(NWAOBJSXBMC) $(DIRECTORY_ARCHIVES) $(MAINOBJS): force
@@ -540,9 +535,6 @@ else
 	$(SILENT_LD) $(CC) $(CFLAGS) $(LDFLAGS) -o @APP_NAME_LC@-xrandr xbmc-xrandr.c -lXrandr -lX11 -lm
 endif
 
-tools/TexturePacker/TexturePacker: xbmc/guilib/XBTF.h
-	$(MAKE) -C tools/TexturePacker/
-
 
 install-bin: @APP_NAME_LC@.bin # developement convenience target
 	sudo install -d $(DESTDIR)$(libdir)
@@ -692,8 +684,6 @@ clean-@APP_NAME_LC@.bin:
 	for d in $(BIN_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
 clean-eventclients:
 	for d in $(EC_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
-clean-xbmctex:
-	for d in $(XBMCTEX_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
 clean-dvdpcodecs:
 	for d in $(DVDPCODECS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
 clean-papcodecs:
@@ -713,7 +703,7 @@ endif
 
 clean-codecs: clean-dvdpcodecs clean-papcodecs
 
-clean-externals: clean-codecs clean-eventclients clean-xbmctex clean-libs \
+clean-externals: clean-codecs clean-eventclients clean-libs \
 	clean-screensavers clean-visualisations clean-libaddons clean-pvraddons
 
 ifeq (1,@GTEST_CONFIGURED@)
diff --git a/addons/skin.confluence/media/Makefile.in b/addons/skin.confluence/media/Makefile.in
index bfb18c5453..181c2e8824 100644
--- a/addons/skin.confluence/media/Makefile.in
+++ b/addons/skin.confluence/media/Makefile.in
@@ -1,5 +1,4 @@
 TARGET=Textures.xbt
-XBMCTEX=@abs_top_srcdir@/tools/TexturePacker/TexturePacker
 
 IMAGES := $(shell find . -name "*jpg")
 IMAGES += $(shell find . -name "*png")
@@ -9,15 +8,13 @@ all: $(TARGET)
 
 .PHONY: force
 
-$(TARGET): $(XBMCTEX) $(IMAGES)
+$(TARGET): $(IMAGES)
 ifeq (@ARCH@,arm)
-	$(XBMCTEX) -use_none -input . -output $(TARGET)
+	@TEXTUREPACKER@ -use_none -input . -output $(TARGET)
 else
-	$(XBMCTEX) -input . -output $(TARGET)
+	@TEXTUREPACKER@ -input . -output $(TARGET)
 
 endif
-$(XBMCTEX): force
-	$(MAKE) -C @abs_top_srcdir@/tools/TexturePacker
 
 clean:
 	rm -f $(TARGET)
diff --git a/configure.in b/configure.in
index dd7338efdc..786b06f8db 100644
--- a/configure.in
+++ b/configure.in
@@ -2174,13 +2174,39 @@ else
 fi
 
 if test "x$use_texturepacker" != "xno"; then
-  final_message="$final_message\n  TexturePacker:Yes"
-  USE_TEXTUREPACKER=1
+  AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],
+    [$PATH$PATH_SEPARATOR${abs_top_srcdir}/tools/depends/native/TexturePacker/bin])
+  if test "$TEXTUREPACKER" = "none"; then
+    make -C ${abs_top_srcdir}/tools/depends/native/TexturePacker
+    TEXTUREPACKER="${abs_top_srcdir}/tools/depends/native/TexturePacker/bin/TexturePacker"
+  fi
+  if test -x "$TEXTUREPACKER"; then
+    final_message="$final_message\n  TexturePacker:Yes"
+    USE_TEXTUREPACKER=1
+  else
+    if "x$use_texturepacker" = "xyes"; then
+      AC_MSG_ERROR("Texturepacker not found")
+    else
+      AC_MSG_NOTICE("Texturepacker not found")
+      USE_TEXTUREPACKER=0
+      final_message="$final_message\n  TexturePacker:No"
+    fi
+  fi
 else
   final_message="$final_message\n  TexturePacker:No"
   USE_TEXTUREPACKER=0
 fi
 
+# we don't compile with default upstream squish, so we use our own one
+# even on non unified deps platforms
+if test "$cross_compiling" != "yes"; then
+  export PKG_CONFIG_PATH="${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/lib/pkgconfig:$PKG_CONFIG_PATH"
+fi
+PKG_CHECK_MODULES([SQUISH], [squish],
+ [INCLUDES="$INCLUDES $SQUISH_CFLAGS" LIBS="$LIBS $SQUISH_LIBS"],
+ AC_MSG_ERROR("squish not found"))
+
+
 if test "$use_mid" = "yes"; then
   final_message="$final_message\n  MID Support:\tYes"
   SDL_DEFINES="$SDL_DEFINES -DMID"
@@ -2466,7 +2492,6 @@ OUTPUT_FILES="Makefile \
     lib/libXDAAP/Makefile \
     lib/cmyth/Makefile \
     lib/libhdhomerun/Makefile \
-    lib/libsquish/Makefile \
     lib/cximage-6.0/Makefile \
     lib/libUPnP/Makefile \
     xbmc/DllPaths_generated.h \
@@ -2492,7 +2517,6 @@ OUTPUT_FILES="Makefile \
     tools/Linux/${APP_NAME_LC}-xsession.desktop \
     tools/Linux/FEH.py \
     tools/Linux/FEH-ARM.py \
-    tools/TexturePacker/Makefile \
     tools/EventClients/Makefile \
     tools/EventClients/Clients/OSXRemote/Makefile \
     xbmc/peripherals/bus/Makefile \
@@ -2599,6 +2623,7 @@ AC_SUBST(HAVE_LIBPULSE)
 AC_SUBST(USE_XRANDR)
 AC_SUBST(USE_ALSA)
 AC_SUBST(USE_TEXTUREPACKER)
+AC_SUBST(TEXTUREPACKER)
 AC_SUBST(USE_AIRTUNES)
 AC_SUBST(USE_LIBUDEV)
 AC_SUBST(USE_LIBUSB)
diff --git a/tools/darwin/Configurations/App.xcconfig.in b/tools/darwin/Configurations/App.xcconfig.in
index 7a5506a591..94946d3daf 100644
--- a/tools/darwin/Configurations/App.xcconfig.in
+++ b/tools/darwin/Configurations/App.xcconfig.in
@@ -22,7 +22,7 @@ XBMC_DEPENDS_ROOT = @DEPENDS_ROOT_FOR_XCODE@
 
 HEADER_SEARCH_PATHS = $(inherited) $SRCROOT xbmc xbmc/linux xbmc/osx xbmc/cores/dvdplayer lib $XBMC_DEPENDS/include $XBMC_DEPENDS/include/libcec $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6
 
-LIBRARY_SEARCH_PATHS = $(inherited) $(SRCROOT) $(SRCROOT)/lib/libRTV $(SRCROOT)/lib/libXDAAP $(SRCROOT)/lib/cmyth/libcmyth $(SRCROOT)/lib/cmyth/librefmem $(SRCROOT)/lib/libsquish $(SRCROOT)/lib/SlingboxLib $(SRCROOT)/xbmc/interfaces/json-rpc "$(SRCROOT)/xbmc/interfaces/python" "$(SRCROOT)/xbmc/interfaces/legacy"
+LIBRARY_SEARCH_PATHS = $(inherited) $(SRCROOT) $(SRCROOT)/lib/libRTV $(SRCROOT)/lib/libXDAAP $(SRCROOT)/lib/cmyth/libcmyth $(SRCROOT)/lib/cmyth/librefmem $(SRCROOT)/lib/SlingboxLib $(SRCROOT)/xbmc/interfaces/json-rpc "$(SRCROOT)/xbmc/interfaces/python" "$(SRCROOT)/xbmc/interfaces/legacy"
 FRAMEWORK_SEARCH_PATHS = $(inherited) "$(SDKROOT)/System/Library/PrivateFrameworks/" "$(SDKROOT)/System/Library/Frameworks/"
 
 XBMC_OTHER_LDFLAGS_COMMON = $(inherited) -Wl,-headerpad_max_install_names -Wl,-all_load -L$XBMC_DEPENDS/lib -lbz2 -lintl -lexpat -lssl -lgpg-error -lresolv -lffi -lssh -llzo2 -lpcre -lpcrecpp -lfribidi -lfreetype -lfontconfig -lsqlite3 -ltinyxml -lmicrohttpd -lsmbclient -lpython2.6 -lyajl -ljpeg -lcrypto -lgcrypt -lavdevice -lavfilter -lavcodec -lavformat -lpostproc -lavutil -lswresample -lswscale -ltag -L$XBMC_DEPENDS/lib/mysql -lmysqlclient -lxml2 -lxslt -lnettle -lgmp -lhogweed -lgnutls
diff --git a/xbmc/guilib/DDSImage.cpp b/xbmc/guilib/DDSImage.cpp
index 80f422a244..e9800a0e47 100644
--- a/xbmc/guilib/DDSImage.cpp
+++ b/xbmc/guilib/DDSImage.cpp
@@ -20,7 +20,7 @@
 
 #include "DDSImage.h"
 #include "XBTF.h"
-#include "libsquish/squish.h"
+#include <squish.h>
 #include "utils/log.h"
 #include <string.h>
 
diff --git a/xbmc/guilib/TextureBundleXBT.cpp b/xbmc/guilib/TextureBundleXBT.cpp
index df75beab99..8642c80540 100644
--- a/xbmc/guilib/TextureBundleXBT.cpp
+++ b/xbmc/guilib/TextureBundleXBT.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include "libsquish/squish.h"
+#include "squish.h"
 #include "system.h"
 #include "TextureBundleXBT.h"
 #include "Texture.h"