diff --git a/CMakeLists.txt b/CMakeLists.txt index 8078b8db9e..a70dea2fa3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -313,7 +313,7 @@ add_library(snappy STATIC ) include_directories(ext/snappy) -add_library(rg_etc STATIC +add_library(rg_etc1 STATIC native/ext/rg_etc1/rg_etc1.cpp native/ext/rg_etc1/rg_etc1.h) include_directories(native/ext/rg_etc1) @@ -598,7 +598,7 @@ add_library(native STATIC include_directories(native) # rapidxml is headers only so we can't make a lib specific for it include_directories(native/ext/rapidxml) -target_link_libraries(native ${LIBZIP} rg_etc sha1 stb_image stb_vorbis #vjson +target_link_libraries(native ${LIBZIP} rg_etc1 sha1 stb_image stb_vorbis #vjson zlib snappy ${GLEW_LIBRARIES}) if(ANDROID) target_link_libraries(native log) diff --git a/native b/native index 4f5a60d82b..4ffc4f0415 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 4f5a60d82b38dbb609084782211a272b9e4e53fb +Subproject commit 4ffc4f0415c2b2efa79c900fa61da78d61411797