From 282e61c085563fd58f3430a66bc7eb634e587f69 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Mon, 21 May 2018 13:43:24 -0700
Subject: [PATCH] patch etc2comp for mac

---
 cmake/externals/etc2comp/CMakeLists.txt | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/cmake/externals/etc2comp/CMakeLists.txt b/cmake/externals/etc2comp/CMakeLists.txt
index 1de4932380..d6d21d6703 100644
--- a/cmake/externals/etc2comp/CMakeLists.txt
+++ b/cmake/externals/etc2comp/CMakeLists.txt
@@ -4,14 +4,20 @@ if (ANDROID)
   set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
 endif ()
 
+if (APPLE)
+  set(EXTRA_CMAKE_FLAGS -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DCMAKE_EXE_LINKER_FLAGS=-stdlib=libc++)
+endif ()
+
 include(ExternalProject)
 # We use a patched version of etc2comp that properly generates all the necessary mips
 # See https://github.com/google/etc2comp/pull/29
+# We also use part of https://github.com/google/etc2comp/pull/1, which fixes a bug
+# that would override CMAKE_CXX_FLAGS
 ExternalProject_Add(
   ${EXTERNAL_NAME}
   URL https://hifi-public.s3.amazonaws.com/dependencies/etc2comp-patched.zip
-  URL_MD5 6fe3629de8ff99bc99f8c14558d841a3
-  CMAKE_ARGS ${ANDROID_CMAKE_ARGS}
+  URL_MD5 4c96153eb179acbe619e3d99d3330595
+  CMAKE_ARGS ${ANDROID_CMAKE_ARGS} ${EXTRA_CMAKE_FLAGS}
   BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
   INSTALL_COMMAND ""
   LOG_DOWNLOAD 1
@@ -36,6 +42,9 @@ if (WIN32)
   set(_LIB_FOLDER "${_LIB_FOLDER}$<$<OR:$<CONFIG:Release>,$<CONFIG:Debug>>:build/EtcLib/Release>")
 
   set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/${_LIB_FOLDER}/EtcLib.lib CACHE FILEPATH "Path to Etc2Comp release library")
+elseif (APPLE)
+    set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/build/EtcLib/Debug/libEtcLib.a CACHE FILEPATH "Path to EtcLib debug library")
+    set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/build/EtcLib/Release/libEtcLib.a CACHE FILEPATH "Path to EtcLib release library")
 else ()
   set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG "" CACHE FILEPATH "Path to EtcLib debug library")
   set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/build/EtcLib/libEtcLib.a CACHE FILEPATH "Path to EtcLib release library")