diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-05-11 09:34:20 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-05-11 09:34:20 -0700 |
| commit | 9761fdd2636bbd0bc03049adb3f732e0e92b8160 (patch) | |
| tree | c89f87ff81a0bca3c358168d1c6bccf49ffbc9fa | |
| parent | 86da3e90a67247824bad8da22dca4e772b614a69 (diff) | |
| download | usermoji-9761fdd2636bbd0bc03049adb3f732e0e92b8160.tar.xz | |
Windows: Fix build from recent loader changes
| -rw-r--r-- | loader/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | vk-generate.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 9c1c2314..6365e8d1 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -12,7 +12,7 @@ if (WIN32) add_library(vulkan SHARED loader.c loader.h loader_platform.h dirent_on_windows.c trampoline.c table_ops.h gpa_helper.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 gpa_helper.h) + add_library(VKstatic STATIC loader.c loader.h dirent_on_windows.c trampoline.c table_ops.h gpa_helper.h) set_target_properties(VKstatic PROPERTIES OUTPUT_NAME VKstatic) target_link_libraries(vulkan) endif() diff --git a/vk-generate.py b/vk-generate.py index 28d176b0..00327b75 100755 --- a/vk-generate.py +++ b/vk-generate.py @@ -243,7 +243,7 @@ class LayerInterceptProcSubcommand(Subcommand): # we could get the list from argv if wanted self.intercepted = [proto.name for proto in self.protos - if proto.name not in ["EnumeratePhysicalDevices"]] + if proto.name not in ["EnumeratePhysicalDevices", "GetInstanceProcAddr"]] for proto in self.protos: if proto.name == "GetProcAddr": |