compile fixes for macOS

Note that running it will not work due to missing MoltenVK/Metal
support of VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 857f4d5ae032319166e877c7c943efe43e9d16e2..a4eea8e251e88035422d4bb2c4999a88c52e8562 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
 
 SET(LANG "CXX")
+SET(CMAKE_CXX_STANDARD 11)
 
 #PROJECT(vkvg VERSION 0.1.1 DESCRIPTION "Vulkan Vector Graphic" LANGUAGES ${LANG})
 PROJECT(vkvg VERSION 0.1.1 DESCRIPTION "Vulkan Vector Graphic")

diff --git a/src/cross_mutex.h b/src/cross_mutex.h
index b42c488a689a8afabf6d0f590dec34d8be8705ad..11635a7f861706ea2fd627773de1bf84ca21df3d 100644 (file)
--- a/src/cross_mutex.h
+++ b/src/cross_mutex.h
@@ -28,6 +28,8 @@
 #include "process.h"
 #define MUTEX HANDLE
 #elif __APPLE__
+#include "pthread.h"
+#define MUTEX pthread_mutex_t
 #elif __unix__
 #include "pthread.h"
 #define MUTEX pthread_mutex_t

diff --git a/src/cross_os.h b/src/cross_os.h
index 842a54962eb6a6272e31d894a0da277eab6430cf..916aa125d0755d8c05acb1485e733e0e6a4306c2 100644 (file)
--- a/src/cross_os.h
+++ b/src/cross_os.h
@@ -29,6 +29,8 @@
        #include "windows.h"
        #define isnanf _isnanf
 #elif __APPLE__
+       #include <math.h>
+       #define isnanf isnan
 #elif __unix__
        #include <unistd.h>
        #include <sys/types.h>

diff --git a/src/vkvg_device_internal.h b/src/vkvg_device_internal.h
index ea148312ac6fa88824f001a635351ffd1e53ebb3..ccd591785db82ca053b48936d21cf8be46ac2253 100644 (file)
--- a/src/vkvg_device_internal.h
+++ b/src/vkvg_device_internal.h
@@ -105,6 +105,7 @@ typedef struct _vkvg_device_t{
 bool _init_function_pointers   (VkvgDevice dev);
 void _create_empty_texture      (VkvgDevice dev, VkFormat format, VkImageTiling tiling);
 void _get_best_image_tiling            (VkvgDevice dev, VkFormat format, VkImageTiling* pTiling);
+void _check_best_image_tiling  (VkvgDevice dev, VkFormat format);
 void _create_pipeline_cache     (VkvgDevice dev);
 VkRenderPass _createRenderPassMS(VkvgDevice dev, VkAttachmentLoadOp loadOp, VkAttachmentLoadOp stencilLoadOp);
 VkRenderPass _createRenderPassNoResolve(VkvgDevice dev, VkAttachmentLoadOp loadOp, VkAttachmentLoadOp stencilLoadOp);