ALL: update tools

Author: aquadran

.gitignore

@@ -3,6 +3,24 @@
 *.o
 *.exe
 
+animb2txt
+bmtoppm
+cosb2cos
+delua
+imc2wav
+int2flt
+labcopy
+meshb2obj
+mklab
+set2fig
+setb2set
+sklb2txt
+til2bmp
+unlab
+vima
+luac
+patchex
+
 .deps
 /config.h
 /config.log

AUTHORS

@@ -77,3 +77,6 @@ Special thanks to
    Bret Mogilefsky, for managing to create a SPUTM-style 3D LUA engine, and
    avoiding the horrible hack it could have been.
 
+   Benjamin Haisch, for emimeshviewer, which our EMI code borrows heavily
+   from. 
+

Makefile

@@ -7,7 +7,7 @@ srcdir      ?= .
 
 DEFINES     := -DHAVE_CONFIG_H
 LDFLAGS     :=
-INCLUDES    := -I. -I$(srcdir)
+INCLUDES    := -I. -I$(srcdir) -I$(srcdir)/engines
 LIBS        :=
 OBJS        :=
 DEPDIR      := .deps

base/internal_version.h

@@ -0,0 +1,19 @@
+#ifndef INCLUDED_FROM_BASE_VERSION_CPP
+#error This file may only be included by base/version.cpp
+#endif
+
+// Reads revision number from file
+// (this is used when building with Visual Studio)
+#ifdef SCUMMVM_INTERNAL_REVISION
+#include "internal_revision.h"
+#endif
+
+#ifdef RELEASE_BUILD
+#undef SCUMMVM_REVISION
+#endif
+
+#ifndef SCUMMVM_REVISION
+#define SCUMMVM_REVISION
+#endif
+
+#define SCUMMVM_VERSION "git" SCUMMVM_REVISION

common/endian.h

@@ -146,51 +146,57 @@
  */
 #define MKTAG(a0,a1,a2,a3) ((uint32)((a3) | ((a2) << 8) | ((a1) << 16) | ((a0) << 24)))
 
-// Functions for reading/writing native Integers,
-// this transparently handles the need for alignment
-
-#if !defined(SCUMM_NEED_ALIGNMENT)
+// Functions for reading/writing native integers.
+// They also transparently handle the need for alignment.
+
+// Test for GCC >= 4.0. These implementations will automatically use
+// CPU-specific instructions for unaligned data when they are available (eg.
+// MIPS). See also this email thread on scummvm-devel for details:
+// <http://thread.gmane.org/gmane.games.devel.scummvm/8063>
+//
+// Moreover, we activate this code for GCC >= 3.3 but *only* if unaligned access
+// is allowed.
+#if defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3 && !defined(SCUMM_NEED_ALIGNMENT)))
 
 	FORCEINLINE uint16 READ_UINT16(const void *ptr) {
-		return *(const uint16 *)(ptr);
+		struct Unaligned16 { uint16 val; } __attribute__ ((__packed__, __may_alias__));
+		return ((const Unaligned16 *)ptr)->val;
 	}
 
 	FORCEINLINE uint32 READ_UINT32(const void *ptr) {
-		return *(const uint32 *)(ptr);
+		struct Unaligned32 { uint32 val; } __attribute__ ((__packed__, __may_alias__));
+		return ((const Unaligned32 *)ptr)->val;
 	}
 
 	FORCEINLINE void WRITE_UINT16(void *ptr, uint16 value) {
-		*(uint16 *)(ptr) = value;
+		struct Unaligned16 { uint16 val; } __attribute__ ((__packed__, __may_alias__));
+		((Unaligned16 *)ptr)->val = value;
 	}
 
 	FORCEINLINE void WRITE_UINT32(void *ptr, uint32 value) {
-		*(uint32 *)(ptr) = value;
+		struct Unaligned32 { uint32 val; } __attribute__ ((__packed__, __may_alias__));
+		((Unaligned32 *)ptr)->val = value;
 	}
 
-// test for GCC >= 4.0. these implementations will automatically use CPU-specific
-// instructions for unaligned data when they are available (eg. MIPS)
-#elif defined(__GNUC__) && (__GNUC__ >= 4)
+#elif !defined(SCUMM_NEED_ALIGNMENT)
 
 	FORCEINLINE uint16 READ_UINT16(const void *ptr) {
-		struct Unaligned16 { uint16 val; } __attribute__ ((__packed__, __may_alias__));
-		return ((const Unaligned16 *)ptr)->val;
+		return *(const uint16 *)(ptr);
 	}
 
 	FORCEINLINE uint32 READ_UINT32(const void *ptr) {
-		struct Unaligned32 { uint32 val; } __attribute__ ((__packed__, __may_alias__));
-		return ((const Unaligned32 *)ptr)->val;
+		return *(const uint32 *)(ptr);
 	}
 
 	FORCEINLINE void WRITE_UINT16(void *ptr, uint16 value) {
-		struct Unaligned16 { uint16 val; } __attribute__ ((__packed__, __may_alias__));
-		((Unaligned16 *)ptr)->val = value;
+		*(uint16 *)(ptr) = value;
 	}
 
 	FORCEINLINE void WRITE_UINT32(void *ptr, uint32 value) {
-		struct Unaligned32 { uint32 val; } __attribute__ ((__packed__, __may_alias__));
-		((Unaligned32 *)ptr)->val = value;
+		*(uint32 *)(ptr) = value;
 	}
 
+
 // use software fallback by loading each byte explicitely
 #else
 
@@ -390,6 +396,7 @@ inline uint32 READ_BE_UINT24(const void *ptr) {
 	return (b[0] << 16) | (b[1] << 8) | (b[2]);
 }
 
+// ResidualVM specific:
 #if defined(SCUMM_BIG_ENDIAN)
 
 inline float get_float(const char *data) {