From 0a8acae315d87d25ead2e335f4933126965402ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 24 Apr 2013 17:07:13 +0200 Subject: [PATCH 1/3] First attempt at fixing native/tools build --- base/CMakeLists.txt | 2 +- tools/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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..03523a7cb3 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -15,7 +15,7 @@ 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 +33,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 etcdec 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 etcdec file zip gomp) From 79bee5ac451014c1303196cc2045ee638114abb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 25 Apr 2013 12:47:21 +0200 Subject: [PATCH 2/3] Force std=c++11 --- tools/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 03523a7cb3..4545a64e46 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -9,6 +9,7 @@ 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(..) From 09495fb2a5a570209fba09b061d89fca1919cbd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 25 Apr 2013 12:58:55 +0200 Subject: [PATCH 3/3] Remove non-existent etcdec --- tools/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 4545a64e46..7298259c2b 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -39,7 +39,7 @@ add_subdirectory(../ext/stb_image stb_image) add_executable(atlastool atlastool.cpp) -target_link_libraries(atlastool ${PNG_LIBRARY} freetype z image stb_image rg_etc1 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 rg_etc1 etcdec file zip gomp) +target_link_libraries(zimtool ${PNG_LIBRARY} freetype z image stb_image rg_etc1 file zip gomp)