Fix Makefile

This commit is contained in:
Philippe Teuwen 2020-11-02 15:56:14 +01:00
commit e83c585333

View file

@ -29,26 +29,31 @@ endif
AMIIBOLIBPATH = ./deps/amiitool AMIIBOLIBPATH = ./deps/amiitool
AMIIBOLIBINC = -I$(AMIIBOLIBPATH) AMIIBOLIBINC = -I$(AMIIBOLIBPATH)
AMIIBOLIB = $(AMIIBOLIBPATH)/libamiibo.a AMIIBOLIB = $(AMIIBOLIBPATH)/libamiibo.a
AMIIBOLIBLD =
## Cliparser / Argtable3 ## Cliparser / Argtable3
CLIPARSERLIBPATH = ./deps/cliparser CLIPARSERLIBPATH = ./deps/cliparser
CLIPARSERLIBINC = -I$(CLIPARSERLIBPATH) CLIPARSERLIBINC = -I$(CLIPARSERLIBPATH)
CLIPARSERLIB = $(CLIPARSERLIBPATH)/libcliparser.a CLIPARSERLIB = $(CLIPARSERLIBPATH)/libcliparser.a
CLIPARSERLIBLD =
## Hardnested ## Hardnested
HARDNESTEDLIBPATH = ./deps/hardnested HARDNESTEDLIBPATH = ./deps/hardnested
HARDNESTEDLIBINC = -I$(HARDNESTEDLIBPATH) HARDNESTEDLIBINC = -I$(HARDNESTEDLIBPATH)
HARDNESTEDLIB = $(HARDNESTEDLIBPATH)/libhardnested.a HARDNESTEDLIB = $(HARDNESTEDLIBPATH)/libhardnested.a
HARDNESTEDLIBLD =
## Jansson ## Jansson
JANSSONLIBPATH = ./deps/jansson JANSSONLIBPATH = ./deps/jansson
JANSSONLIBINC = -I$(JANSSONLIBPATH) JANSSONLIBINC = -I$(JANSSONLIBPATH)
JANSSONLIB = $(JANSSONLIBPATH)/libjansson.a JANSSONLIB = $(JANSSONLIBPATH)/libjansson.a
JANSSONLIBLD =
## Lua ## Lua
LUALIBPATH = ./deps/liblua LUALIBPATH = ./deps/liblua
LUALIBINC = -I$(LUALIBPATH) LUALIBINC = -I$(LUALIBPATH)
LUALIB = $(LUALIBPATH)/liblua.a LUALIB = $(LUALIBPATH)/liblua.a
LUALIBLD =
LUAPLATFORM = generic LUAPLATFORM = generic
ifneq (,$(findstring MINGW,$(platform))) ifneq (,$(findstring MINGW,$(platform)))
LUAPLATFORM = mingw LUAPLATFORM = mingw
@ -56,7 +61,7 @@ else
ifeq ($(platform),Darwin) ifeq ($(platform),Darwin)
LUAPLATFORM = macosx LUAPLATFORM = macosx
else else
LUALIB += -ldl LUALIBLD += -ldl
LUAPLATFORM = linux LUAPLATFORM = linux
endif endif
endif endif
@ -65,16 +70,19 @@ endif
REVENGLIBPATH = ./deps/reveng REVENGLIBPATH = ./deps/reveng
REVENGLIBINC = -I$(REVENGLIBPATH) REVENGLIBINC = -I$(REVENGLIBPATH)
REVENGLIB = $(REVENGLIBPATH)/libreveng.a REVENGLIB = $(REVENGLIBPATH)/libreveng.a
REVENGLIBLD =
## Tinycbor ## Tinycbor
TINYCBORLIBPATH = ./deps/tinycbor TINYCBORLIBPATH = ./deps/tinycbor
TINYCBORLIBINC = -I$(TINYCBORLIBPATH) TINYCBORLIBINC = -I$(TINYCBORLIBPATH)
TINYCBORLIB = $(TINYCBORLIBPATH)/tinycbor.a TINYCBORLIB = $(TINYCBORLIBPATH)/tinycbor.a
TINYCBORLIBLD =
## Whereami ## Whereami
WHEREAMILIBPATH = ./deps/whereami WHEREAMILIBPATH = ./deps/whereami
WHEREAMILIBINC = -I$(WHEREAMILIBPATH) WHEREAMILIBINC = -I$(WHEREAMILIBPATH)
WHEREAMILIB = $(WHEREAMILIBPATH)/libwhereami.a WHEREAMILIB = $(WHEREAMILIBPATH)/libwhereami.a
WHEREAMILIBLD =
########################## ##########################
# common local libraries # # common local libraries #
@ -91,17 +99,20 @@ MBEDTLSLIB = $(OBJDIR)/libmbedtls.a
## Amiibo ## Amiibo
# not distributed as system library # not distributed as system library
LDLIBS += $(AMIIBOLIB) STATICLIBS += $(AMIIBOLIB)
LDLIBS += $(AMIIBOLIBLD)
INCLUDES += $(AMIIBOLIBINC) INCLUDES += $(AMIIBOLIBINC)
## Cliparser / Argtable3 ## Cliparser / Argtable3
# not distributed as system library # not distributed as system library
LDLIBS += $(CLIPARSERLIB) STATICLIBS += $(CLIPARSERLIB)
LDLIBS += $(CLIPARSERLIBLD)
INCLUDES += $(CLIPARSERLIBINC) INCLUDES += $(CLIPARSERLIBINC)
## Hardnested ## Hardnested
# not distributed as system library # not distributed as system library
LDLIBS += $(HARDNESTEDLIB) STATICLIBS += $(HARDNESTEDLIB)
LDLIBS +=$(HARDNESTEDLIBLD)
INCLUDES += $(HARDNESTEDLIBINC) INCLUDES += $(HARDNESTEDLIBINC)
## Jansson ## Jansson
@ -109,12 +120,14 @@ ifneq ($(SKIPJANSSONSYSTEM),1)
JANSSONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags jansson 2>/dev/null) JANSSONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags jansson 2>/dev/null)
JANSSONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs jansson 2>/dev/null) JANSSONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs jansson 2>/dev/null)
ifneq ($(JANSSONLDLIBS),) ifneq ($(JANSSONLDLIBS),)
JANSSONLIB = $(JANSSONLDLIBS) JANSSONLIB =
JANSSONLIBLD = $(JANSSONLDLIBS)
JANSSONLIBINC = $(JANSSONINCLUDES) JANSSONLIBINC = $(JANSSONINCLUDES)
JANSSON_FOUND = 1 JANSSON_FOUND = 1
endif endif
endif endif
LDLIBS += $(JANSSONLIB) STATICLIBS += $(JANSSONLIB)
LDLIBS += $(JANSSONLIBLD)
INCLUDES += $(JANSSONLIBINC) INCLUDES += $(JANSSONLIBINC)
## Lua ## Lua
@ -122,38 +135,45 @@ ifneq ($(SKIPLUASYSTEM),1)
LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua5.2 2>/dev/null) LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua5.2 2>/dev/null)
LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua5.2 2>/dev/null) LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua5.2 2>/dev/null)
ifneq ($(LUALDLIBS),) ifneq ($(LUALDLIBS),)
LUALIB = $(LUALDLIBS) LUALIB =
LUALIBLD = $(LUALDLIBS)
LUALIBINC = $(LUAINCLUDES) LUALIBINC = $(LUAINCLUDES)
LUA_FOUND = 1 LUA_FOUND = 1
endif endif
endif endif
LDLIBS += $(LUALIB) STATICLIBS += $(LUALIB)
LDLIBS += $(LUALIBLD)
INCLUDES += $(LUALIBINC) INCLUDES += $(LUALIBINC)
## mbed TLS ## mbed TLS
# system library cannot be used because it is compiled by default without CMAC support # system library cannot be used because it is compiled by default without CMAC support
LDLIBS +=$(MBEDTLSLIB) STATICLIBS += $(MBEDTLSLIB)
LDLIBS += $(MBEDTLSLIBLD)
INCLUDES += $(MBEDTLSLIBINC) INCLUDES += $(MBEDTLSLIBINC)
## Reveng ## Reveng
# not distributed as system library # not distributed as system library
LDLIBS += $(REVENGLIB) STATICLIBS += $(REVENGLIB)
LDLIBS += $(REVENGLIBLD)
INCLUDES += $(REVENGLIBINC) INCLUDES += $(REVENGLIBINC)
## Tinycbor ## Tinycbor
# not distributed as system library # not distributed as system library
LDLIBS += $(TINYCBORLIB) STATICLIBS += $(TINYCBORLIB)
LDLIBS += $(TINYCBORLIBLD)
INCLUDES += $(TINYCBORLIBINC) INCLUDES += $(TINYCBORLIBINC)
## Whereami ## Whereami
ifneq ($(SKIPWHEREAMISYSTEM),1) ifneq ($(SKIPWHEREAMISYSTEM),1)
ifneq (,$(wildcard /usr/include/whereami.h)) ifneq (,$(wildcard /usr/include/whereami.h))
WHEREAMILIB = -lwhereami WHEREAMILIB =
WHEREAMILIBLD = -lwhereami
WHEREAMILIBINC = WHEREAMILIBINC =
WHEREAMI_FOUND = 1 WHEREAMI_FOUND = 1
endif endif
endif endif
LDLIBS += $(WHEREAMILIB) STATICLIBS += $(WHEREAMILIB)
LDLIBS += $(WHEREAMILIBLD)
INCLUDES += $(WHEREAMILIBINC) INCLUDES += $(WHEREAMILIBINC)
#################### ####################
@ -176,12 +196,12 @@ ifneq ($(SKIPBT),1)
BTINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags bluez 2>/dev/null) BTINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags bluez 2>/dev/null)
BTLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs bluez 2>/dev/null) BTLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs bluez 2>/dev/null)
ifneq ($(BTLDLIBS),) ifneq ($(BTLDLIBS),)
BTLIB = $(BTLDLIBS) BTLIBLD = $(BTLDLIBS)
BTLIBINC = $(BTINCLUDES) BTLIBINC = $(BTINCLUDES)
BT_FOUND = 1 BT_FOUND = 1
endif endif
endif endif
LDLIBS += $(BTLIB) LDLIBS += $(BTLIBLD)
INCLUDES += $(BTLIBINC) INCLUDES += $(BTLIBINC)
## Math ## Math
@ -198,7 +218,7 @@ ifneq ($(SKIPPYTHON),1)
PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3 2>/dev/null) PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3 2>/dev/null)
PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3 2>/dev/null) PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3 2>/dev/null)
ifneq ($(PYTHONLDLIBS),) ifneq ($(PYTHONLDLIBS),)
PYTHONLIB = $(PYTHONLDLIBS) PYTHONLIBLD = $(PYTHONLDLIBS)
PYTHONLIBINC = $(PYTHONINCLUDES) PYTHONLIBINC = $(PYTHONINCLUDES)
PYTHON_FOUND = 1 PYTHON_FOUND = 1
else else
@ -206,13 +226,13 @@ ifneq ($(SKIPPYTHON),1)
PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3-embed 2>/dev/null) PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3-embed 2>/dev/null)
PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3-embed 2>/dev/null) PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3-embed 2>/dev/null)
ifneq ($(PYTHONLDLIBS),) ifneq ($(PYTHONLDLIBS),)
PYTHONLIB = $(PYTHONLDLIBS) PYTHONLIBLD = $(PYTHONLDLIBS)
PYTHONLIBINC = $(PYTHONINCLUDES) PYTHONLIBINC = $(PYTHONINCLUDES)
PYTHON_FOUND = 1 PYTHON_FOUND = 1
endif endif
endif endif
endif endif
LDLIBS += $(PYTHONLIB) LDLIBS += $(PYTHONLIBLD)
INCLUDES += $(PYTHONLIBINC) INCLUDES += $(PYTHONLIBINC)
## QT5 (or QT4 fallback) (optional) ## QT5 (or QT4 fallback) (optional)
@ -584,10 +604,9 @@ all: $(BINS)
all-static: LDLIBS:=-static $(LDLIBS) all-static: LDLIBS:=-static $(LDLIBS)
all-static: $(BINS) all-static: $(BINS)
proxmark3: $(AMIIBOLIB) $(CLIPARSERLIB) $(JANSSONLIB) $(HARDNESTEDLIB) $(LUALIB) $(MBEDTLSLIB) $(REVENGLIB) $(TINYCBORLIB) $(WHEREAMILIB) proxmark3: $(OBJS) $(STATICLIBS) lualibs/pm3_cmd.lua lualibs/mfc_default_keys.lua
proxmark3: $(OBJS) lualibs/pm3_cmd.lua lualibs/mfc_default_keys.lua
$(info [=] LD $@) $(info [=] LD $@)
$(Q)$(LD) $(PM3LDFLAGS) $(OBJS) $(LDLIBS) -o $@ $(Q)$(LD) $(PM3LDFLAGS) $(OBJS) $(STATICLIBS) $(LDLIBS) -o $@
src/proxgui.cpp: src/ui/ui_overlays.h src/proxgui.cpp: src/ui/ui_overlays.h