From 0330fc30dcfb7f0b97430b565372f14bd96e461e Mon Sep 17 00:00:00 2001
From: John Schoenick <johns@valvesoftware.com>
Date: Tue, 4 Sep 2018 14:29:08 -0700
Subject: [PATCH] makefile_base.mak: Re-order config sections so
 FREETYPE_CFLAGS works

TOOLS_DIR32 needs to be defined before this chunk
---
 build/makefile_base.mak | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/build/makefile_base.mak b/build/makefile_base.mak
index d2a581b1..9c52c596 100644
--- a/build/makefile_base.mak
+++ b/build/makefile_base.mak
@@ -112,9 +112,27 @@ ifeq ($(NO_MAKEFILE_DEPENDENCY),1)
 MAKEFILE_DEP :=
 endif
 
+##
+## Global config
+##
+
+TOOLS_DIR32 := ./obj-tools32
+TOOLS_DIR64 := ./obj-tools64
+DST_BASE := ./dist
+DST_DIR := $(DST_BASE)/dist
+
 # TODO Release/debug configuration
 INSTALL_PROGRAM_FLAGS :=
 
+# All top level goals.  Lazy evaluated so they can be added below.
+GOAL_TARGETS = $(GOAL_TARGETS_LIBS)
+# Excluding goals like wine and dist that are either long running or slow per invocation
+GOAL_TARGETS_LIBS =
+# Targets that have to be asked for explicitly
+OPTIONAL_TARGETS =
+# Any explicit thing, superset
+ALL_TARGETS =
+
 ##
 ## Platform-specific variables
 ##
@@ -208,11 +226,6 @@ ifeq ($(OSX),1)
 	LICENSE := $(SRCDIR)/dist.LICENSE.osx
 endif
 
-TOOLS_DIR32 := ./obj-tools32
-TOOLS_DIR64 := ./obj-tools64
-DST_BASE := ./dist
-DST_DIR := $(DST_BASE)/dist
-
 FREETYPE := $(SRCDIR)/freetype2
 FREETYPE_OBJ32 := ./obj-freetype32
 FREETYPE_OBJ64 := ./obj-freetype64
@@ -311,15 +324,6 @@ OBJ_DIRS := $(TOOLS_DIR32)        $(TOOLS_DIR64)        \
 $(OBJ_DIRS):
 	mkdir -p $@
 
-# All top level goals.  Lazy evaluated so they can be added below.
-GOAL_TARGETS = $(GOAL_TARGETS_LIBS)
-# Excluding goals like wine and dist that are either long running or slow per invocation
-GOAL_TARGETS_LIBS =
-# Targets that have to be asked for explicitly
-OPTIONAL_TARGETS =
-# Any explicit thing, superset
-ALL_TARGETS =
-
 ##
 ## dist/install -- steps to finalize the install
 ##