diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 4b2ef2255f..62bf4979b2 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(SRCS
   colorutil.cpp
   timeutil.cpp
-  threadutil.cpp
+  ../thread/threadutil.cpp
   error_context.cpp
   display.cpp
   buffer.cpp)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 4d7d8b2b1a..7298259c2b 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -9,13 +9,14 @@ add_definitions(-DSDL)
 add_definitions(-Wno-multichar)
 add_definitions(-fno-strict-aliasing)
 add_definitions(-fopenmp)
+add_definitions(-std=c++11)
 # add_definitions(-fstrict-aliasing)
 
 include_directories(..)
 include_directories(../math/lin)
 include_directories(../image)
 include_directories(../ext/libzip)
-include_directories(../ext/etcpack)
+include_directories(../ext/rg_etc1)
 include_directories(/usr/local/include)
 include_directories(${PNG_INCLUDE_DIR})
 
@@ -33,12 +34,12 @@ 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/rg_etc1 rg_etc1)
 add_subdirectory(../ext/stb_image stb_image)
 
 
 add_executable(atlastool atlastool.cpp)
-target_link_libraries(atlastool ${PNG_LIBRARY} freetype z image stb_image etcpack etcdec file zip gomp)
+target_link_libraries(atlastool ${PNG_LIBRARY} freetype z image stb_image rg_etc1 file zip gomp)
 
 add_executable(zimtool zimtool.cpp)
-target_link_libraries(zimtool ${PNG_LIBRARY} freetype z image stb_image etcpack etcdec file zip gomp)
+target_link_libraries(zimtool ${PNG_LIBRARY} freetype z image stb_image rg_etc1 file zip gomp)