Fixing some shader stuff
This commit is contained in:
+8
-7
@@ -77,15 +77,15 @@ target_link_libraries(Engine PUBLIC nlohmann_json::nlohmann_json)
|
||||
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)
|
||||
target_link_libraries(Engine PUBLIC slang)
|
||||
target_link_libraries(Engine PUBLIC spirv-cross-glsl spirv-cross-msl)
|
||||
target_link_libraries(Engine PUBLIC glslang::glslang)
|
||||
if(APPLE)
|
||||
target_include_directories(Engine PUBLIC /usr/local/include)
|
||||
target_link_directories(Engine PUBLIC /usr/local/lib)
|
||||
target_link_libraries(Engine PUBLIC metalirconverter)
|
||||
target_link_libraries(Engine PUBLIC metal)
|
||||
SET(CMAKE_OSX_DEPLOYMENT_TARGET 14.3)
|
||||
install(FILES
|
||||
${EXTERNAL_ROOT}/dxc
|
||||
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
||||
endif()
|
||||
if(UNIX)
|
||||
target_link_libraries(Engine PUBLIC Threads::Threads)
|
||||
@@ -121,8 +121,8 @@ else()
|
||||
endif()
|
||||
if(APPLE)
|
||||
#Metal lib throws that internally for some reason
|
||||
target_compile_options(Engine PUBLIC -Wno-gnu-anonymous-struct)
|
||||
target_compile_options(Editor PUBLIC -Wno-gnu-anonymous-struct)
|
||||
target_compile_options(Engine PUBLIC -Wno-gnu-anonymous-struct -Wno-nested-anon-types)
|
||||
target_compile_options(Editor PUBLIC -Wno-gnu-anonymous-struct -Wno-nested-anon-types)
|
||||
endif()
|
||||
target_compile_options(Engine PUBLIC "$<$<CONFIG:DEBUG>:-DENABLE_VALIDATION>")
|
||||
target_compile_options(Engine PUBLIC "$<$<CONFIG:DEBUG>:-DSEELE_DEBUG>")
|
||||
@@ -137,7 +137,7 @@ if(WIN32)
|
||||
DEPENDS Editor)
|
||||
elseif(APPLE)
|
||||
add_custom_target(dll_copy ALL
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SLANG_ROOT}bin/libslang.dylib $<TARGET_FILE_DIR:Editor>
|
||||
COMMAND ${CMAKE_COMMAND} -E true
|
||||
COMMAND_EXPAND_LISTS
|
||||
DEPENDS Editor)
|
||||
else()
|
||||
@@ -157,6 +157,7 @@ install(
|
||||
Engine
|
||||
crcpp
|
||||
metal
|
||||
slang
|
||||
EXPORT
|
||||
EngineTargets
|
||||
FILE_SET HEADERS
|
||||
|
||||
Reference in New Issue
Block a user