lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-23 14:15:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

use $(MAKE) to recurse instead of just calling make directly

Browse Source
This commit is contained in:
baldurk
2015-07-20 18:55:28 +02:00
parent 3e9f47f0f3
commit 79d99cac2d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+5 -5
View File
@@ -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*
renderdoc/Makefile
+4 -4
View File
@@ -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