From 4868fb51ac1329850c2c8c30eae29e2936399dc5 Mon Sep 17 00:00:00 2001
From: Dynamitos <dynamitos15@gmail.com>
Date: Sat, 20 Jan 2024 13:22:47 +0100
Subject: [PATCH] Fixing more stuff

---
 .vscode/settings.json                   | 1 +
 CMakeLists.txt                          | 6 +++---
 src/Editor/main.cpp                     | 2 +-
 src/Engine/Graphics/Vulkan/Graphics.cpp | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index e630e8c..9fdc4f6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
     "telemetry.enableTelemetry": false,
+    "cmake.cmakePath": "cmake",
     "cmake.buildDirectory": "${workspaceFolder}/bin",
     "files.associations": {
         "*.h": "cpp",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86f7fa1..0017716 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,9 +50,6 @@ find_package(nlohmann_json CONFIG REQUIRED)
 find_package(fmt CONFIG REQUIRED)
 find_package(VulkanMemoryAllocator CONFIG REQUIRED)
 
-if(APPLE)
-    find_library(COCOA_LIBRARY Cocoa)
-endif()
 
 if(UNIX)
     find_package(Threads REQUIRED)
@@ -78,6 +75,9 @@ target_link_libraries(Engine PUBLIC crcpp)
 target_link_libraries(Engine PUBLIC fmt::fmt)
 target_link_libraries(Engine PUBLIC GPUOpen::VulkanMemoryAllocator)
 target_link_libraries(Engine PUBLIC shader-slang)
+if(APPLE)
+    target_link_directories(Engine PUBLIC /usr/local/lib)
+endif()
 if(UNIX)
     target_link_libraries(Engine PUBLIC Threads::Threads)
     target_link_libraries(Engine PUBLIC dl)
diff --git a/src/Editor/main.cpp b/src/Editor/main.cpp
index 94d7e97..0bd7a0f 100644
--- a/src/Editor/main.cpp
+++ b/src/Editor/main.cpp
@@ -29,7 +29,7 @@ int main()
 #elif __APPLE__
     std::filesystem::path outputPath = "/Users/dynamitos/TrackClearGame";
     std::filesystem::path sourcePath= "/Users/dynamitos/TrackClear";
-    std::filesystem::path binaryPath = sourcePath / "cmake" / "libTrackClear.dynlib";
+    std::filesystem::path binaryPath = sourcePath / "cmake" / "libTrackClear.dylib";
 #else
     std::filesystem::path outputPath = "/home/dynamitos/TrackClearGame";
     std::filesystem::path sourcePath= "/home/dynamitos/TrackClear";
diff --git a/src/Engine/Graphics/Vulkan/Graphics.cpp b/src/Engine/Graphics/Vulkan/Graphics.cpp
index 0a09060..1790b2e 100644
--- a/src/Engine/Graphics/Vulkan/Graphics.cpp
+++ b/src/Engine/Graphics/Vulkan/Graphics.cpp
@@ -380,9 +380,10 @@ void Graphics::initInstance(GraphicsInitializer initInfo)
         .applicationVersion = VK_MAKE_VERSION(0, 0, 1),
         .pEngineName = initInfo.engineName,
         .engineVersion = VK_MAKE_VERSION(0, 0, 1),
-        .apiVersion = VK_API_VERSION_1_2,
+        .apiVersion = VK_API_VERSION_1_3,
     };
     
+    
     Array<const char*> extensions = getRequiredExtensions();
     for (uint32 i = 0; i < initInfo.instanceExtensions.size(); ++i)
     {