From 860adc833c5ba5b1eb7d819b0dad080de35b943a Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Wed, 12 Aug 2020 18:48:37 -0700
Subject: Fixed Visual Studio 16.7 build error + updated asteroids demo timings
 output

---
 Projects/Asteroids/CMakeLists.txt     | 4 +++-
 Projects/Asteroids/src/WinWrapper.cpp | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'Projects')

diff --git a/Projects/Asteroids/CMakeLists.txt b/Projects/Asteroids/CMakeLists.txt
index 291369c..24f06b2 100644
--- a/Projects/Asteroids/CMakeLists.txt
+++ b/Projects/Asteroids/CMakeLists.txt
@@ -52,11 +52,13 @@ set(VERTEX_SHADERS
 
 set(SHADERS ${PIXEL_SHADERS} ${VERTEX_SHADERS})
 
+set(COMPILED_SHADERS_DIR "${CMAKE_CURRENT_BINARY_DIR}/CompiledShaders")
+file(MAKE_DIRECTORY "${COMPILED_SHADERS_DIR}")
 set_source_files_properties(${SHADERS} PROPERTIES
     VS_SHADER_ENTRYPOINT "%(Filename)"
     VS_SHADER_MODEL 5.0
     VS_SHADER_VARIABLE_NAME "g_%(Filename)"
-    VS_SHADER_OUTPUT_HEADER_FILE "${CMAKE_CURRENT_BINARY_DIR}/CompiledShaders/%(Filename).h"
+    VS_SHADER_OUTPUT_HEADER_FILE "${COMPILED_SHADERS_DIR}/%(Filename).h"
 )
 set_source_files_properties(${PIXEL_SHADERS} PROPERTIES VS_SHADER_TYPE Pixel)
 set_source_files_properties(${VERTEX_SHADERS} PROPERTIES VS_SHADER_TYPE Vertex)
diff --git a/Projects/Asteroids/src/WinWrapper.cpp b/Projects/Asteroids/src/WinWrapper.cpp
index 6bf0e6d..ddbf4c8 100644
--- a/Projects/Asteroids/src/WinWrapper.cpp
+++ b/Projects/Asteroids/src/WinWrapper.cpp
@@ -588,7 +588,7 @@ int main(int argc, char** argv)
             filteredFrameTime = filteredFrameTime * (1.f - filterScale) + filterScale * (float)frameTime;
 
             char buffer[256];
-            sprintf_s(buffer, "Asteroids %s%s (%dt) - %4.2f ms (%4.2f ms / %4.2f ms)", ModeStr, resBindModeStr, (gSettings.multithreadedRendering ? gSettings.numThreads : 1), 
+            sprintf_s(buffer, "Asteroids %s%s (%dt) - %4.1f ms (%4.1f ms / %4.1f ms)", ModeStr, resBindModeStr, (gSettings.multithreadedRendering ? gSettings.numThreads : 1), 
                               1000.f * filteredFrameTime, 1000.f * filteredUpdateTime, 1000.f * filteredRenderTime);
 
             SetWindowText(hWnd, buffer);
-- 
cgit v1.2.3