From 289289d2a11f98a72cc93a20bc6e8a87bc8337d8 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 14 Sep 2016 16:56:45 +0200 Subject: [PATCH] Simplify root Makefile to just invoke cmake for everything * It was building qrenderdoc separately for no good reason that I can tell. --- Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 0ff7a4a35..827a37bfc 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,13 @@ SRC_DIR := $(shell pwd) DST_DIR := $(SRC_DIR)/build +CMAKE_PARAMS := -.PHONY: all clean renderdoc qrenderdoc +.PHONY: all clean -all: renderdoc qrenderdoc +all: renderdoc @ln -sf "$(DST_DIR)/bin" - -renderdoc: @mkdir -p "$(DST_DIR)" && cd "$(DST_DIR)" && \ - cmake -DENABLE_QRENDERDOC=OFF "$(SRC_DIR)" && \ - $(MAKE) - -qrenderdoc: renderdoc - @mkdir -p "$(DST_DIR)"/qrenderdoc && cd "$(DST_DIR)"/qrenderdoc && \ - qmake "CONFIG+=debug" "DESTDIR=$(DST_DIR)/bin" "$(SRC_DIR)"/qrenderdoc && \ + cmake $(CMAKE_PARAMS) "$(SRC_DIR)" && \ $(MAKE) clean: