diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-04-14 14:55:44 -0600 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-04-16 17:48:18 +0800 |
| commit | 6082a4d9ed91b53bc7642ea67399ca354366369e (patch) | |
| tree | fee471c2c5ada0017439fb41813d92b59f0c9933 /loader | |
| parent | b97b8af373c690cf581324da2feb89b31afa1c69 (diff) | |
| download | usermoji-6082a4d9ed91b53bc7642ea67399ca354366369e.tar.xz | |
renaming: Move many xgl files to vk version
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/CMakeLists.txt | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index ef8907b0..d8039304 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -1,15 +1,15 @@ add_custom_command(OUTPUT dispatch.c - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/xgl-generate.py loader-entrypoints > dispatch.c - DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py - ${PROJECT_SOURCE_DIR}/include/xglIcd.h) + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py loader-entrypoints > dispatch.c + DEPENDS ${PROJECT_SOURCE_DIR}/vk-generate.py ${PROJECT_SOURCE_DIR}/vulkan.py + ${PROJECT_SOURCE_DIR}/include/vkIcd.h) add_custom_command(OUTPUT table_ops.h - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/xgl-generate.py dispatch-table-ops loader > table_ops.h - DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py) + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py dispatch-table-ops loader > table_ops.h + DEPENDS ${PROJECT_SOURCE_DIR}/vk-generate.py ${PROJECT_SOURCE_DIR}/vulkan.py) -add_custom_command(OUTPUT XGL.def - COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/xgl-generate.py win-def-file XGL all > XGL.def - DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py) +add_custom_command(OUTPUT vulkan.def + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-generate.py win-def-file vulkan all > vulkan.def + DEPENDS ${PROJECT_SOURCE_DIR}/vk-generate.py ${PROJECT_SOURCE_DIR}/vulkan.py) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} @@ -23,16 +23,16 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG") if (WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVK_PROTOTYPES -D_CRT_SECURE_NO_WARNINGS -DXCB_NVIDIA") - add_library(XGL SHARED loader.c loader.h dirent_on_windows.c dispatch.c table_ops.h XGL.def) - set_target_properties(XGL PROPERTIES LINK_FLAGS "/DEF:${PROJECT_SOURCE_DIR}/loader/XGL.def") - add_library(XGLstatic STATIC loader.c loader.h dirent_on_windows.c dispatch.c table_ops.h) - set_target_properties(XGLstatic PROPERTIES OUTPUT_NAME XGLstatic) - target_link_libraries(XGL) + add_library(vulkan SHARED loader.c loader.h dirent_on_windows.c dispatch.c table_ops.h vulkan.def) + set_target_properties(vulkan PROPERTIES LINK_FLAGS "/DEF:${PROJECT_SOURCE_DIR}/loader/vulkan.def") + add_library(VKstatic STATIC loader.c loader.h dirent_on_windows.c dispatch.c table_ops.h) + set_target_properties(VKstatic PROPERTIES OUTPUT_NAME VKstatic) + target_link_libraries(vulkan) endif() if (NOT WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVK_PROTOTYPES -Wpointer-arith") - add_library(XGL SHARED loader.c dispatch.c table_ops.h) - set_target_properties(XGL PROPERTIES SOVERSION 0) - target_link_libraries(XGL -ldl -lpthread) + add_library(vulkan SHARED loader.c dispatch.c table_ops.h) + set_target_properties(vulkan PROPERTIES SOVERSION 0) + target_link_libraries(vulkan -ldl -lpthread) endif() |