From 662d5fc9dafef00cbbf2eb4d55d44f5037d27960 Mon Sep 17 00:00:00 2001 From: sergiobenrocha2 Date: Mon, 21 Sep 2015 12:46:42 -0300 Subject: [PATCH] Fix atlas/zimtool build. --- ext/native/file/CMakeLists.txt | 3 +-- ext/native/tools/CMakeLists.txt | 5 ++--- ext/native/util/CMakeLists.txt | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ext/native/file/CMakeLists.txt b/ext/native/file/CMakeLists.txt index 26be767209..047f14655b 100644 --- a/ext/native/file/CMakeLists.txt +++ b/ext/native/file/CMakeLists.txt @@ -1,8 +1,7 @@ set(SRCS chunk_file.cpp zip_read.cpp - file_util.cpp - dialog.cpp) + file_util.cpp) set(SRCS ${SRCS}) diff --git a/ext/native/tools/CMakeLists.txt b/ext/native/tools/CMakeLists.txt index 54d2d21650..bd9365f37a 100644 --- a/ext/native/tools/CMakeLists.txt +++ b/ext/native/tools/CMakeLists.txt @@ -45,12 +45,11 @@ add_subdirectory(../image image) add_subdirectory(../math math) add_subdirectory(../util util) 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 freetype util image png17 z stb_image rg_etc1 file base) +target_link_libraries(atlastool freetype util image png17 z rg_etc1 file base) add_executable(zimtool zimtool.cpp) -target_link_libraries(zimtool freetype image png17 z stb_image rg_etc1 file base) +target_link_libraries(zimtool freetype image png17 z rg_etc1 file base) diff --git a/ext/native/util/CMakeLists.txt b/ext/native/util/CMakeLists.txt index dbbd5bc430..dc29a9b726 100644 --- a/ext/native/util/CMakeLists.txt +++ b/ext/native/util/CMakeLists.txt @@ -1,5 +1,4 @@ set(SRCS - bits/bits.cpp hash/hash.cpp text/utf8.cpp )