Merge remote branch 'upstream-ro/master'

Fixed conflicts: xbmc/addons/Skin.cpp
opdenkamp · May 2, 2011 · 9219669 · 9219669
2 parents 584fa7f + 12b3d5d
commit 9219669
Show file tree

Hide file tree

Showing 68 changed files with 808 additions and 600 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -210,7 +210,7 @@ configure: configure.in
 	@./bootstrap
 
 # skin textures
-ifneq ($(findstring arm,@ARCH@), arm)
+ifeq (@USE_TEXTUREPACKER@,1)
 skins: tools/TexturePacker/TexturePacker force
 	 $(MAKE) -C $(CONFLUENCE_MEDIA)
 else

diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
diff --git a/addons/skin.confluence/720p/DialogOK.xml b/addons/skin.confluence/720p/DialogOK.xml
@@ -27,6 +27,23 @@
 			<textcolor>white</textcolor>
 			<shadowcolor>black</shadowcolor>
 		</control>
+		<control type="button">
+			<description>Close Window button</description>
+			<posx>510</posx>
+			<posy>5</posy>
+			<width>64</width>
+			<height>32</height>
+			<label>-</label>
+			<font>-</font>
+			<onclick>PreviousMenu</onclick>
+			<texturefocus>DialogCloseButton-focus.png</texturefocus>
+			<texturenofocus>DialogCloseButton.png</texturenofocus>
+			<onleft>3</onleft>
+			<onright>3</onright>
+			<onup>3</onup>
+			<ondown>3</ondown>
+			<visible>system.getbool(input.enablemouse)</visible>
+		</control>
 		<control type="label" id="2">
 			<description>dialog line 1</description>
 			<posx>20</posx>

diff --git a/addons/skin.confluence/720p/DialogYesNo.xml b/addons/skin.confluence/720p/DialogYesNo.xml
@@ -27,6 +27,23 @@
 			<textcolor>white</textcolor>
 			<shadowcolor>black</shadowcolor>
 		</control>
+		<control type="button">
+			<description>Close Window button</description>
+			<posx>510</posx>
+			<posy>5</posy>
+			<width>64</width>
+			<height>32</height>
+			<label>-</label>
+			<font>-</font>
+			<onclick>PreviousMenu</onclick>
+			<texturefocus>DialogCloseButton-focus.png</texturefocus>
+			<texturenofocus>DialogCloseButton.png</texturenofocus>
+			<onleft>3</onleft>
+			<onright>3</onright>
+			<onup>3</onup>
+			<ondown>3</ondown>
+			<visible>system.getbool(input.enablemouse)</visible>
+		</control>
 		<control type="label" id="2">
 			<description>dialog line 1</description>
 			<posx>20</posx>

diff --git a/addons/skin.confluence/build.bat b/addons/skin.confluence/build.bat
@@ -14,7 +14,7 @@ Echo exclude.txt>>exclude.txt
 
 ECHO ----------------------------------------
 ECHO Creating XBT File...
-START /B /WAIT ..\..\Tools\TexturePacker\TexturePacker -input media -output ..\..\project\Win32BuildSetup\BUILD_WIN32\Xbmc\addons\skin.confluence\media\Textures.xbt
+START /B /WAIT ..\..\Tools\TexturePacker\TexturePacker -dupecheck -input media -output ..\..\project\Win32BuildSetup\BUILD_WIN32\Xbmc\addons\skin.confluence\media\Textures.xbt
 
 ECHO ----------------------------------------
 ECHO XBT Texture Files Created...

diff --git a/configure.in b/configure.in
@@ -282,6 +282,12 @@ AC_ARG_ENABLE([libbluray],
   [use_libbluray=$enableval],
   [use_libbluray=auto])
 
+AC_ARG_ENABLE([texturepacker],
+  [AS_HELP_STRING([--enable-texturepacker],
+  [enable texturepacker support (default is yes)])],
+  [use_texturepacker=$enableval],
+  [use_texturepacker=auto])
+
 AC_ARG_WITH([lirc-device],
   [AS_HELP_STRING([--with-lirc-device=file],
   [specify the default LIRC device (default is /dev/lircd)])],
@@ -334,6 +340,13 @@ case $host in
      use_joystick=no
      use_vdadecoder=no
      use_vtbdecoder=yes
+     check_sdl_arch=[`file /opt/local/lib/libSDL_image.dylib | awk '{V=7; print $V}'`]
+     if test "x$check_sdl_arch" = "xi386"; then
+       use_texturepacker_native=yes
+       USE_TEXTUREPACKER_NATIVE_ROOT="/opt/local"
+     else
+       use_texturepacker=no
+     fi
      ARCH="arm-osx"
      SYSROOT="-miphoneos-version-min=4.1 -isysroot $SDKROOT"
      ARCHTYPE=$HOSTTYPE
@@ -348,6 +361,8 @@ case $host in
   i386-apple-darwin*)
      use_joystick=no
      use_vtbdecoder=no
+     use_texturepacker_native=yes
+     USE_TEXTUREPACKER_NATIVE_ROOT="$prefix"
      ARCH="x86-osx"
      export MACOSX_DEPLOYMENT_TARGET=10.4
      SYSROOT="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
@@ -356,6 +371,10 @@ case $host in
      AC_SUBST([ARCHTYPE])
      ;;
   powerpc-apple-darwin*)
+     use_joystick=no
+     use_vdadecoder=no
+     use_vtbdecoder=no
+     use_crystalhd=no
      ARCH="powerpc-osx"
      export MACOSX_DEPLOYMENT_TARGET=10.4
      SYSROOT="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
@@ -372,6 +391,7 @@ case $host in
      AC_SUBST(ARCH_DEFINES, "-D_POWERPC64")
      ;;
   arm*-*-linux-gnu*)
+     use_texturepacker=no
      ARCH="arm"
      AC_SUBST(ARCH_DEFINES, "-D_ARMEL")
      ;;
@@ -1215,6 +1235,21 @@ else
   final_message="$final_message\n  Bluray:\tNo"
 fi
 
+USE_TEXTUREPACKER_NATIVE=0
+if test "x$use_texturepacker" != "xno"; then
+  final_message="$final_message\n  TexturePacker:Yes"
+  USE_TEXTUREPACKER=1
+  if test "x$use_texturepacker_native" = "xyes"; then
+    USE_TEXTUREPACKER_NATIVE=1
+    if [[ ! -d "$USE_TEXTUREPACKER_NATIVE_ROOT" ]]; then 
+      USE_TEXTUREPACKER_NATIVE_ROOT= 
+    fi
+  fi
+else
+  final_message="$final_message\n  TexturePacker:No"
+  USE_TEXTUREPACKER=0
+fi
+
 if test "$use_mid" = "yes"; then
   final_message="$final_message\n  MID Support:\tYes"
   SDL_DEFINES="$SDL_DEFINES -DMID"
@@ -1447,6 +1482,9 @@ AC_SUBST(USE_VDA)
 AC_SUBST(USE_OPENMAX)
 AC_SUBST(USE_PULSE)
 AC_SUBST(USE_XRANDR)
+AC_SUBST(USE_TEXTUREPACKER)
+AC_SUBST(USE_TEXTUREPACKER_NATIVE)
+AC_SUBST(USE_TEXTUREPACKER_NATIVE_ROOT)
 
 # pushd and popd are not available in other shells besides bash, so implement
 # our own pushd/popd functions

diff --git a/lib/Makefile.in b/lib/Makefile.in
@@ -57,25 +57,26 @@ endif
 $(SYSDIR)/avutil-50-$(ARCH).so: $(WRAPPER) ffmpeg/libavutil/libavutil.dylib
 	$(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS) -o $@ \
 		$(WRAPPER) ffmpeg/libavutil/*.o \
-		ffmpeg/libavutil/$(ARCH_DIR)/*.o
+		ffmpeg/libavutil/$(ARCH_DIR)/*.o $(BUNDLE1_O)
 
 $(SYSDIR)/avcodec-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavcodec/libavcodec.dylib
 	$(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS) -o $@ \
 		$(WRAPPER) ffmpeg/libavcodec/*.o \
-		ffmpeg/libavcodec/$(ARCH_DIR)/*.o
+		ffmpeg/libavcodec/$(ARCH_DIR)/*.o $(BUNDLE1_O)
 
 $(SYSDIR)/avcore-0-$(ARCH).so: $(WRAPPER) ffmpeg/libavcore/libavcore.dylib
 	$(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS)  -o $@ \
-		$(WRAPPER) ffmpeg/libavcore/*.o
+		$(WRAPPER) ffmpeg/libavcore/*.o $(BUNDLE1_O)
 
 $(SYSDIR)/avformat-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavformat/libavformat.dylib
 	$(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS)  -o $@ \
-		$(WRAPPER) ffmpeg/libavformat/*.o
+		$(WRAPPER) ffmpeg/libavformat/*.o $(BUNDLE1_O)
 
 ifneq ($(findstring arm,$(ARCH)), arm)
 $(SYSDIR)/swscale-0-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.dylib
 	$(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS)  -o $@ \
-		$(WRAPPER) ffmpeg/libswscale/*.o ffmpeg/libswscale/$(ARCH_DIR)/*.o
+		$(WRAPPER) ffmpeg/libswscale/*.o \
+		ffmpeg/libswscale/$(ARCH_DIR)/*.o $(BUNDLE1_O)
 else # No ARM version of swscale available yet.
 $(SYSDIR)/swscale-0-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.dylib
 	$(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS)  -o $@ \
@@ -84,7 +85,7 @@ endif
 
 $(SYSDIR)/postproc-51-$(ARCH).so: $(WRAPPER) ffmpeg/libpostproc/libpostproc.dylib
 	$(LD) $(LDFLAGS) -alias_list $(WRAPPER_MACH_ALIAS)  -o $@ \
-		$(WRAPPER) ffmpeg/libpostproc/*.o
+		$(WRAPPER) ffmpeg/libpostproc/*.o $(BUNDLE1_O)
 
 ffmpeg/libavutil/libavutil.dylib     : ffmpeg;
 ffmpeg/libavcodec/libavcodec.dylib   : ffmpeg;

diff --git a/lib/cmyth/Win32/libcmyth.def b/lib/cmyth/Win32/libcmyth.def
@@ -28,6 +28,7 @@ EXPORTS
 	cmyth_dbg_all
 	cmyth_dbg_none
 	cmyth_dbg
+	cmyth_set_dbg_msgcallback
 	refmem_dbg_level
 	refmem_dbg_all
 	refmem_dbg_none

diff --git a/lib/cmyth/Win32/libcmyth.vcxproj b/lib/cmyth/Win32/libcmyth.vcxproj
@@ -158,6 +158,9 @@
     <ClInclude Include="..\libcmyth\safe_string.h" />
     <ClInclude Include="..\librefmem\refmem_local.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="libcmyth.def" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/lib/cmyth/Win32/libcmyth.vcxproj.filters b/lib/cmyth/Win32/libcmyth.vcxproj.filters
@@ -91,4 +91,7 @@
       <Filter>refmem</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="libcmyth.def" />
+  </ItemGroup>
 </Project>
diff --git a/lib/libsquish/Makefile.in b/lib/libsquish/Makefile.in
@@ -1,17 +1,38 @@
 ARCH=@ARCH@
 
-SRCS=alpha.cpp clusterfit.cpp colourblock.cpp colourfit.cpp colourset.cpp maths.cpp rangefit.cpp singlecolourfit.cpp squish.cpp
+SRCS= \
+  alpha.cpp \
+  clusterfit.cpp \
+  colourblock.cpp \
+  colourfit.cpp \
+  colourset.cpp \
+  maths.cpp \
+  rangefit.cpp \
+  singlecolourfit.cpp \
+  squish.cpp
 
-ifeq ($(findstring powerpc,$(ARCH)),powerpc)
-CXXFLAGS+=-I. -DSQUISH_USE_ALTIVEC=1 -maltivec
-else
-ifeq ($(findstring arm,$(ARCH)), arm)
 CXXFLAGS+=-I.
+ifeq ($(findstring powerpc,$(ARCH)),powerpc)
+  CXXFLAGS+=-DSQUISH_USE_ALTIVEC=1 -maltivec
+else ifeq ($(findstring x86,$(ARCH)), x86)
+  CXXFLAGS+=-DSQUISH_USE_SSE=2 -msse2
+endif
+
+LIB=libsquish.a
+
+ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
+NATIVE_LIB=libsquish-native.so
+CLEAN_FILES+=$(NATIVE_LIB)
+
+all: $(LIB) $(NATIVE_LIB)
+# TexturePacker links to libsquish and needs to run on build system, so make a native flavor.
+$(NATIVE_LIB): $(SRCS)
+ifeq ($(findstring osx,$(ARCH)),osx)
+	g++ -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
 else
-CXXFLAGS+=-I. -DSQUISH_USE_SSE=2 -msse2
+	g++ -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
 endif
 endif
-LIB=libsquish.a
 
 include ../../Makefile.include
 -include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
diff --git a/lib/xbadpcm/ADPCMDll.cpp b/lib/xbadpcm/ADPCMDll.cpp
@@ -21,6 +21,7 @@
 
 #ifdef _LINUX
 #define __declspec(x)
+#define __cdecl
 #endif
 
 extern "C" 
@@ -64,7 +65,7 @@ extern "C"
 }
 
 
-  void* __declspec(dllexport) DLL_LoadXWAV(const char* szFileName)
+  __declspec(dllexport) void* __cdecl DLL_LoadXWAV(const char* szFileName)
   { 
     ADPCMInfo* info = (ADPCMInfo*)malloc(sizeof(ADPCMInfo));
     info->f = fopen(szFileName,"rb");

diff --git a/project/BuildDependencies/scripts/get_mingw_env.txt b/project/BuildDependencies/scripts/get_mingw_env.txt
@@ -1,19 +1,21 @@
 ; filename                                  mirror                                                      source of the file
 mingwrt-3.18-mingw32-dev.tar.gz             http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-3.18/
 mingwrt-3.18-mingw32-dll.tar.gz             http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-3.18/
-w32api-3.15-1-mingw32-dev.tar.lzma          http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-3.15/
-gcc-core-4.5.0-1-mingw32-bin.tar.lzma       http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-4.5.0-1/
-gcc-c++-4.5.0-1-mingw32-bin.tar.lzma        http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-4.5.0-1/
-libstdc++-4.5.0-1-mingw32-dll-6.tar.lzma    http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-4.5.0-1/
-binutils-2.21-2-mingw32-bin.tar.lzma        http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GNU-Binutils/binutils-2.21/
+w32api-3.17-2-mingw32-dev.tar.lzma          http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-3.17/
+gcc-core-4.5.2-1-mingw32-bin.tar.lzma       http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-4.5.2-1/
+gcc-c++-4.5.2-1-mingw32-bin.tar.lzma        http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-4.5.2-1/
+libstdc++-4.5.2-1-mingw32-dll-6.tar.lzma    http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-4.5.2-1/
+binutils-2.21-3-mingw32-bin.tar.lzma        http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GNU-Binutils/binutils-2.21/
 yasm-1.1.0-win32.exe                        http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://www.tortall.net/projects/yasm/releases/
 dlfcn-win32-static-r19.tar.bz2              http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://dlfcn-win32.googlecode.com/files/
 libexpat-2.0.1-1-mingw32-dev.tar.gz         http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/expat/expat-2.0.1-1/
-libz-1.2.3-1-mingw32-dev.tar.gz             http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/zlib/zlib-1.2.3-1-mingw32/
+libz-1.2.5-1-mingw32-dev.tar.lzma           http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/zlib/zlib-1.2.5-1-mingw32/
 libgmp-5.0.1-1-mingw32-dll-10.tar.lzma      http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/gmp/gmp-5.0.1-1/
 libmpc-0.8.1-1-mingw32-dll-2.tar.lzma       http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/mpc/mpc-0.8.1-1/
 libmpfr-2.4.1-1-mingw32-dll-1.tar.lzma      http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/mpfr/mpfr-2.4.1-1/
 automake1.11-1.11.1-1-mingw32-bin.tar.lzma  http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/automake/automake1.11/automake1.11-1.11.1-1/
 libtool-2.4-1-mingw32-bin.tar.lzma          http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/libtool/libtool-2.4-1/
 mads_1.9.2.7z                               http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://mads.atari8.info/
 xasm-3.0.2-windows.zip                      http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://atariarea.krap.pl/x-asm/
+libintl-0.17-1-mingw32-dll-8.tar.lzma       http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://sourceforge.net/projects/mingw/files/MinGW/gettext/gettext-0.17-1/
+libiconv-1.13.1-1-mingw32-dll-2.tar.lzma    http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://sourceforge.net/projects/mingw/files/MinGW/libiconv/libiconv-1.13.1-1/
diff --git a/project/BuildDependencies/scripts/get_msys_env.txt b/project/BuildDependencies/scripts/get_msys_env.txt
@@ -1,6 +1,6 @@
 ; filename                                              mirror                                                    source of the file
-msysCORE-1.0.16-1-msys-1.0.16-bin.tar.lzma              http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/msys-core/msys-1.0.16-1/
-msysCORE-1.0.16-1-msys-1.0.16-ext.tar.lzma              http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/msys-core/msys-1.0.16-1/
+msysCORE-1.0.17-1-msys-1.0.17-bin.tar.lzma              http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/msys-core/msys-1.0.17-1/
+msysCORE-1.0.17-1-msys-1.0.17-ext.tar.lzma              http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/msys-core/msys-1.0.17-1/
 libregex-1.20090805-2-msys-1.0.13-dll-1.tar.lzma        http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/regex/regex-1.20090805-2/
 libtermcap-0.20050421_1-2-msys-1.0.13-dll-0.tar.lzma    http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/termcap/termcap-0.20050421_1-2/
 gettext-0.17-2-msys-1.0.13-bin.tar.lzma                 http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/gettext/gettext-0.17-2/
@@ -27,4 +27,4 @@ coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2             http://mirrors.xbmc.org/
 ; for xargs.exe
 findutils-4.4.2-2-msys-1.0.13-bin.tar.lzma              http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/findutils/findutils-4.4.2-2/
 automake-1.11.1-1-msys-1.0.13-bin.tar.lzma              http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/automake/automake-1.11.1-1/
-mktemp-1.6-2-msys-1.0.13-bin.tar.lzma                   http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/mktemp/mktemp-1.6-2/
+mktemp-1.6-2-msys-1.0.13-bin.tar.lzma                   http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/mktemp/mktemp-1.6-2/
diff --git a/project/Win32BuildSetup/buildmingwlibs.sh b/project/Win32BuildSetup/buildmingwlibs.sh
@@ -65,6 +65,7 @@ echo "##### building of libmpeg2 dlls done #####"
 
 echo "##### building timidity dlls #####"
 cd /xbmc/lib/timidity/
+make -f Makefile.win32 clean
 make -f Makefile.win32
 setfilepath /xbmc/system/players/paplayer
 checkfiles timidity.dll

diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in
@@ -1,24 +1,49 @@
-ARCH=@ARCH@
-DEFINES = 
-ifeq ($(findstring osx,$(ARCH)),osx)
-LIBS = @abs_top_srcdir@/lib/libsquish/libsquish.a -L/Users/Shared/xbmc-depends/osx-10.4_i386/lib -lSDL_image -lSDL -llzo2
+DEFINES += -D_LINUX -DUSE_LZO_PACKING
+ifneq ($(or $(findstring powerpc,arm-osx),$(findstring ppc, arm-osx)),)
+DEFINES += -DHOST_BIGENDIAN
+endif
+
+CXXFLAGS+= \
+  -I. \
+  -I@abs_top_srcdir@/lib \
+  -I@abs_top_srcdir@/xbmc \
+  -I@abs_top_srcdir@/xbmc/linux
+
+ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
+NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@
+ifdef NATIVE_ROOT_PATH
+CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include
+LIBS    += -L$(NATIVE_ROOT_PATH)/lib
+endif
+LIBS    += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
 else
-LIBS = @abs_top_srcdir@/lib/libsquish/libsquish.a -lSDL_image -lSDL -llzo2
+LIBS    += -L@abs_top_srcdir@/lib/libsquish -lsquish
 endif
 
-OBJS = \
-	SDL_anigif.o \
-	XBTFWriter.o \
-	XBMCTex.o \
-	md5.o \
-	@abs_top_srcdir@/xbmc/guilib/XBTF.o
+LIBS    += -lSDL_image -lSDL -llzo2
+
+SRCS = \
+  md5.cpp \
+  SDL_anigif.cpp \
+  XBTFWriter.cpp \
+  XBMCTex.cpp \
+  @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
+
 
 TARGET = TexturePacker
 CLEAN_FILES=$(TARGET)
 
 all: $(TARGET)
 
+ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
+# TexturePacker run native on build system, build it with native tools
+$(TARGET): $(SRCS)
+	g++ $(DEFINES) $(CXXFLAGS) $(SRCS) $(LIBS) -o $(TARGET)
+clean:
+	rm -f $(TARGET)
+else
 include @abs_top_srcdir@/Makefile.include
 
-$(TARGET): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARGET)
+$(TARGET): $(SRCS)
+	$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(SRCS) $(LDFLAGS) $(LIBS) -o $(TARGET)
+endif