diff --git a/CMCore b/CMCore index 337d4a7f..68071435 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 337d4a7fa46272dbdfa3c3ecc7b27e697cff44f7 +Subproject commit 680714358407b0b208f08b768ce08e3c8bc8b41e diff --git a/CMPlatform b/CMPlatform index da57bbe3..b6c70c8e 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit da57bbe324361422a70eaedc3b5c2906610e4d4e +Subproject commit b6c70c8e2adeb602b86e65831499ec74c5f7b9cb diff --git a/CMSceneGraph b/CMSceneGraph index 40d54352..3844b827 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 40d5435239ad76d46223bd73e73c58f0332d0ed7 +Subproject commit 3844b827bf33c5aeb420e3a84db92ec5e6770da9 diff --git a/example/Vulkan/CMakeLists.txt b/example/Vulkan/CMakeLists.txt index 956a3e27..f7cdc8d5 100644 --- a/example/Vulkan/CMakeLists.txt +++ b/example/Vulkan/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(${name} ${ARGN} ${VULKAN_APP_FRAMEWORK}) target_link_libraries(${name} ${ULRE}) - IF(WIN32) + IF(MSVC) set_target_properties(${name} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${ULRE_RUNTIME_PATH}) set_property(TARGET ${name} PROPERTY VS_DPI_AWARE "PerMonitor") ENDIF() @@ -17,7 +17,7 @@ macro(CreateQtProject name) target_link_libraries(${name} ${ULRE} Qt5::Core Qt5::Gui Qt5::Widgets) - IF(WIN32) + IF(MSVC) set_target_properties(${name} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${ULRE_RUNTIME_PATH}) ENDIF() @@ -49,7 +49,7 @@ CreateProject(15.OffscreenRender OffscreenRender.cpp) #CreateProject(12.PBRBasic PBRBasic.cpp) #CreateProject(12.Deferred Deferred.cpp) -CreateProject(16.DeferredRenderMultiCmdBuffer DeferredRenderMultiCmdBuffer.cpp) +CreateProject(16.DeferredRender DeferredRender.cpp) #CreateProject(14.AutoMaterial auto_material.cpp) CreateProject(17.Cubemap Cubemap.cpp) diff --git a/example/Vulkan/DeferredRenderMultiCmdBuffer.cpp b/example/Vulkan/DeferredRender.cpp similarity index 100% rename from example/Vulkan/DeferredRenderMultiCmdBuffer.cpp rename to example/Vulkan/DeferredRender.cpp