Merge pull request #6174 from gwicks/android-ndkupdate

Android: Fix build on NDK r16b2
dolphin-emu · Nov 7, 2017 · 9e25120 · 9e25120
2 parents 835eff1 + c2dcb97
commit 9e25120
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -709,10 +709,12 @@ else()
   include_directories(Externals/SOIL)
 endif()
 
-find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
-find_path(ICONV_INCLUDE_DIR NAMES iconv.h)
+if (NOT ANDROID)
+	find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
+	find_path(ICONV_INCLUDE_DIR NAMES iconv.h)
+endif()
 
-if (ICONV_LIBRARIES AND ICONV_INCLUDE_DIR)
+if (NOT ANDROID AND ICONV_LIBRARIES AND ICONV_INCLUDE_DIR)
   mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIBRARIES)
 else()
   message(STATUS "Using static iconv from Externals")

diff --git a/Source/Core/Common/Compat/optional b/Source/Core/Common/Compat/optional
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#if __has_include_next(<optional>)
+#if __cplusplus >= 201703L && __has_include_next(<optional>)
 #include_next <optional>
 #else
 /* Copyright 2017 The TensorFlow Authors. All Rights Reserved.

diff --git a/Source/Core/Common/Compat/variant b/Source/Core/Common/Compat/variant
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#if __has_include_next(<variant>)
+#if __cplusplus >= 201703L && __has_include_next(<variant>)
 #include_next <variant>
 #else
 // MPark.Variant