From b97b8af373c690cf581324da2feb89b31afa1c69 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Thu, 9 Apr 2015 10:06:13 -0600 Subject: rename: more renaming --- icd/nulldrv/CMakeLists.txt | 4 ++-- icd/nulldrv/VK_nulldrv.def | 36 ++++++++++++++++++++++++++++++++++++ icd/nulldrv/XGL_nulldrv.def | 36 ------------------------------------ 3 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 icd/nulldrv/VK_nulldrv.def delete mode 100644 icd/nulldrv/XGL_nulldrv.def diff --git a/icd/nulldrv/CMakeLists.txt b/icd/nulldrv/CMakeLists.txt index 45a82b65..7b1e182b 100644 --- a/icd/nulldrv/CMakeLists.txt +++ b/icd/nulldrv/CMakeLists.txt @@ -26,8 +26,8 @@ target_include_directories(XGL_nulldrv PRIVATE ${include_dirs}) target_link_libraries(XGL_nulldrv ${libraries}) if (WIN32) - # Add in the DLL "map" file for xglGetProcAddr() + # Add in the DLL "map" file for vkGetProcAddr() set_target_properties(XGL_nulldrv PROPERTIES - LINK_FLAGS "/DEF:${PROJECT_SOURCE_DIR}/icd/nulldrv/XGL_nulldrv.def") + LINK_FLAGS "/DEF:${PROJECT_SOURCE_DIR}/icd/nulldrv/VK_nulldrv.def") endif() diff --git a/icd/nulldrv/VK_nulldrv.def b/icd/nulldrv/VK_nulldrv.def new file mode 100644 index 00000000..792fe6dd --- /dev/null +++ b/icd/nulldrv/VK_nulldrv.def @@ -0,0 +1,36 @@ +;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; VK +; +; Copyright (C) 2015 LunarG, Inc. +; +; Permission is hereby granted, free of charge, to any person obtaining a +; copy of this software and associated documentation files (the "Software"), +; to deal in the Software without restriction, including without limitation +; the rights to use, copy, modify, merge, publish, distribute, sublicense, +; and/or sell copies of the Software, and to permit persons to whom the +; Software is furnished to do so, subject to the following conditions: +; +; The above copyright notice and this permission notice shall be included +; in all copies or substantial portions of the Software. +; +; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +; THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +; DEALINGS IN THE SOFTWARE. +;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; The following is required on Windows, for exporting symbols from the DLL + +LIBRARY VK_nulldrv +EXPORTS + vkGetProcAddr + vkCreateInstance + vkEnumerateGpus + vkDestroyInstance + xcbCreateWindow + xcbDestroyWindow + xcbGetMessage + xcbQueuePresent diff --git a/icd/nulldrv/XGL_nulldrv.def b/icd/nulldrv/XGL_nulldrv.def deleted file mode 100644 index 792fe6dd..00000000 --- a/icd/nulldrv/XGL_nulldrv.def +++ /dev/null @@ -1,36 +0,0 @@ -;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; VK -; -; Copyright (C) 2015 LunarG, Inc. -; -; Permission is hereby granted, free of charge, to any person obtaining a -; copy of this software and associated documentation files (the "Software"), -; to deal in the Software without restriction, including without limitation -; the rights to use, copy, modify, merge, publish, distribute, sublicense, -; and/or sell copies of the Software, and to permit persons to whom the -; Software is furnished to do so, subject to the following conditions: -; -; The above copyright notice and this permission notice shall be included -; in all copies or substantial portions of the Software. -; -; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -; THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -; DEALINGS IN THE SOFTWARE. -;;;; End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -; The following is required on Windows, for exporting symbols from the DLL - -LIBRARY VK_nulldrv -EXPORTS - vkGetProcAddr - vkCreateInstance - vkEnumerateGpus - vkDestroyInstance - xcbCreateWindow - xcbDestroyWindow - xcbGetMessage - xcbQueuePresent -- cgit v1.2.3