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 @@ - + - + renderdoc.json PreserveNewest @@ -225,4 +225,4 @@ - \ No newline at end of file + 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 @@ - + Layer - \ No newline at end of file +