From f5d0acfee8941bf95118d60b017eb648c1583787 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sun, 6 Aug 2017 13:44:57 +0000 Subject: [PATCH] Makefile: Fix building the tools on Mac. git-svn-id: https://svn.eduke32.com/eduke32@6425 1a8010ca-5511-0410-912e-c29ae57300e0 --- GNUmakefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 57cdb189b..3c4827f67 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -206,6 +206,7 @@ ifneq (0,$(LUNATIC)) endif ifeq ($(PLATFORM),DARWIN) engine_objs += osxbits.mm + engine_tools_objs += osxbits.mm ifeq ($(STARTUP_WINDOW),1) engine_editor_objs += startosx.editor.mm endif @@ -348,10 +349,6 @@ ifeq ($(RENDERTYPE),SDL) tools_targets += makesdlkeytrans endif -ifeq ($(PLATFORM),DARWIN) - tools_objs += osxbits.mm -endif - #### KenBuild (Test Game) @@ -867,6 +864,7 @@ libcache1d$(DLLSUFFIX): $(engine_src)/cache1d.cpp $(COMPILE_STATUS) $(RECIPE_IF) $(COMPILER_C) -DCACHE1D_COMPRESS_ONLY -shared -fPIC $< -o $@ $(RECIPE_RESULT_COMPILE) +# to debug the tools link phase, make a copy of this rule explicitly replacing % with the name of a tool, such as kextract %$(EXESUFFIX): $(tools_obj)/%.$o $(foreach i,tools $(tools_deps),$(call expandobjs,$i)) $(LINK_STATUS) $(RECIPE_IF) $(LINKER) -o $@ $^ $(LIBDIRS) $(LIBS) $(RECIPE_RESULT_LINK)