Demos: use vcproj .user file to configure location of vulkan.dll in msvs

4 files changed, 36 insertions, 9 deletions

diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index dc29c34c..11fd95e9 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -42,6 +42,9 @@ if(WIN32)
        COMMAND move frag.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
        DEPENDS cube.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
        )
+   file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
+   file(COPY tri.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
+   file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
 endif()
 if(NOT WIN32)
     add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
@@ -116,12 +119,3 @@ else()
     add_executable(cube WIN32 cube.c ${CMAKE_BINARY_DIR}/demos/cube-vert.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv)
     target_link_libraries(cube ${LIBRARIES} libpngd zlibd)
 endif()
-
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-    set(PATH_TO_WIN_VK ${CMAKE_CURRENT_BINARY_DIR}/../loader/${CMAKE_CFG_INTDIR})
-    add_custom_command(TARGET tri
-        POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PATH_TO_WIN_VK}/vulkan.dll" $<TARGET_FILE_DIR:tri>
-    )
-endif()
diff --git a/demos/cube.vcxproj.user b/demos/cube.vcxproj.user
new file mode 100755
index 00000000..8d96498b
--- /dev/null
+++ b/demos/cube.vcxproj.user
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <LocalDebuggerEnvironment>PATH=..\loader\Debug;%PATH%</LocalDebuggerEnvironment>

+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <LocalDebuggerEnvironment>PATH=..\loader\Release;%PATH%</LocalDebuggerEnvironment>

+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

+  </PropertyGroup>

+</Project>

diff --git a/demos/tri.vcxproj.user b/demos/tri.vcxproj.user
new file mode 100755
index 00000000..8d96498b
--- /dev/null
+++ b/demos/tri.vcxproj.user
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <LocalDebuggerEnvironment>PATH=..\loader\Debug;%PATH%</LocalDebuggerEnvironment>

+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <LocalDebuggerEnvironment>PATH=..\loader\Release;%PATH%</LocalDebuggerEnvironment>

+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

+  </PropertyGroup>

+</Project>

diff --git a/demos/vulkaninfo.vcxproj.user b/demos/vulkaninfo.vcxproj.user
new file mode 100755
index 00000000..8d96498b
--- /dev/null
+++ b/demos/vulkaninfo.vcxproj.user
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <LocalDebuggerEnvironment>PATH=..\loader\Debug;%PATH%</LocalDebuggerEnvironment>

+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <LocalDebuggerEnvironment>PATH=..\loader\Release;%PATH%</LocalDebuggerEnvironment>

+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

+  </PropertyGroup>

+</Project>