From a1a020bb77420bc17c81841f16b700aca1fc8296 Mon Sep 17 00:00:00 2001 From: /dev/humancontroller Date: Mon, 6 Feb 2017 17:46:58 +0100 Subject: stop using profile/platform/architecture-specific build directories, just use "bld" (by default) also update the .gitignore appropriately --- .gitignore | 2 +- GNUmakefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e2bfd5d3..717e0d45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/build +/bld /GNUmakefile.local diff --git a/GNUmakefile b/GNUmakefile index 2ae8a3c9..9bd8a79a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -135,7 +135,7 @@ MOUNT_DIR=src endif ifndef BUILD_DIR -BUILD_DIR=build +BUILD_DIR=bld endif ifndef TEMPDIR @@ -228,8 +228,8 @@ endif ############################################################################# -BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH) -BR=$(BUILD_DIR)/release-$(PLATFORM)-$(ARCH) +BD=$(BUILD_DIR) # /debug-$(PLATFORM)-$(ARCH) +BR=$(BUILD_DIR) # /release-$(PLATFORM)-$(ARCH) CDIR=$(MOUNT_DIR)/client SDIR=$(MOUNT_DIR)/server RCOMMONDIR=$(MOUNT_DIR)/renderercommon -- cgit