summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2017-02-06 17:46:58 +0100
committer/dev/humancontroller <devhc@example.com>2017-02-06 17:46:58 +0100
commita1a020bb77420bc17c81841f16b700aca1fc8296 (patch)
tree904a21a29349c176b858c5c1e388b0999ebfab5c
parent9cf075bc69c6018103d79eaf050e7a2276b7e6c7 (diff)
stop using profile/platform/architecture-specific build directories, just use "bld" (by default)
also update the .gitignore appropriately
-rw-r--r--.gitignore2
-rw-r--r--GNUmakefile6
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