Fixing more stuff
This commit is contained in:
Vendored
+1
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"telemetry.enableTelemetry": false,
|
||||
"cmake.cmakePath": "cmake",
|
||||
"cmake.buildDirectory": "${workspaceFolder}/bin",
|
||||
"files.associations": {
|
||||
"*.h": "cpp",
|
||||
|
||||
+3
-3
@@ -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)
|
||||
|
||||
+1
-1
@@ -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";
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user