diff options
| author | Ian Elliott <ian@LunarG.com> | 2015-04-15 11:16:04 -0600 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-04-16 17:48:20 +0800 |
| commit | b8ec6fe6250725313d12d749372c7ebfc14f367a (patch) | |
| tree | b6fa9a1d2ae6c738d75c9dc46df124150074607b | |
| parent | d5501121ca891ee061343ec3077d6c1019d99a9e (diff) | |
| download | usermoji-b8ec6fe6250725313d12d749372c7ebfc14f367a.tar.xz | |
Win: Change xgl->vk/vulkan (towards being able to build on Windows).
| -rw-r--r-- | demos/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | layers/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index 0b6f3d03..68c51893 100644 --- 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 d51c8de2..881a89b7 100644 --- 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) |