Merge pull request #7989 from sergiobenrocha2/master

Fix atlas/zimtool build.
This commit is contained in:
Henrik Rydgård 2015-09-21 21:18:09 +02:00
commit f225a64408
3 changed files with 3 additions and 6 deletions

View File

@ -1,8 +1,7 @@
set(SRCS
chunk_file.cpp
zip_read.cpp
file_util.cpp
dialog.cpp)
file_util.cpp)
set(SRCS ${SRCS})

View File

@ -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)

View File

@ -1,5 +1,4 @@
set(SRCS
bits/bits.cpp
hash/hash.cpp
text/utf8.cpp
)