Updated texturepacker to vs2015 and all libs with it, remove dependency on lzo in lib folder

make lzo non-optional (thanks Stefan Saraev)
Packaged a new build of texturepacker

4 files changed, 0 insertions, 422 deletions

diff --git a/lib/win32/liblzo/LZO-1.00.rar b/lib/win32/liblzo/LZO-1.00.rar
deleted file mode 100644
index 4644c51630..0000000000
--- a/lib/win32/liblzo/LZO-1.00.rar
+++ /dev/null
diff --git a/lib/win32/liblzo/LZO1X.H b/lib/win32/liblzo/LZO1X.H
deleted file mode 100755
index 921edaad27..0000000000
--- a/lib/win32/liblzo/LZO1X.H
+++ /dev/null
@@ -1,127 +0,0 @@
-/* lzo1x.h -- public interface of the LZO1X compression algorithm
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Markus F.X.J. Oberhumer
-   markus.oberhumer@jk.uni-linz.ac.at
- */
-
-
-#ifndef __LZO1X_H
-#define __LZO1X_H
-
-#ifndef __LZOCONF_H
-#include "lzoconf.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-/* Memory required for the wrkmem parameter.
- * When the required size is 0, you can also pass a NULL pointer.
- */
-
-#define LZO1X_MEM_COMPRESS      ((lzo_uint) (16384L * sizeof(lzo_byte *)))
-#define LZO1X_MEM_DECOMPRESS    (0)
-#define LZO1X_MEM_OPTIMIZE      (0)
-
-
-/* decompression */
-LZO_EXTERN(int)
-lzo1x_decompress        ( const lzo_byte *src, lzo_uint  src_len,
-                                lzo_byte *dst, lzo_uint *dst_len,
-                                lzo_voidp wrkmem /* NOT USED */ );
-
-/* safe decompression with overrun testing */
-LZO_EXTERN(int)
-lzo1x_decompress_safe   ( const lzo_byte *src, lzo_uint  src_len,
-                                lzo_byte *dst, lzo_uint *dst_len,
-                                lzo_voidp wrkmem /* NOT USED */ );
-
-/***********************************************************************
-//
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1x_1_compress        ( const lzo_byte *src, lzo_uint  src_len,
-                                lzo_byte *dst, lzo_uint *dst_len,
-                                lzo_voidp wrkmem );
-
-
-/***********************************************************************
-// special compressor versions
-************************************************************************/
-
-/* this version needs only 8kB work memory */
-#define LZO1X_1_11_MEM_COMPRESS ((lzo_uint) (2048L * sizeof(lzo_byte *)))
-
-LZO_EXTERN(int)
-lzo1x_1_11_compress     ( const lzo_byte *src, lzo_uint  src_len,
-                                lzo_byte *dst, lzo_uint *dst_len,
-                                lzo_voidp wrkmem );
-
-
-/* use this version if you need a little more compression speed */
-#define LZO1X_1_15_MEM_COMPRESS ((lzo_uint) (32768L * sizeof(lzo_byte *)))
-
-LZO_EXTERN(int)
-lzo1x_1_15_compress     ( const lzo_byte *src, lzo_uint  src_len,
-                                lzo_byte *dst, lzo_uint *dst_len,
-                                lzo_voidp wrkmem );
-
-
-/***********************************************************************
-// better compression ratio at the cost of more memory and time
-************************************************************************/
-
-#define LZO1X_999_MEM_COMPRESS  ((lzo_uint) (14 * 16384L * sizeof(short)))
-
-#if !defined(LZO_999_UNSUPPORTED)
-LZO_EXTERN(int)
-lzo1x_999_compress      ( const lzo_byte *src, lzo_uint  src_len,
-                                lzo_byte *dst, lzo_uint *dst_len,
-                                lzo_voidp wrkmem );
-#endif
-
-
-/***********************************************************************
-// optimize a compressed data block
-************************************************************************/
-
-LZO_EXTERN(int)
-lzo1x_optimize          (       lzo_byte *in , lzo_uint  in_len,
-                                lzo_byte *out, lzo_uint *out_len,
-                                lzo_voidp wrkmem );
-
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/lib/win32/liblzo/LZOCONF.H b/lib/win32/liblzo/LZOCONF.H
deleted file mode 100755
index a977e44987..0000000000
--- a/lib/win32/liblzo/LZOCONF.H
+++ /dev/null
@@ -1,295 +0,0 @@
-/* lzoconf.h -- configuration for the LZO real-time data compression library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Markus F.X.J. Oberhumer
-   markus.oberhumer@jk.uni-linz.ac.at
-   http://www.infosys.tuwien.ac.at/Staff/lux/marco/lzo.html
- */
-
-
-#ifndef __LZOCONF_H
-#define __LZOCONF_H
-
-#define LZO_VERSION             0x1000
-#define LZO_VERSION_STRING      "1.00"
-#define LZO_VERSION_DATE        "Jul 13 1997"
-
-/* internal Autoconf configuration file - only used when building LZO */
-#if defined(LZO_HAVE_CONFIG_H)
-#  include <config.h>
-#endif
-
-/* LZO requires a conforming <limits.h> */
-#include <limits.h>
-#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
-#  error invalid CHAR_BIT
-#endif
-#if !defined(UCHAR_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX)
-#  error check your compiler installation
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/***********************************************************************
-// architecture defines
-************************************************************************/
-
-#if defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
-#  define __LZO_WIN
-#elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
-#  define __LZO_WIN
-#elif defined(__NT__) || defined(__WINDOWS_386__)
-#  define __LZO_WIN
-#elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS)
-#  define __LZO_DOS
-#endif
-
-#if (UINT_MAX < 0xffffffffL)
-#  if defined(__LZO_WIN)
-#    define __LZO_WIN16
-#  elif defined(__LZO_DOS)
-#    define __LZO_DOS16
-#  elif defined(__TOS__)
-#    define __LZO_TOS16
-#  else
-#    error 16 bit target not supported
-#  endif
-#endif
-
-#if !defined(__LZO_i386)
-#  if defined(__LZO_DOS) || defined(__LZO_WIN16)
-#    define __LZO_i386
-#  elif defined(__i386__) || defined(__386__) || defined(_M_IX86)
-#    define __LZO_i386
-#  endif
-#endif
-
-
-/***********************************************************************
-// integral and pointer types
-************************************************************************/
-
-/* Integral types with 32 bits or more */
-#if !defined(LZO_UINT32_MAX)
-#  if (UINT_MAX >= 0xffffffffL)
-     typedef unsigned int       lzo_uint32;
-     typedef int                lzo_int32;
-#    define LZO_UINT32_MAX      UINT_MAX
-#  elif (ULONG_MAX >= 0xffffffffL)
-     typedef unsigned long      lzo_uint32;
-     typedef long               lzo_int32;
-#    define LZO_UINT32_MAX      ULONG_MAX
-#  else
-#    error lzo_uint32
-#  endif
-#endif
-
-/* lzo_uint is used like size_t */
-#if !defined(LZO_UINT_MAX)
-#  if (UINT_MAX >= 0xffffffffL)
-     typedef unsigned int       lzo_uint;
-     typedef int                lzo_int;
-#    define LZO_UINT_MAX        UINT_MAX
-#  elif (ULONG_MAX >= 0xffffffffL)
-     typedef unsigned long      lzo_uint;
-     typedef long               lzo_int;
-#    define LZO_UINT_MAX        ULONG_MAX
-#  else
-#    error lzo_uint
-#  endif
-#endif
-
-
-/* Memory model that allows to access memory at offsets of lzo_uint.
- * `Huge' pointers (16 bit DOS/Windows) are somewhat slow, but they
- * work fine and I really don't care about 16 bit compiler
- * optimizations nowadays.
- */
-#if !defined(__LZO_MMODEL)
-#  if (LZO_UINT_MAX <= UINT_MAX)
-#    define __LZO_MMODEL
-#  elif defined(__LZO_DOS16) || defined(__LZO_WIN16)
-#    define __LZO_MMODEL        __huge
-#    define LZO_999_UNSUPPORTED
-#  elif defined(__LZO_TOS16)
-#    define __LZO_MMODEL
-#  else
-#    error __LZO_MMODEL
-#  endif
-#endif
-
-/* no typedef here because of const-pointer issues */
-#define lzo_byte                unsigned char __LZO_MMODEL
-#define lzo_bytep               unsigned char __LZO_MMODEL *
-#define lzo_voidp               void __LZO_MMODEL *
-#define lzo_shortp              short __LZO_MMODEL *
-#define lzo_ushortp             unsigned short __LZO_MMODEL *
-#define lzo_uint32p             lzo_uint32 __LZO_MMODEL *
-#define lzo_int32p              lzo_int32 __LZO_MMODEL *
-#define lzo_uintp               lzo_uint __LZO_MMODEL *
-#define lzo_intp                lzo_int __LZO_MMODEL *
-#define lzo_voidpp              lzo_voidp __LZO_MMODEL *
-#define lzo_bytepp              lzo_bytep __LZO_MMODEL *
-#define lzo_charp               char __LZO_MMODEL *
-
-/* improve code readability */
-typedef int lzo_bool;
-
-
-/***********************************************************************
-// function types
-************************************************************************/
-
-/* linkage */
-#if !defined(__LZO_EXTERN_C)
-#  ifdef __cplusplus
-#    define __LZO_EXTERN_C      extern "C"
-#  else
-#    define __LZO_EXTERN_C      extern
-#  endif
-#endif
-
-/* calling conventions */
-#if !defined(__LZO_ENTRY)
-#  if defined(__LZO_DOS16) || defined(__LZO_WIN16)
-#    define __LZO_ENTRY         __far __cdecl
-#  elif defined(__LZO_i386) && defined(_MSC_VER)
-#    define __LZO_ENTRY         __cdecl
-#  elif defined(__LZO_i386) && defined(__WATCOMC__)
-#    define __LZO_ENTRY         __near __cdecl
-#  else
-#    define __LZO_ENTRY
-#  endif
-#endif
-
-/* DLL export information */
-#if !defined(__LZO_EXPORT1)
-#  define __LZO_EXPORT1
-#endif
-#if !defined(__LZO_EXPORT2)
-#  define __LZO_EXPORT2
-#endif
-
-#if !defined(LZO_PUBLIC)
-#  define LZO_PUBLIC(_rettype)  __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_ENTRY
-#endif
-#if !defined(LZO_EXTERN)
-#  define LZO_EXTERN(_rettype)  __LZO_EXTERN_C LZO_PUBLIC(_rettype)
-#endif
-#if !defined(LZO_PRIVATE)
-#  define LZO_PRIVATE(_rettype) static _rettype __LZO_ENTRY
-#endif
-
-
-typedef int
-(__LZO_ENTRY *lzo_compress_t)   ( const lzo_byte *src, lzo_uint  src_len,
-                                        lzo_byte *dst, lzo_uint *dst_len,
-                                        lzo_voidp wrkmem );
-
-typedef int
-(__LZO_ENTRY *lzo_decompress_t) ( const lzo_byte *src, lzo_uint  src_len,
-                                        lzo_byte *dst, lzo_uint *dst_len,
-                                        lzo_voidp wrkmem );
-
-typedef int
-(__LZO_ENTRY *lzo_optimize_t)   (       lzo_byte *src, lzo_uint  src_len,
-                                        lzo_byte *dst, lzo_uint *dst_len,
-                                        lzo_voidp wrkmem );
-
-
-/* a progress indicator callback function */
-typedef void
-(__LZO_ENTRY *lzo_progress_callback_t)(lzo_uint,lzo_uint);
-
-
-/***********************************************************************
-// error codes and prototypes
-************************************************************************/
-
-/* Error codes for the compression/decompression functions. Negative
- * values are errors, positive values will be used for special but
- * normal events.
- */
-#define LZO_E_OK                    0
-#define LZO_E_ERROR                 (-1)
-#define LZO_E_OUT_OF_MEMORY         (-2)    /* not used right now */
-#define LZO_E_NOT_COMPRESSIBLE      (-3)    /* not used right now */
-#define LZO_E_INPUT_OVERRUN         (-4)
-#define LZO_E_OUTPUT_OVERRUN        (-5)
-#define LZO_E_LOOKBEHIND_OVERRUN    (-6)
-#define LZO_E_EOF_NOT_FOUND         (-7)
-#define LZO_E_INPUT_NOT_CONSUMED    (-8)
-
-
-/* lzo_init() should be the first function you call.
- * Check the return code !
- *
- * lzo_init() is a macro to allow checking that the library and the
- * compiler's view of various types are consistent.
- */
-#define lzo_init() __lzo_init(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\
-    (int)sizeof(long),(int)sizeof(lzo_uint32),(int)sizeof(lzo_uint),\
-    (int)sizeof(lzo_voidp),(int)sizeof(lzo_compress_t))
-LZO_EXTERN(int) __lzo_init(unsigned,int,int,int,int,int,int,int);
-
-/* version functions (useful for shared libraries) */
-LZO_EXTERN(unsigned) lzo_version(void);
-LZO_EXTERN(const char *) lzo_version_string(void);
-LZO_EXTERN(const char *) lzo_version_date(void);
-LZO_EXTERN(const lzo_charp) _lzo_version_string(void);
-LZO_EXTERN(const lzo_charp) _lzo_version_date(void);
-
-/* string functions */
-LZO_EXTERN(int)
-lzo_memcmp(const lzo_voidp _s1, const lzo_voidp _s2, lzo_uint _len);
-LZO_EXTERN(lzo_voidp)
-lzo_memcpy(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
-LZO_EXTERN(lzo_voidp)
-lzo_memmove(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
-LZO_EXTERN(lzo_voidp)
-lzo_memset(lzo_voidp _s, int _c, lzo_uint _len);
-
-/* checksum functions */
-LZO_EXTERN(lzo_uint32)
-lzo_adler32(lzo_uint32 _adler, const lzo_byte *_buf, lzo_uint _len);
-LZO_EXTERN(lzo_uint32)
-lzo_crc32(lzo_uint32 _c, const lzo_byte *_buf, lzo_uint _len);
-
-/* misc. */
-LZO_EXTERN(lzo_bool) lzo_assert(int _expr);
-LZO_EXTERN(int) _lzo_config_check(void);
-
-/* align a char pointer on a boundary that is a multiple of `size' */
-LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp _ptr, lzo_uint _size);
-#define LZO_ALIGN(_ptr,_size) \
-    ((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size)))
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* already included */
-
diff --git a/lib/win32/liblzo/lzo.lib b/lib/win32/liblzo/lzo.lib
deleted file mode 100755
index 6536dea857..0000000000
--- a/lib/win32/liblzo/lzo.lib
+++ /dev/null