Commit f8374cf0 by Chris Forbes

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/23028Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Tested-by: 's avatarChris Forbes <chrisforbes@google.com>
parent 0ab9f3be
...@@ -198,7 +198,7 @@ if(MSVC) ...@@ -198,7 +198,7 @@ if(MSVC)
set_cpp_flag("/MP") set_cpp_flag("/MP")
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
else() else()
set_cpp_flag("--std=c++11") set_cpp_flag("--std=c++14")
set_cpp_flag("-Wall") set_cpp_flag("-Wall")
set_cpp_flag("-Werror=reorder") set_cpp_flag("-Werror=reorder")
set_cpp_flag("-Werror=sign-compare") set_cpp_flag("-Werror=sign-compare")
...@@ -1935,6 +1935,8 @@ file(GLOB_RECURSE EGL_LIST ...@@ -1935,6 +1935,8 @@ file(GLOB_RECURSE EGL_LIST
${OPENGL_DIR}/common/Object.hpp ${OPENGL_DIR}/common/Object.hpp
${OPENGL_DIR}/common/debug.cpp ${OPENGL_DIR}/common/debug.cpp
${OPENGL_DIR}/common/debug.h ${OPENGL_DIR}/common/debug.h
${SOURCE_DIR}/Common/SharedLibrary.cpp
${SOURCE_DIR}/Common/SharedLibrary.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h
) )
...@@ -1945,6 +1947,8 @@ file(GLOB_RECURSE GLES2_LIST ...@@ -1945,6 +1947,8 @@ file(GLOB_RECURSE GLES2_LIST
${OPENGL_DIR}/common/*.cpp ${OPENGL_DIR}/common/*.cpp
${OPENGL_DIR}/common/*.h ${OPENGL_DIR}/common/*.h
${OPENGL_DIR}/common/*.hpp ${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/KHR/*.h
${CMAKE_CURRENT_SOURCE_DIR}/include/GLES2/*.h ${CMAKE_CURRENT_SOURCE_DIR}/include/GLES2/*.h
${CMAKE_CURRENT_SOURCE_DIR}/include/GLES3/*.h ${CMAKE_CURRENT_SOURCE_DIR}/include/GLES3/*.h
...@@ -1957,6 +1961,8 @@ file(GLOB_RECURSE GLES_CM_LIST ...@@ -1957,6 +1961,8 @@ file(GLOB_RECURSE GLES_CM_LIST
${OPENGL_DIR}/common/*.cpp ${OPENGL_DIR}/common/*.cpp
${OPENGL_DIR}/common/*.h ${OPENGL_DIR}/common/*.h
${OPENGL_DIR}/common/*.hpp ${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/KHR/*.h
${CMAKE_CURRENT_SOURCE_DIR}/include/GLES/*.h ${CMAKE_CURRENT_SOURCE_DIR}/include/GLES/*.h
) )
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#include "VkCommandBuffer.hpp" #include "VkCommandBuffer.hpp"
#include <cstring>
namespace vk namespace vk
{ {
...@@ -524,4 +526,4 @@ void CommandBuffer::submit() ...@@ -524,4 +526,4 @@ void CommandBuffer::submit()
state = EXECUTABLE; state = EXECUTABLE;
} }
} // namespace vk } // namespace vk
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment