mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-02-04 06:24:50 +01:00
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
--- a/client/Makefile.orig 2022-01-12 02:17:19.000000000 +0800
|
|
+++ b/client/Makefile 2022-08-18 11:42:04.126934599 +0800
|
|
@@ -342,6 +342,7 @@
|
|
|
|
#######################################################################################################
|
|
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 += -I./src -I./include -I../include -I../common -I../common_fpga $(PM3INCLUDES) $(INCLUDES)
|
|
@@ -378,6 +379,7 @@
|
|
endif
|
|
|
|
CXXFLAGS ?= -Wall -O3
|
|
+CXXFLAGS += $(MYDEFS) $(MYCXXFLAGS) $(MYINCLUDES)
|
|
PM3CXXFLAGS = $(CXXFLAGS)
|
|
PM3CXXFLAGS += -I../include -I./include
|
|
|
|
@@ -391,6 +393,7 @@
|
|
endif
|
|
|
|
LDFLAGS ?= $(DEFLDFLAGS)
|
|
+LDFLAGS += $(MYLDFLAGS)
|
|
PM3LDFLAGS = $(LDFLAGS)
|
|
ifeq ($(platform),Darwin)
|
|
PM3LDFLAGS += -framework Foundation -framework AppKit
|
|
@@ -707,7 +710,7 @@
|
|
|
|
proxmark3: $(OBJS) $(STATICLIBS) lualibs/pm3_cmd.lua lualibs/mfc_default_keys.lua
|
|
$(info [=] LD $@)
|
|
- $(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
|
|
|