diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | loader/vk_loader_platform.h | 14 |
2 files changed, 2 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 32d75333..112fd571 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,6 @@ endif() if(NOT WIN32) include(GNUInstallDirs) - add_definitions(-DLIBDIR="${CMAKE_INSTALL_LIBDIR}") add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_SYSCONFDIR}") add_definitions(-DDATADIR="${CMAKE_INSTALL_DATADIR}") if (CMAKE_INSTALL_PREFIX STREQUAL "/usr") diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h index ced2fd28..ef5a19f1 100644 --- a/loader/vk_loader_platform.h +++ b/loader/vk_loader_platform.h @@ -62,38 +62,28 @@ #define LOCAL_DRIVERS_INFO \ LOCALPREFIX "/" SYSCONFDIR VULKAN_ICDCONF_DIR ":" \ LOCALPREFIX "/" DATADIR VULKAN_ICDCONF_DIR ":" -#define LOCAL_DRIVERS_PATH \ - LOCALPREFIX "/" LIBDIR VULKAN_ICD_DIR ":" #define LOCAL_LAYERS_INFO \ LOCALPREFIX "/" SYSCONFDIR VULKAN_ELAYERCONF_DIR ":" \ LOCALPREFIX "/" SYSCONFDIR VULKAN_ILAYERCONF_DIR ":" \ LOCALPREFIX "/" DATADIR VULKAN_ELAYERCONF_DIR ":" \ LOCALPREFIX "/" DATADIR VULKAN_ILAYERCONF_DIR ":" -#define LOCAL_LAYERS_PATH \ - LOCALPREFIX "/" LIBDIR VULKAN_LAYER_DIR ":" #else #define LOCAL_DRIVERS_INFO -#define LOCAL_DRIVERS_PATH #define LOCAL_LAYERS_INFO -#define LOCAL_LAYERS_PATH #endif #define DEFAULT_VK_DRIVERS_INFO \ LOCAL_DRIVERS_INFO \ "/" SYSCONFDIR VULKAN_ICDCONF_DIR ":" \ "/usr/" DATADIR VULKAN_ICDCONF_DIR -#define DEFAULT_VK_DRIVERS_PATH \ - LOCAL_DRIVERS_PATH \ - "/usr/" LIBDIR VULKAN_ICD_DIR +#define DEFAULT_VK_DRIVERS_PATH "" #define DEFAULT_VK_LAYERS_INFO \ LOCAL_LAYERS_INFO \ "/" SYSCONFDIR VULKAN_ELAYERCONF_DIR ":" \ "/" SYSCONFDIR VULKAN_ILAYERCONF_DIR ":" \ "/usr/" DATADIR VULKAN_ELAYERCONF_DIR ":" \ "/usr/" DATADIR VULKAN_ILAYERCONF_DIR -#define DEFAULT_VK_LAYERS_PATH \ - LOCAL_LAYERS_PATH \ - "/usr/" LIBDIR VULKAN_LAYER_DIR +#define DEFAULT_VK_LAYERS_PATH "" #define LAYERS_PATH_ENV "VK_LAYER_PATH" // C99: |