From b4fb266af93ddca90a4658807e57e639529c275a Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 30 Dec 2015 13:36:49 +0100
Subject: [PATCH] Generate linux json from windows json, to avoid having two
 files

* The linux json file has a different name but this isn't important.
  Currently I'm not sure how the json/lib will be placed (will it be
  installed somewhere and the json point at /opt/renderdoc/ or what?)
---
 renderdoc/driver/vulkan/Makefile                  |  5 ++++-
 renderdoc/driver/vulkan/linux/renderdoc.json      | 15 ---------------
 .../driver/vulkan/{windows => }/renderdoc.json    |  0
 renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj  |  6 +++---
 .../vulkan/renderdoc_vulkan.vcxproj.filters       |  4 ++--
 5 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 renderdoc/driver/vulkan/linux/renderdoc.json
 rename renderdoc/driver/vulkan/{windows => }/renderdoc.json (100%)

diff --git a/renderdoc/driver/vulkan/Makefile b/renderdoc/driver/vulkan/Makefile
index 8b2911136..81b9bdcbb 100644
--- a/renderdoc/driver/vulkan/Makefile
+++ b/renderdoc/driver/vulkan/Makefile
@@ -54,7 +54,10 @@ OBJDIR_OBJECTS=$(addprefix $(OBJDIR)/, $(OBJECTS))
 
 -include $(OBJDIR_OBJECTS:.o=.d)
 
-rdoc_vulkan.a: $(OBJDIR_OBJECTS)
+renderdoc_capture.json: renderdoc.json
+	sed '{s%...renderdoc.dll%./librenderdoc.so%}' < renderdoc.json > renderdoc_capture.json
+
+rdoc_vulkan.a: $(OBJDIR_OBJECTS) renderdoc_capture.json
 	ar rcs rdoc_vulkan.a $(OBJDIR_OBJECTS)
 
 .PHONY: clean
diff --git a/renderdoc/driver/vulkan/linux/renderdoc.json b/renderdoc/driver/vulkan/linux/renderdoc.json
deleted file mode 100644
index e2522b9d1..000000000
--- a/renderdoc/driver/vulkan/linux/renderdoc.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "file_format_version" : "0.9.0",
-    "layer" : {
-        "name": "RenderDoc",
-        "type": "GLOBAL",
-        "library_path": "./librenderdoc.so",
-        "abi_versions": "1.0.0",
-        "implementation_version": "1.0.0",
-        "description": "Debugging capture layer for RenderDoc",
-        "functions": {
-          "vkGetInstanceProcAddr": "RenderDoc_GetInstanceProcAddr",
-          "vkGetDeviceProcAddr": "RenderDoc_GetDeviceProcAddr"
-        }
-    }
-}
diff --git a/renderdoc/driver/vulkan/windows/renderdoc.json b/renderdoc/driver/vulkan/renderdoc.json
similarity index 100%
rename from renderdoc/driver/vulkan/windows/renderdoc.json
rename to renderdoc/driver/vulkan/renderdoc.json
diff --git a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
index 06f7ef630..0dc7b238d 100644
--- a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
+++ b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
@@ -72,10 +72,10 @@
     <ClInclude Include="vk_state.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="windows\renderdoc.json" />
+    <None Include="renderdoc.json" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="windows\renderdoc.json">
+    <Content Include="renderdoc.json">
       <Link>renderdoc.json</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -225,4 +225,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj.filters b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj.filters
index a29bf05b3..21e667e1e 100644
--- a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj.filters
+++ b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj.filters
@@ -142,8 +142,8 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="windows\renderdoc.json">
+    <None Include="renderdoc.json">
       <Filter>Layer</Filter>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>