diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c07a400..824ced74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -325,6 +325,14 @@ if (ANDROID) endif() if (NOT ANDROID) + find_package(Vulkan) + if (Vulkan_FOUND) + target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC Vulkan::Vulkan Vulkan::Headers) + target_link_libraries(${CMAKE_PROJECT_NAME}_s PUBLIC Vulkan::Vulkan Vulkan::Headers) + target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC ${Vulkan_INCLUDE_DIR}) + target_include_directories(${CMAKE_PROJECT_NAME}_s PUBLIC ${Vulkan_INCLUDE_DIR}) + endif () + if (MOBILEGL_BUILD_TEST) add_subdirectory(MobileGL/MG_Test) endif() diff --git a/MobileGL/Includes.h b/MobileGL/Includes.h index a6f996df..ece1c1c7 100644 --- a/MobileGL/Includes.h +++ b/MobileGL/Includes.h @@ -80,7 +80,6 @@ #ifdef __linux__ #include #include -#include #endif #ifdef _WIN32 @@ -106,6 +105,8 @@ #define TRACY_ZONECOLOR_BACKEND 0x00FF00 #endif +#include + // Post-includes for significant project headers #include "MG_Util/Debug/Log.h" #include "MG_Util/Types.h" diff --git a/MobileGL/MG_Impl/GLImpl/Getter/GL_Getter.cpp b/MobileGL/MG_Impl/GLImpl/Getter/GL_Getter.cpp index d9bc6ebb..14957df5 100644 --- a/MobileGL/MG_Impl/GLImpl/Getter/GL_Getter.cpp +++ b/MobileGL/MG_Impl/GLImpl/Getter/GL_Getter.cpp @@ -27,6 +27,7 @@ namespace MobileGL { #if MOBILEGL_BACKEND == MOBILEGL_BACKEND_TYPE_DIRECT_GLES return MG_Backend::DirectGLES::GetString(name); #endif + return (const GLubyte*)"3.3 "; } inline String GetFormattedBackendGLVersion() {