summaryrefslogtreecommitdiffstats
path: root/External
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-12-24 03:40:32 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-12-24 03:40:32 +0000
commit604b9ef1a83ffc02eb90f48d5ca7bd5ed78ce8c4 (patch)
tree18f48291890de1ca8b909b5dbf6252991cc7b917 /External
parentA bunch of minor changes to fix clang warnings and errors (diff)
downloadDiligentCore-604b9ef1a83ffc02eb90f48d5ca7bd5ed78ce8c4.tar.gz
DiligentCore-604b9ef1a83ffc02eb90f48d5ca7bd5ed78ce8c4.zip
Enabled Vulkan build on macOS
Diffstat (limited to 'External')
-rw-r--r--External/CMakeLists.txt2
-rw-r--r--External/vulkan/.gitignore1
-rw-r--r--External/vulkan/libs/.gitignore5
-rw-r--r--External/vulkan/libs/macOS/MoltenVK_icd.json7
-rwxr-xr-xExternal/vulkan/libs/macOS/libMoltenVK.dylibbin0 -> 2519972 bytes
5 files changed, 14 insertions, 1 deletions
diff --git a/External/CMakeLists.txt b/External/CMakeLists.txt
index c1f0a01a..32fd9231 100644
--- a/External/CMakeLists.txt
+++ b/External/CMakeLists.txt
@@ -15,7 +15,7 @@ if(PLATFORM_ANDROID)
add_subdirectory(Android)
endif()
-if(PLATFORM_WIN32 OR PLATFORM_LINUX)
+if(PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_MACOS)
# We only need to have SPIRV-Headers folder, but we
# do not really need any target from the project.
#add_subdirectory(SPIRV-Headers)
diff --git a/External/vulkan/.gitignore b/External/vulkan/.gitignore
new file mode 100644
index 00000000..38c648bb
--- /dev/null
+++ b/External/vulkan/.gitignore
@@ -0,0 +1 @@
+!/libs \ No newline at end of file
diff --git a/External/vulkan/libs/.gitignore b/External/vulkan/libs/.gitignore
new file mode 100644
index 00000000..8bc81845
--- /dev/null
+++ b/External/vulkan/libs/.gitignore
@@ -0,0 +1,5 @@
+!*.so
+!*.lib
+!*.a
+!*.dylib
+!*.json \ No newline at end of file
diff --git a/External/vulkan/libs/macOS/MoltenVK_icd.json b/External/vulkan/libs/macOS/MoltenVK_icd.json
new file mode 100644
index 00000000..60593301
--- /dev/null
+++ b/External/vulkan/libs/macOS/MoltenVK_icd.json
@@ -0,0 +1,7 @@
+{
+ "file_format_version" : "1.0.0",
+ "ICD": {
+ "library_path": "./libMoltenVK.dylib",
+ "api_version" : "1.0.0"
+ }
+}
diff --git a/External/vulkan/libs/macOS/libMoltenVK.dylib b/External/vulkan/libs/macOS/libMoltenVK.dylib
new file mode 100755
index 00000000..32b90be1
--- /dev/null
+++ b/External/vulkan/libs/macOS/libMoltenVK.dylib
Binary files differ