From 2b2d374eb642edf345f93fa559e8cd7d76a0c9d1 Mon Sep 17 00:00:00 2001 From: ladevieq Date: Sun, 26 Jan 2025 22:14:47 +0100 Subject: Fix mesh loading for new API --- src/CMakeLists.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1f514f0..d482ddf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ set(LIBRARIES imgui::imgui) -set(DEFINES -DNOMINMAX -D_USE_MATH_DEFINES -DVK_NO_PROTOTYPES) +set(DEFINES -DNOMINMAX -D_USE_MATH_DEFINES -DVK_NO_PROTOTYPES TRACY_ENABLE) if(UNIX AND NOT APPLE) set(DEFINES ${DEFINES} -DLINUX -DVK_USE_PLATFORM_XCB_KHR) @@ -30,6 +30,8 @@ add_executable( bvh.cpp mesh.cpp resource-manager.cpp + + ${CMAKE_SOURCE_DIR}/tracy/public/TracyClient.cpp ) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") @@ -57,11 +59,17 @@ target_link_directories(path-tracer PRIVATE "C:\\Program Files\\LLVM\\lib\\clang target_compile_definitions(path-tracer PUBLIC ${DEFINES}) -target_include_directories(path-tracer SYSTEM PUBLIC ${CMAKE_SOURCE_DIR}/thirdparty) +target_include_directories(path-tracer + SYSTEM PUBLIC + + ${CMAKE_SOURCE_DIR}/thirdparty + ${CMAKE_SOURCE_DIR}/tracy/public + ${Vulkan_INCLUDE_DIRS} -target_include_directories(path-tracer SYSTEM PUBLIC ${Vulkan_INCLUDE_DIRS}) + PUBLIC -target_include_directories(path-tracer PUBLIC ${CMAKE_SOURCE_DIR}/include) + ${CMAKE_SOURCE_DIR}/include +) if(UNIX AND NOT APPLE) target_include_directories(path-tracer PUBLIC ${X11_xcb_INCLUDE_PATH}) -- cgit v1.3