piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 13:57:57 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6174 from gwicks/android-ndkupdate

Browse Source 
Android: Fix build on NDK r16b2
This commit is contained in:
JosJuice 2017-11-07 17:31:44 +01:00 committed by GitHub
commit 9e251206b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -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")

2
Source/Core/Common/Compat/optional
View File

@ -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.

2
Source/Core/Common/Compat/variant
View File

@ -4,7 +4,7 @@
#pragma once
#if __has_include_next(<variant>)
#if __cplusplus >= 201703L && __has_include_next(<variant>)
#include_next <variant>
#else
// MPark.Variant