AstralTech/Gryphn
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some cmake stuffs

Browse Source
This commit is contained in:
Greg Wells
2025-05-06 17:25:22 -04:00
parent 406d669de0
commit a3fd0e1579
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rendering_api/metal/CMakeLists.txt
View File

@@ -21,10 +21,15 @@ add_compile_definitions(GN_REVEAL_IMPL)
add_subdirectory(depends/metal-cpp) add_subdirectory(depends/metal-cpp)
add_library(glfw SHARED IMPORTED) add_library(glfw SHARED IMPORTED)
set_target_properties(glfw PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/build/depends/glfw/glfw-3.4/src/libglfw.dylib) set_target_properties(glfw PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/build/depends/glfw/glfw-3.4/src/libglfw.3.4.dylib)
target_link_libraries(GryphnMetalImpl METAL_CPP glfw spirv-cross-core spirv-cross-msl spirv-cross-cpp) target_link_libraries(GryphnMetalImpl METAL_CPP glfw spirv-cross-core spirv-cross-msl spirv-cross-cpp)
target_link_libraries(GryphnMetalImpl
"-framework IOKit"
"-framework CoreFoundation"
)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/gryphn/rendering_apis) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/gryphn/rendering_apis)
add_custom_command(TARGET GryphnMetalImpl POST_BUILD add_custom_command(TARGET GryphnMetalImpl POST_BUILD
COMMAND mv libGryphnMetalImpl.dylib ../../rendering_apis/GryphnMetalImpl.dylib COMMAND mv libGryphnMetalImpl.dylib ../../rendering_apis/GryphnMetalImpl.dylib

5
rendering_api/metal/src/core/presentation_queue/metal_presentation_queue.cpp
View File

@@ -100,9 +100,8 @@ GN_EXPORT gnReturnCode gnCreatePresentationQueueFn(gnPresentationQueue* presenta
return GN_SUCCESS; return GN_SUCCESS;
} }
GN_EXPORT void gnDestroyPresentationQueueFn(gnPresentationQueue& queue) { GN_EXPORT void gnDestroyPresentationQueueFn(gnPresentationQueue& queue) {
/*for (int i = 0; i < gnListLength(queue.images); i++) { for (int i = 0; i < gnListLength(queue.images); i++) {
gnDestroyTexture(queue.images[i]); gnDestroyTexture(queue.images[i]);
} }
queue.images = gnCreateList<gnTexture>();*/ queue.images = gnCreateList<gnTexture>();
std::cout << "gnDestroyPresentationQueueFn needs fixin\n";
} }

11
rendering_api/vulkan/CMakeLists.txt
View File

@@ -17,12 +17,19 @@ target_include_directories(GryphnVulkanImpl PUBLIC
add_compile_definitions(GN_REVEAL_IMPL) add_compile_definitions(GN_REVEAL_IMPL)
add_library(glfw SHARED IMPORTED) add_library(glfw SHARED IMPORTED)
set_target_properties(glfw PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/build/depends/glfw/glfw-3.4/src/libglfw.dylib) set_target_properties(glfw PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/build/depends/glfw/glfw-3.4/src/libglfw.3.4.dylib)
add_library(libvulkan SHARED IMPORTED) add_library(libvulkan SHARED IMPORTED)
set_target_properties(libvulkan PROPERTIES IMPORTED_LOCATION /Applications/vulkansdk/macOS/lib/libvulkan.dylib) set_target_properties(libvulkan PROPERTIES IMPORTED_LOCATION /Applications/vulkansdk/macOS/lib/libvulkan.dylib)
target_link_libraries(GryphnVulkanImpl glfw libvulkan ) target_link_libraries(GryphnVulkanImpl glfw libvulkan)
target_link_libraries(GryphnVulkanImpl
"-framework IOKit"
"-framework CoreFoundation"
"-framework CoreGraphics"
"-framework AppKit"
)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/gryphn/rendering_apis) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/gryphn/rendering_apis)
add_custom_command(TARGET GryphnVulkanImpl POST_BUILD add_custom_command(TARGET GryphnVulkanImpl POST_BUILD