aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorFneufneu <mickael.maillot@gmail.com>2012-05-10 03:18:51 -0700
committerFneufneu <mickael.maillot@gmail.com>2012-05-10 03:18:51 -0700
commitdaf3b4082ce42e2d061f19f0d90707f2f8e08d7a (patch)
tree8524ccb54cd635b196648704bab4dca3d3b25fa8 /tools
parent051b9a94ee89d68a27c1244c424334b373398dc1 (diff)
parenta7c35bcca2c74e2de879243835852cb546fb1b7d (diff)
Merge pull request #37 from Fneufneu/freebsd
add FreeBSD support
Diffstat (limited to 'tools')
-rw-r--r--tools/TexturePacker/XBTFWriter.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/TexturePacker/XBTFWriter.cpp b/tools/TexturePacker/XBTFWriter.cpp
index 78b47fe810..7999a7e83f 100644
--- a/tools/TexturePacker/XBTFWriter.cpp
+++ b/tools/TexturePacker/XBTFWriter.cpp
@@ -24,7 +24,9 @@
#include <inttypes.h>
#include "guilib/XBTF.h"
#include "utils/EndianSwap.h"
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
+#if defined(__FreeBSD__)
+#include <stdlib.h>
+#elif !defined(__APPLE__)
#include <malloc.h>
#endif
#include <memory.h>