Win: Change xgl->vk/vulkan (towards being able to build on Windows).

diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index 0b6f3d0..68c5189 100644 (file)
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -84,9 +84,9 @@ endif()
 
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-    set(PATH_TO_WIN_XGL ${CMAKE_CURRENT_BINARY_DIR}/../loader/${CMAKE_CFG_INTDIR})
+    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_XGL}/XGL.dll" $<TARGET_FILE_DIR:tri>
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PATH_TO_WIN_VK}/vulkan.dll" $<TARGET_FILE_DIR:tri>
     )
 endif()

diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index d51c8de..881a89b 100644 (file)
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -17,8 +17,8 @@ endmacro()
 if (WIN32)
     macro(add_vk_layer target)
        add_custom_command(OUTPUT VKLayer${target}.def
-               COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/xgl-generate.py win-def-file VKLayer${target} layer > VKLayer${target}.def
-               DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py
+               COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py win-def-file VKLayer${target} layer > VKLayer${target}.def
+               DEPENDS ${PROJECT_SOURCE_DIR}/vk-generate.py ${PROJECT_SOURCE_DIR}/vk.py
        )
        add_library(VKLayer${target} SHARED ${ARGN} VKLayer${target}.def)
         target_link_Libraries(VKLayer${target} layer_utils)