diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2017-12-16 05:23:06 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2017-12-16 05:23:06 +0000 |
| commit | 035dd284b70429c7a59237c1e6debc1663bd7e15 (patch) | |
| tree | b2d50e6c0141bfb8c403010831036799ac657411 /Common | |
| parent | Updated CMakeLists (diff) | |
| download | DiligentCore-035dd284b70429c7a59237c1e6debc1663bd7e15.tar.gz DiligentCore-035dd284b70429c7a59237c1e6debc1663bd7e15.zip | |
CMake: enabling Android build
Diffstat (limited to 'Common')
| -rw-r--r-- | Common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Common/include/InterfaceID.h | 3 |
2 files changed, 3 insertions, 2 deletions
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 <cstring> #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; } }; |