From df279b4700cad9ef3b62e0f98bfad48b3aac81c2 Mon Sep 17 00:00:00 2001 From: alfonsmagd Date: Sun, 24 Nov 2024 20:55:24 +0100 Subject: [PATCH] Update Code and conflict with names directory solve --- Ifnity/Ifnity/CMakeLists.txt | 18 +++++++++--------- Ifnity/ShadersPipeLine/src/Source.cpp | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Ifnity/Ifnity/CMakeLists.txt b/Ifnity/Ifnity/CMakeLists.txt index 4e3100c..eee2a82 100644 --- a/Ifnity/Ifnity/CMakeLists.txt +++ b/Ifnity/Ifnity/CMakeLists.txt @@ -13,9 +13,9 @@ if(MSVC) endif() # Output directories -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DIST ${CMAKE_BINARY_DIR}/Dist) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG_IFNITY ${CMAKE_BINARY_DIR}/DebugContributor) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE_IFNITY ${CMAKE_BINARY_DIR}/ReleaseContributor) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DIST_IFNITY ${CMAKE_BINARY_DIR}/DistContributor) #DXC directories and variables set(DXC_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/vendor/dxc/include") @@ -207,30 +207,30 @@ set_target_properties(${PROJECT_NAME} PROPERTIES add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/vendor/nvml/nvml.lib - ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG} + ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG_IFNITY} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/vendor/nvml/nvml.lib - ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE} + ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE_IFNITY} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/vendor/nvml/nvml.lib - ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DIST} + ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DIST_IFNITY} ) foreach(DLL_PATH IN LISTS DXC_DLLS) add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DLL_PATH} - ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG} + ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG_IFNITY} ) add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DLL_PATH} - ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE} + ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE_IFNITY} ) add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DLL_PATH} - ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DIST} + ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DIST_IFNITY} ) endforeach() diff --git a/Ifnity/ShadersPipeLine/src/Source.cpp b/Ifnity/ShadersPipeLine/src/Source.cpp index 778d3ac..b1ec43e 100644 --- a/Ifnity/ShadersPipeLine/src/Source.cpp +++ b/Ifnity/ShadersPipeLine/src/Source.cpp @@ -1971,7 +1971,7 @@ IFNITY::App* IFNITY::CreateApp() // //return new Source_Tetahedre(api); - //return new Source_VTXP_HLSL(api); - return new Source_CUBEMAP_FIGURE(api); + return new Source_VTXP_HLSL(api); + //return new Source_CUBEMAP_FIGURE(api); }