From 1c869e460736e558d291843d5761f9b6d24648f0 Mon Sep 17 00:00:00 2001
From: sergiobenrocha2 <sergiobenrocha2@gmail.com>
Date: Wed, 16 Sep 2015 01:32:23 -0300
Subject: [PATCH] png17 must be after image, no need of libzip here; fix
 freetype2 header.

---
 ext/native/tools/CMakeLists.txt | 8 ++------
 ext/native/tools/atlastool.cpp  | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ext/native/tools/CMakeLists.txt b/ext/native/tools/CMakeLists.txt
index f828fbe2a0..54d2d21650 100644
--- a/ext/native/tools/CMakeLists.txt
+++ b/ext/native/tools/CMakeLists.txt
@@ -27,12 +27,9 @@ include_directories(..)
 include_directories(../ext)
 include_directories(../math/lin)
 include_directories(../image)
-include_directories(../ext/libzip)
 include_directories(../ext/rg_etc1)
-include_directories(../ext/glew)
 include_directories(/usr/local/include)
 
-link_directories(/usr/X11R6/lib)
 link_directories(/opt/local/lib)
 
 # Horrible horrible hack
@@ -47,14 +44,13 @@ add_subdirectory(../file file)
 add_subdirectory(../image image)
 add_subdirectory(../math math)
 add_subdirectory(../util util)
-add_subdirectory(../ext/libzip libzip)
 add_subdirectory(../ext/rg_etc1 rg_etc1)
 add_subdirectory(../ext/stb_image stb_image)
 add_subdirectory(../ext/libpng17 png17)
 
 
 add_executable(atlastool atlastool.cpp)
-target_link_libraries(atlastool png17 freetype util image z stb_image rg_etc1 file zip base)
+target_link_libraries(atlastool freetype util image png17 z stb_image rg_etc1 file base)
 
 add_executable(zimtool zimtool.cpp)
-target_link_libraries(zimtool png17 freetype image z stb_image rg_etc1 file zip base)
+target_link_libraries(zimtool freetype image png17 z stb_image rg_etc1 file base)
diff --git a/ext/native/tools/atlastool.cpp b/ext/native/tools/atlastool.cpp
index c23424174d..e5341fd3be 100644
--- a/ext/native/tools/atlastool.cpp
+++ b/ext/native/tools/atlastool.cpp
@@ -18,7 +18,7 @@
 // Hackery for our broken path structure
 #include <ftbitmap.h>
 #else
-#include <freetype/ftbitmap.h>
+#include <freetype2/ftbitmap.h>
 #endif
 #include <set>
 #include <map>