From ab3e98844188383b2ca2104339d872cfd98102b6 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sat, 20 Aug 2022 23:20:28 +0200 Subject: [PATCH] test of PR 1756 --- client/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/client/Makefile b/client/Makefile index ba620c84c..6817380bb 100644 --- a/client/Makefile +++ b/client/Makefile @@ -365,6 +365,8 @@ endif ####################################################################################################### CFLAGS ?= $(DEFCFLAGS) +CFLAGS += $(MYDEFS) $(MYCFLAGS) $(MYINCLUDES) + # We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env: PM3CFLAGS = $(CFLAGS) PM3CFLAGS += -g -I./src -I./include -I../include -I../common -I../common_fpga $(PM3INCLUDES) $(INCLUDES) @@ -407,6 +409,8 @@ endif PM3CFLAGS += -DHAVE_SNPRINTF CXXFLAGS ?= -Wall -Werror -O3 +CXXFLAGS += $(MYDEFS) $(MYCXXFLAGS) $(MYINCLUDES) + PM3CXXFLAGS = $(CXXFLAGS) PM3CXXFLAGS += -I../include -I./include @@ -422,6 +426,8 @@ endif PM3CXXFLAGS += -DHAVE_SNPRINTF LDFLAGS ?= $(DEFLDFLAGS) +LDFLAGS += $(MYLDFLAGS) + PM3LDFLAGS = $(LDFLAGS) ifeq ($(platform),Darwin) PM3LDFLAGS += -framework Foundation -framework AppKit @@ -753,7 +759,8 @@ all-static: $(BINS) proxmark3: $(OBJS) $(STATICLIBS) lualibs/pm3_cmd.lua lualibs/mfc_default_keys.lua $(info [=] LD $@) - $(Q)$(LD) $(PM3LDFLAGS) $(OBJS) $(STATICLIBS) $(LDLIBS) -o $@ +# $(Q)$(LD) $(PM3LDFLAGS) $(OBJS) $(STATICLIBS) $(LDLIBS) -o $@ + $(Q)$(LD) $(PM3CFLAGS) $(PM3LDFLAGS) $(OBJS) $(STATICLIBS) $(LDLIBS) -o $@ src/proxgui.cpp: src/ui/ui_overlays.h src/ui/ui_image.h