From d86d6ba9fbf7263ba0c652d5c7f4f919e8cba485 Mon Sep 17 00:00:00 2001
From: davilla <davilla@4pi.com>
Date: Wed, 5 Jun 2013 10:41:46 -0400
Subject: fix build after 7b65508685ef7a6f3c16e9b341b2b71fafaa46b2,
 TexturePacker converted to use TARGET_xxx

---
 tools/TexturePacker/MakeDDS.cpp    |  2 +-
 tools/TexturePacker/Makefile.in    |  2 +-
 tools/TexturePacker/XBMCTex.cpp    |  8 ++++----
 tools/TexturePacker/XBTFWriter.cpp |  4 ++--
 tools/TexturePacker/cmdlineargs.h  | 10 +++++-----
 tools/TexturePacker/xwinapi.cpp    |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'tools')

diff --git a/tools/TexturePacker/MakeDDS.cpp b/tools/TexturePacker/MakeDDS.cpp
index 25e251edd9..921ed55d55 100644
--- a/tools/TexturePacker/MakeDDS.cpp
+++ b/tools/TexturePacker/MakeDDS.cpp
@@ -25,7 +25,7 @@
 #include <SDL/SDL.h>
 #include <SDL/SDL_image.h>
 #include "cmdlineargs.h"
-#ifdef _WIN32
+#ifdef TARGET_WINDOWS
 #define strncasecmp strnicmp
 #endif
 #include "DDSImage.h"
diff --git a/tools/TexturePacker/Makefile.in b/tools/TexturePacker/Makefile.in
index 2661972131..71e3d4acef 100644
--- a/tools/TexturePacker/Makefile.in
+++ b/tools/TexturePacker/Makefile.in
@@ -1,4 +1,4 @@
-DEFINES += -D_LINUX -DUSE_LZO_PACKING
+DEFINES += -DTARGET_POSIX -DUSE_LZO_PACKING
 ifneq ($(or $(findstring powerpc,@ARCH@),$(findstring ppc, @ARCH@)),)
 DEFINES += -DHOST_BIGENDIAN
 endif
diff --git a/tools/TexturePacker/XBMCTex.cpp b/tools/TexturePacker/XBMCTex.cpp
index 3354a204e5..0d99d7f125 100644
--- a/tools/TexturePacker/XBMCTex.cpp
+++ b/tools/TexturePacker/XBMCTex.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#ifdef _WIN32
+#ifdef TARGET_WINDOWS
 #include <sys/types.h>
 #include <sys/stat.h>
 #define __STDC_FORMAT_MACROS
@@ -42,12 +42,12 @@
 #include "cmdlineargs.h"
 #include "libsquish/squish.h"
 
-#ifdef _WIN32
+#ifdef TARGET_WINDOWS
 #define strncasecmp strnicmp
 #endif
 
 #ifdef USE_LZO_PACKING
-#ifdef _WIN32
+#ifdef TARGET_WINDOWS
 #include "../../lib/win32/liblzo/LZO1X.H"
 #else
 #include <lzo/lzo1x.h>
@@ -576,7 +576,7 @@ int main(int argc, char* argv[])
     {
       OutputFilename = args[++i];
       valid = true;
-#ifdef _LINUX
+#ifdef TARGET_POSIX
       char *c = NULL;
       while ((c = (char *)strchr(OutputFilename.c_str(), '\\')) != NULL) *c = '/';
 #endif
diff --git a/tools/TexturePacker/XBTFWriter.cpp b/tools/TexturePacker/XBTFWriter.cpp
index 89efeb9f6f..5e0e5f47b6 100644
--- a/tools/TexturePacker/XBTFWriter.cpp
+++ b/tools/TexturePacker/XBTFWriter.cpp
@@ -24,9 +24,9 @@
 #include <inttypes.h>
 #include "guilib/XBTF.h"
 #include "utils/EndianSwap.h"
-#if defined(__FreeBSD__)
+#if defined(TARGET_FREEBSD)
 #include <stdlib.h>
-#elif !defined(__APPLE__)
+#elif !defined(TARGET_DARWIN)
 #include <malloc.h>
 #endif
 #include <memory.h>
diff --git a/tools/TexturePacker/cmdlineargs.h b/tools/TexturePacker/cmdlineargs.h
index d2631cb944..912e28a7a5 100644
--- a/tools/TexturePacker/cmdlineargs.h
+++ b/tools/TexturePacker/cmdlineargs.h
@@ -22,7 +22,7 @@
  *
  */
 
-#ifdef _LINUX
+#ifdef TARGET_POSIX
 #include "PlatformDefs.h"
 #include "xwinapi.h"
 typedef LPSTR PSZ;
@@ -47,7 +47,7 @@ public:
             strcpy (m_cmdline, cmdline);
             ParseCmdLine(); 
         } else {
-#ifdef _LINUX
+#ifdef TARGET_POSIX
           delete[] cmdline;
 #endif
         }
@@ -56,7 +56,7 @@ public:
     CmdLineArgs (const int argc, const char **argv)
     {
       std::string cmdline;
-#ifdef _LINUX
+#ifdef TARGET_POSIX
       cmdline = "\"";
 #endif
       for (int i = 0 ; i<argc ; i++)
@@ -64,14 +64,14 @@ public:
         cmdline += std::string(argv[i]);
         if ( i != (argc-1) )
         {
-#ifdef _LINUX
+#ifdef TARGET_POSIX
           cmdline += "\" \"";
 #else
           cmdline += " ";
 #endif
         }
       }
-#ifdef _LINUX
+#ifdef TARGET_POSIX
       cmdline += "\"";
 #endif
       m_cmdline = new char [cmdline.length() + 1];
diff --git a/tools/TexturePacker/xwinapi.cpp b/tools/TexturePacker/xwinapi.cpp
index 2d2c0eac03..25857539c6 100644
--- a/tools/TexturePacker/xwinapi.cpp
+++ b/tools/TexturePacker/xwinapi.cpp
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <errno.h>
 #include "xwinapi.h"
-#ifdef __APPLE__
+#ifdef TARGET_DARWIN
 #include "OSXGNUReplacements.h"
 #endif
 
-- 
cgit v1.2.3