diff --git a/Makefile b/Makefile index e4458bfe6..ce8686f11 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ .PHONY: all all: mkdir -p bin/ - cd renderdoc && make librenderdoc.so - cd renderdoccmd && make bin/renderdoccmd - cd qrenderdoc && qmake "CONFIG+=debug" && make + cd renderdoc && $(MAKE) librenderdoc.so + cd renderdoccmd && $(MAKE) bin/renderdoccmd + cd qrenderdoc && qmake "CONFIG+=debug" && $(MAKE) cp renderdoc/librenderdoc.so renderdoccmd/bin/renderdoccmd bin/ .PHONY: clean clean: - cd renderdoc && make clean - cd renderdoccmd && make clean + cd renderdoc && $(MAKE) clean + cd renderdoccmd && $(MAKE) clean cd qrenderdoc && rm -rf .obj Makefile* diff --git a/renderdoc/Makefile b/renderdoc/Makefile index 839a4620b..fd91d20bb 100644 --- a/renderdoc/Makefile +++ b/renderdoc/Makefile @@ -107,11 +107,11 @@ OBJDIR_DATA=$(addprefix $(OBJDIR)/, $(DATA)) .PHONY: driver/gl/rdoc_gl.a driver/gl/rdoc_gl.a: - cd driver/gl && make rdoc_gl.a + cd driver/gl && $(MAKE) rdoc_gl.a .PHONY: driver/shaders/spirv/rdoc_spirv.a driver/shaders/spirv/rdoc_spirv.a: - cd driver/shaders/spirv && make rdoc_spirv.a + cd driver/shaders/spirv && $(MAKE) rdoc_spirv.a librenderdoc.so: $(OBJDIR_OBJECTS) $(OBJDIR_DATA) $(LIBS) $(CPP) -o librenderdoc.so $^ $(LDFLAGS) @@ -119,5 +119,5 @@ librenderdoc.so: $(OBJDIR_OBJECTS) $(OBJDIR_DATA) $(LIBS) .PHONY: clean clean: rm -rf librenderdoc.so $(OBJDIR) - cd driver/gl && make clean - cd driver/shaders/spirv && make clean + cd driver/gl && $(MAKE) clean + cd driver/shaders/spirv && $(MAKE) clean