Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing more stuff

Browse Source
This commit is contained in:
Dynamitos
2024-01-20 13:22:47 +01:00
parent 8dc52fa151
commit 4868fb51ac
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/settings.json
Vendored
+1
View File
@@ -1,5 +1,6 @@
{ {
"telemetry.enableTelemetry": false, "telemetry.enableTelemetry": false,
"cmake.cmakePath": "cmake",
"cmake.buildDirectory": "${workspaceFolder}/bin", "cmake.buildDirectory": "${workspaceFolder}/bin",
"files.associations": { "files.associations": {
"*.h": "cpp", "*.h": "cpp",
CMakeLists.txt
+3 -3
View File
@@ -50,9 +50,6 @@ find_package(nlohmann_json CONFIG REQUIRED)
find_package(fmt CONFIG REQUIRED) find_package(fmt CONFIG REQUIRED)
find_package(VulkanMemoryAllocator CONFIG REQUIRED) find_package(VulkanMemoryAllocator CONFIG REQUIRED)
if(APPLE)
find_library(COCOA_LIBRARY Cocoa)
endif()
if(UNIX) if(UNIX)
find_package(Threads REQUIRED) 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 fmt::fmt)
target_link_libraries(Engine PUBLIC GPUOpen::VulkanMemoryAllocator) target_link_libraries(Engine PUBLIC GPUOpen::VulkanMemoryAllocator)
target_link_libraries(Engine PUBLIC shader-slang) target_link_libraries(Engine PUBLIC shader-slang)
if(APPLE)
target_link_directories(Engine PUBLIC /usr/local/lib)
endif()
if(UNIX) if(UNIX)
target_link_libraries(Engine PUBLIC Threads::Threads) target_link_libraries(Engine PUBLIC Threads::Threads)
target_link_libraries(Engine PUBLIC dl) target_link_libraries(Engine PUBLIC dl)
src/Editor/main.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ int main()
#elif __APPLE__ #elif __APPLE__
std::filesystem::path outputPath = "/Users/dynamitos/TrackClearGame"; std::filesystem::path outputPath = "/Users/dynamitos/TrackClearGame";
std::filesystem::path sourcePath= "/Users/dynamitos/TrackClear"; std::filesystem::path sourcePath= "/Users/dynamitos/TrackClear";
std::filesystem::path binaryPath = sourcePath / "cmake" / "libTrackClear.dynlib"; std::filesystem::path binaryPath = sourcePath / "cmake" / "libTrackClear.dylib";
#else #else
std::filesystem::path outputPath = "/home/dynamitos/TrackClearGame"; std::filesystem::path outputPath = "/home/dynamitos/TrackClearGame";
std::filesystem::path sourcePath= "/home/dynamitos/TrackClear"; std::filesystem::path sourcePath= "/home/dynamitos/TrackClear";
src/Engine/Graphics/Vulkan/Graphics.cpp
+2 -1
View File
@@ -380,9 +380,10 @@ void Graphics::initInstance(GraphicsInitializer initInfo)
.applicationVersion = VK_MAKE_VERSION(0, 0, 1), .applicationVersion = VK_MAKE_VERSION(0, 0, 1),
.pEngineName = initInfo.engineName, .pEngineName = initInfo.engineName,
.engineVersion = VK_MAKE_VERSION(0, 0, 1), .engineVersion = VK_MAKE_VERSION(0, 0, 1),
.apiVersion = VK_API_VERSION_1_2, .apiVersion = VK_API_VERSION_1_3,
}; };
Array<const char*> extensions = getRequiredExtensions(); Array<const char*> extensions = getRequiredExtensions();
for (uint32 i = 0; i < initInfo.instanceExtensions.size(); ++i) for (uint32 i = 0; i < initInfo.instanceExtensions.size(); ++i)
{ {