From: Chris Forbes <chrisforbes@google.com>
Date: Thu, 6 Dec 2018 21:25:59 +0000 (-0800)
Subject: Fix the CMake build
X-Git-Tag: android-x86-9.0-r1~485
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f8374cf0e75c0b44782ce903622a9fed1a1d709e;p=android-x86%2Fexternal-swiftshader.git

Fix the CMake build

One part of this might change -- master contains some uses of
std::make_unique which Alexis might get rid of.

Change-Id: I40ae17f4e88920c4d60b79e1d4b117a7800fcd82
Reviewed-on: https://swiftshader-review.googlesource.com/c/23028
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Chris Forbes <chrisforbes@google.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0068ffb81..088be060d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,7 +198,7 @@ if(MSVC)
     set_cpp_flag("/MP")
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 else()
-    set_cpp_flag("--std=c++11")
+    set_cpp_flag("--std=c++14")
     set_cpp_flag("-Wall")
     set_cpp_flag("-Werror=reorder")
     set_cpp_flag("-Werror=sign-compare")
@@ -1935,6 +1935,8 @@ file(GLOB_RECURSE EGL_LIST
     ${OPENGL_DIR}/common/Object.hpp
     ${OPENGL_DIR}/common/debug.cpp
     ${OPENGL_DIR}/common/debug.h
+    ${SOURCE_DIR}/Common/SharedLibrary.cpp
+    ${SOURCE_DIR}/Common/SharedLibrary.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h
 )
 
@@ -1945,6 +1947,8 @@ file(GLOB_RECURSE GLES2_LIST
     ${OPENGL_DIR}/common/*.cpp
     ${OPENGL_DIR}/common/*.h
     ${OPENGL_DIR}/common/*.hpp
+    ${SOURCE_DIR}/Common/SharedLibrary.cpp
+    ${SOURCE_DIR}/Common/SharedLibrary.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/KHR/*.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/GLES2/*.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/GLES3/*.h
@@ -1957,6 +1961,8 @@ file(GLOB_RECURSE GLES_CM_LIST
     ${OPENGL_DIR}/common/*.cpp
     ${OPENGL_DIR}/common/*.h
     ${OPENGL_DIR}/common/*.hpp
+    ${SOURCE_DIR}/Common/SharedLibrary.cpp
+    ${SOURCE_DIR}/Common/SharedLibrary.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/include/KHR/*.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/GLES/*.h
 )
diff --git a/src/Vulkan/VkCommandBuffer.cpp b/src/Vulkan/VkCommandBuffer.cpp
index 45f9199dc..dbcb38643 100644
--- a/src/Vulkan/VkCommandBuffer.cpp
+++ b/src/Vulkan/VkCommandBuffer.cpp
@@ -14,6 +14,8 @@
 
 #include "VkCommandBuffer.hpp"
 
+#include <cstring>
+
 namespace vk
 {
 
@@ -524,4 +526,4 @@ void CommandBuffer::submit()
 	state = EXECUTABLE;
 }
 
-} // namespace vk
\ No newline at end of file
+} // namespace vk