suyu/Yucom
25
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makefile_base.mak: Re-order config sections so FREETYPE_CFLAGS works

Browse source 
TOOLS_DIR32 needs to be defined before this chunk
This commit is contained in:
John Schoenick 2018-09-04 14:29:08 -07:00
parent c6e558f947
commit 0330fc30dc
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
build/makefile_base.mak
View file

@ -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
##