From 28a8c4e7edebe50afe10d4b96c67c49d3ab8c6c9 Mon Sep 17 00:00:00 2001
From: Jeremy Hayes <jeremy@lunarg.com>
Date: Thu, 26 Nov 2015 13:32:58 -0700
Subject: layers: Fix path for vulkan header.

---
 vk_helper.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/vk_helper.py b/vk_helper.py
index 1a4df6da..e82766e2 100755
--- a/vk_helper.py
+++ b/vk_helper.py
@@ -1806,6 +1806,9 @@ def main(argv=None):
     #print(enum_val_dict)
     #print(typedef_dict)
     #print(struct_dict)
+    input_header = os.path.basename(opts.input_file)
+    if 'vulkan.h' == input_header:
+        input_header = "vulkan/vulkan.h"
     prefix = os.path.basename(opts.input_file).strip(".h")
     if prefix == "vulkan":
         prefix = "vk"
@@ -1829,7 +1832,7 @@ def main(argv=None):
     if opts.gen_struct_wrappers:
         sw = StructWrapperGen(struct_dict, os.path.basename(opts.input_file).strip(".h"), os.path.dirname(enum_sh_filename))
         #print(sw.get_class_name(struct))
-        sw.set_include_headers([os.path.basename(opts.input_file),os.path.basename(enum_sh_filename),"stdint.h","inttypes.h", "stdio.h","stdlib.h"])
+        sw.set_include_headers([input_header,os.path.basename(enum_sh_filename),"stdint.h","inttypes.h", "stdio.h","stdlib.h"])
         print("Generating struct wrapper header to %s" % sw.header_filename)
         sw.generateHeader()
         print("Generating struct wrapper class to %s" % sw.class_filename)
@@ -1840,17 +1843,17 @@ def main(argv=None):
         sw.set_no_addr(True)
         sw.generateStringHelper()
         sw.set_no_addr(False)
-        sw.set_include_headers([os.path.basename(opts.input_file),os.path.basename(enum_sh_filename),"stdint.h","stdio.h","stdlib.h","iostream","sstream","string"])
+        sw.set_include_headers([input_header,os.path.basename(enum_sh_filename),"stdint.h","stdio.h","stdlib.h","iostream","sstream","string"])
         sw.set_no_addr(True)
         sw.generateStringHelperCpp()
         sw.set_no_addr(False)
         sw.generateStringHelperCpp()
-        sw.set_include_headers(["stdio.h", "stdlib.h", "vulkan/vulkan.h"])
+        sw.set_include_headers(["stdio.h", "stdlib.h", input_header])
         sw.generateSizeHelper()
         sw.generateSizeHelperC()
     if opts.gen_struct_sizes:
         st = StructWrapperGen(struct_dict, os.path.basename(opts.input_file).strip(".h"), os.path.dirname(enum_sh_filename))
-        st.set_include_headers(["stdio.h", "stdlib.h", "vulkan/vulkan.h"])
+        st.set_include_headers(["stdio.h", "stdlib.h", input_header])
         st.generateSizeHelper()
         st.generateSizeHelperC()
     if opts.gen_cmake:
@@ -1858,7 +1861,7 @@ def main(argv=None):
         cmg.generate()
     if opts.gen_graphviz:
         gv = GraphVizGen(struct_dict, os.path.basename(opts.input_file).strip(".h"), os.path.dirname(enum_sh_filename))
-        gv.set_include_headers([os.path.basename(opts.input_file),os.path.basename(enum_sh_filename),"stdint.h","stdio.h","stdlib.h", "inttypes.h"])
+        gv.set_include_headers([input_header,os.path.basename(enum_sh_filename),"stdint.h","stdio.h","stdlib.h", "inttypes.h"])
         gv.generate()
     print("DONE!")
     #print(typedef_rev_dict)
-- 
cgit v1.2.3