From 035dd284b70429c7a59237c1e6debc1663bd7e15 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Fri, 15 Dec 2017 21:23:06 -0800 Subject: CMake: enabling Android build --- Common/CMakeLists.txt | 2 +- Common/include/InterfaceID.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'Common') diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt index 070a2793..6179dc43 100644 --- a/Common/CMakeLists.txt +++ b/Common/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.10) +cmake_minimum_required (VERSION 3.6) project(Common CXX) diff --git a/Common/include/InterfaceID.h b/Common/include/InterfaceID.h index d24f0b75..ff60d168 100644 --- a/Common/include/InterfaceID.h +++ b/Common/include/InterfaceID.h @@ -23,6 +23,7 @@ #pragma once +#include #include "BasicTypes.h" /// Unique identification structures @@ -41,7 +42,7 @@ namespace Diligent return Data1 == rhs.Data1 && Data2 == rhs.Data2 && Data3 == rhs.Data3 && - memcmp(Data4, rhs.Data4, sizeof(Data4)) == 0; + std::memcmp(Data4, rhs.Data4, sizeof(Data4)) == 0; } }; -- cgit v1.2.3