From ef01fc2121764216ee63da5fb73c22105cc5232a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sun, 28 Oct 2012 11:47:26 +0100
Subject: [PATCH] Buildfix, bugfix

---
 file/file_util.cpp   |  5 +++++
 tools/CMakeLists.txt | 33 +++++++++++++++------------------
 tools/b.sh           |  0
 3 files changed, 20 insertions(+), 18 deletions(-)
 mode change 100644 => 100755 tools/b.sh

diff --git a/file/file_util.cpp b/file/file_util.cpp
index bfaf401775..3331b55e28 100644
--- a/file/file_util.cpp
+++ b/file/file_util.cpp
@@ -187,5 +187,10 @@ std::string getDir(const std::string &path)
   {  
     if (cutpath[i] == '\\') cutpath[i] = '/';
   }
+#ifndef _WIN32
+	if (!cutpath.size()) {
+		return "/";
+	}
+#endif
   return cutpath;
 }
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 4eb2cedcca..4d7d8b2b1a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -3,9 +3,6 @@ cmake_minimum_required(VERSION 2.6)
 project (Tools)
 find_package(PNG REQUIRED)
 
-
-
-add_definitions(-g)
 add_definitions(-O2)
 add_definitions(-Wall)
 add_definitions(-DSDL)
@@ -14,12 +11,11 @@ add_definitions(-fno-strict-aliasing)
 add_definitions(-fopenmp)
 # add_definitions(-fstrict-aliasing)
 
-include_directories(../native)
-include_directories(../native/base)
-include_directories(../native/math/lin)
-include_directories(../native/image)
-include_directories(../native/ext/libzip)
-include_directories(../native/ext/etcpack)
+include_directories(..)
+include_directories(../math/lin)
+include_directories(../image)
+include_directories(../ext/libzip)
+include_directories(../ext/etcpack)
 include_directories(/usr/local/include)
 include_directories(${PNG_INCLUDE_DIR})
 
@@ -31,17 +27,18 @@ include_directories(/usr/include/freetype2)
 include_directories(/usr/local/include/freetype2)
 include_directories(/opt/local/include/freetype2)
 
-add_subdirectory(../native/base base)
-add_subdirectory(../native/gfx gfx)
-add_subdirectory(../native/file file)
-add_subdirectory(../native/image image)
-add_subdirectory(../native/math math)
-add_subdirectory(../native/ext/libzip libzip)
-add_subdirectory(../native/ext/etcpack etcpack)
+add_subdirectory(../base base)
+add_subdirectory(../gfx gfx)
+add_subdirectory(../file file)
+add_subdirectory(../image image)
+add_subdirectory(../math math)
+add_subdirectory(../ext/libzip libzip)
+add_subdirectory(../ext/etcpack etcpack)
+add_subdirectory(../ext/stb_image stb_image)
 
 
 add_executable(atlastool atlastool.cpp)
-target_link_libraries(atlastool ${PNG_LIBRARY} freetype z image etcpack etcdec file zip gomp)
+target_link_libraries(atlastool ${PNG_LIBRARY} freetype z image stb_image etcpack etcdec file zip gomp)
 
 add_executable(zimtool zimtool.cpp)
-target_link_libraries(zimtool ${PNG_LIBRARY} freetype z image etcpack etcdec file zip gomp)
+target_link_libraries(zimtool ${PNG_LIBRARY} freetype z image stb_image etcpack etcdec file zip gomp)
diff --git a/tools/b.sh b/tools/b.sh
old mode 100644
new mode 100755