From 607fe240bb1b6c81f66ab0c57e651b28f3c8d7b7 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 11 Aug 2022 01:09:19 -0700
Subject: [PATCH 1/4] Makefile: append branch name to EXENAME if not manually
 set

---
 src/Makefile            | 15 ++++++++++++++-
 src/Makefile.d/win32.mk |  6 +-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index d777cbbcc..1435d5e3e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -183,6 +183,19 @@ include Makefile.d/detect.mk
 sources:=
 makedir:=../make
 
+exe:=ringracers
+
+# append branch name by default
+ifndef EXENAME
+branch:=$(shell git symbolic-ref -q --short HEAD)
+
+# not a detached HEAD
+ifdef branch
+exe:=$(exe)_$(branch)
+endif
+
+endif
+
 # -DCOMPVERSION: flag to use comptime.h
 opts:=-DCOMPVERSION -g
 libs:=
@@ -236,7 +249,7 @@ bin:=../bin
 endif
 
 # default EXENAME (usually set by platform)
-EXENAME?=ringracers
+EXENAME?=$(exe)
 DBGNAME?=$(EXENAME).debug
 
 exe:=$(bin)/$(EXENAME)
diff --git a/src/Makefile.d/win32.mk b/src/Makefile.d/win32.mk
index 3f93ddeaf..3cb0d4f38 100644
--- a/src/Makefile.d/win32.mk
+++ b/src/Makefile.d/win32.mk
@@ -2,11 +2,7 @@
 # Mingw, if you don't know, that's Win32/Win64
 #
 
-ifndef MINGW64
-EXENAME?=ringracers.exe
-else
-EXENAME?=ringracers64.exe
-endif
+exe:=$(exe)$(if $(MINGW64),64).exe
 
 # disable dynamicbase if under msys2
 ifdef MSYSTEM

From 5be854683e027311a26a7255adcb305ca23fe02d Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 11 Aug 2022 01:11:38 -0700
Subject: [PATCH 2/4] Makefile: add EXEDIR to override bin directory

---
 src/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 1435d5e3e..228738916 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -243,17 +243,17 @@ endif
 objects:=$(addprefix $(objdir)/,$(objects))
 
 ifdef DEBUGMODE
-bin:=../bin/debug
+EXEDIR?=../bin/debug
 else
-bin:=../bin
+EXEDIR?=../bin
 endif
 
 # default EXENAME (usually set by platform)
 EXENAME?=$(exe)
 DBGNAME?=$(EXENAME).debug
 
-exe:=$(bin)/$(EXENAME)
-dbg:=$(bin)/$(DBGNAME)
+exe:=$(EXEDIR)/$(EXENAME)
+dbg:=$(EXEDIR)/$(DBGNAME)
 
 build_done==== Build is done, look for \
            $(<F) at $(abspath $(<D)) ===

From 1b4fe4e13d0c53ceeddb6e85e69df5b8dcbb9b60 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 11 Aug 2022 02:29:31 -0700
Subject: [PATCH 3/4] Makefile: add EXESUFFIX

Appends to branch name, separated by underscore, before
.exe.

Also fixed faulty $(dbg) from 607fe240b.
---
 src/Makefile            | 25 ++++++++++---------------
 src/Makefile.d/util.mk  |  3 +++
 src/Makefile.d/win32.mk |  2 +-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 228738916..9e3f6d706 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -183,19 +183,6 @@ include Makefile.d/detect.mk
 sources:=
 makedir:=../make
 
-exe:=ringracers
-
-# append branch name by default
-ifndef EXENAME
-branch:=$(shell git symbolic-ref -q --short HEAD)
-
-# not a detached HEAD
-ifdef branch
-exe:=$(exe)_$(branch)
-endif
-
-endif
-
 # -DCOMPVERSION: flag to use comptime.h
 opts:=-DCOMPVERSION -g
 libs:=
@@ -206,6 +193,9 @@ nasm_format:=
 # also defines the name as a macro to the compiler.
 passthru_opts:=
 
+# separate suffix with an underscore
+exesuffix:=$(call _,$(EXESUFFIX))
+
 include Makefile.d/platform.mk
 include Makefile.d/features.mk
 include Makefile.d/versions.mk
@@ -248,8 +238,13 @@ else
 EXEDIR?=../bin
 endif
 
-# default EXENAME (usually set by platform)
-EXENAME?=$(exe)
+# append branch name by default
+ifndef EXENAME
+base:=ringracers
+branch:=$(shell git symbolic-ref -q --short HEAD)
+EXENAME:=$(base)$(call _,$(branch))$(exesuffix)
+endif
+
 DBGNAME?=$(EXENAME).debug
 
 exe:=$(EXEDIR)/$(EXENAME)
diff --git a/src/Makefile.d/util.mk b/src/Makefile.d/util.mk
index bda68df13..6d724b3e5 100644
--- a/src/Makefile.d/util.mk
+++ b/src/Makefile.d/util.mk
@@ -91,3 +91,6 @@ endif
 endif
 
 .=$(call Ifndef,ECHO,@)
+
+# prepends an underscore if not empty
+_=$(if $(1),_$(1))
diff --git a/src/Makefile.d/win32.mk b/src/Makefile.d/win32.mk
index 3cb0d4f38..7a2434cc5 100644
--- a/src/Makefile.d/win32.mk
+++ b/src/Makefile.d/win32.mk
@@ -2,7 +2,7 @@
 # Mingw, if you don't know, that's Win32/Win64
 #
 
-exe:=$(exe)$(if $(MINGW64),64).exe
+exesuffix:=$(exesuffix)$(if $(MINGW64),64).exe
 
 # disable dynamicbase if under msys2
 ifdef MSYSTEM

From ad242cf9b95fe2ea8aac5dca7861f11929c3ec82 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Fri, 26 Aug 2022 10:46:02 -0700
Subject: [PATCH 4/4] Makefile: do not append master branch name

---
 src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index 9e3f6d706..5c4d8e686 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -242,7 +242,7 @@ endif
 ifndef EXENAME
 base:=ringracers
 branch:=$(shell git symbolic-ref -q --short HEAD)
-EXENAME:=$(base)$(call _,$(branch))$(exesuffix)
+EXENAME:=$(base)$(call _,$(filter-out master,$(branch)))$(exesuffix)
 endif
 
 DBGNAME?=$(EXENAME).debug