github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-22 06:13:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Realign import order for compiling

Browse source 
This is needed for macports installations
This commit is contained in:
İlteriş Eroğlu 2021-08-22 20:46:54 +03:00 • committed by GitHub
commit fece7df0d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

50
client/Makefile
View file

@ -25,20 +25,21 @@ vpath %.dic dictionaries
OBJDIR = obj OBJDIR = obj
ifeq ($(USE_BREW),1) ifeq ($(USE_BREW),1)
ifdef MACPORTS_PREFIX
INCLUDES += -I$(MACPORTS_PREFIX)/include
LDLIBS += -L$(MACPORTS_PREFIX)/lib
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(MACPORTS_PREFIX)/lib/pkgconfig
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(MACPORTS_PREFIX)/libexec/qt/lib/pkgconfig
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(MACPORTS_PREFIX)/libexec/qt5/lib/pkgconfig
else
INCLUDES += -I$(BREW_PREFIX)/include INCLUDES += -I$(BREW_PREFIX)/include
LDLIBS += -L$(BREW_PREFIX)/lib LDLIBS += -L$(BREW_PREFIX)/lib
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt/lib/pkgconfig PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt/lib/pkgconfig
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt5/lib/pkgconfig PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt5/lib/pkgconfig
endif
endif endif
ifdef ($(USE_MACPORTS),1)
INCLUDES += -I$(MACPORTS_PREFIX)/include
LDLIBS += -L$(MACPORTS_PREFIX)/lib
PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(MACPORTS_PREFIX)/lib/pkgconfig
endif
PM3INCLUDES =
################### ###################
# local libraries # # local libraries #
################### ###################
@ -120,19 +121,19 @@ MBEDTLSLIBCLIENTRELPATH = ../../client
# not distributed as system library # not distributed as system library
STATICLIBS += $(AMIIBOLIB) STATICLIBS += $(AMIIBOLIB)
LDLIBS += $(AMIIBOLIBLD) LDLIBS += $(AMIIBOLIBLD)
INCLUDES += $(AMIIBOLIBINC) PM3INCLUDES += $(AMIIBOLIBINC)
## Cliparser / Argtable3 ## Cliparser / Argtable3
# not distributed as system library # not distributed as system library
STATICLIBS += $(CLIPARSERLIB) STATICLIBS += $(CLIPARSERLIB)
LDLIBS += $(CLIPARSERLIBLD) LDLIBS += $(CLIPARSERLIBLD)
INCLUDES += $(CLIPARSERLIBINC) PM3INCLUDES += $(CLIPARSERLIBINC)
## Hardnested ## Hardnested
# not distributed as system library # not distributed as system library
STATICLIBS += $(HARDNESTEDLIB) STATICLIBS += $(HARDNESTEDLIB)
LDLIBS +=$(HARDNESTEDLIBLD) LDLIBS +=$(HARDNESTEDLIBLD)
INCLUDES += $(HARDNESTEDLIBINC) PM3INCLUDES += $(HARDNESTEDLIBINC)
## Lua ## Lua
ifneq ($(SKIPLUASYSTEM),1) ifneq ($(SKIPLUASYSTEM),1)
@ -152,7 +153,7 @@ ifneq ($(SKIPLUASYSTEM),1)
endif endif
STATICLIBS += $(LUALIB) STATICLIBS += $(LUALIB)
LDLIBS += $(LUALIBLD) LDLIBS += $(LUALIBLD)
INCLUDES += $(LUALIBINC) PM3INCLUDES += $(LUALIBINC)
## Jansson ## Jansson
# Jansson section needs to be after Lua to avoid interferences on macOS if a locally incompatible Lua was available, see PR 1155 # Jansson section needs to be after Lua to avoid interferences on macOS if a locally incompatible Lua was available, see PR 1155
@ -168,25 +169,25 @@ ifneq ($(SKIPJANSSONSYSTEM),1)
endif endif
STATICLIBS += $(JANSSONLIB) STATICLIBS += $(JANSSONLIB)
LDLIBS += $(JANSSONLIBLD) LDLIBS += $(JANSSONLIBLD)
INCLUDES += $(JANSSONLIBINC) PM3INCLUDES += $(JANSSONLIBINC)
## 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
STATICLIBS += $(MBEDTLSLIB) STATICLIBS += $(MBEDTLSLIB)
LDLIBS += $(MBEDTLSLIBLD) LDLIBS += $(MBEDTLSLIBLD)
INCLUDES += $(MBEDTLSLIBINC) PM3INCLUDES += $(MBEDTLSLIBINC)
## Reveng ## Reveng
# not distributed as system library # not distributed as system library
STATICLIBS += $(REVENGLIB) STATICLIBS += $(REVENGLIB)
LDLIBS += $(REVENGLIBLD) LDLIBS += $(REVENGLIBLD)
INCLUDES += $(REVENGLIBINC) PM3INCLUDES += $(REVENGLIBINC)
## Tinycbor ## Tinycbor
# not distributed as system library # not distributed as system library
STATICLIBS += $(TINYCBORLIB) STATICLIBS += $(TINYCBORLIB)
LDLIBS += $(TINYCBORLIBLD) LDLIBS += $(TINYCBORLIBLD)
INCLUDES += $(TINYCBORLIBINC) PM3INCLUDES += $(TINYCBORLIBINC)
## Whereami ## Whereami
ifneq ($(SKIPWHEREAMISYSTEM),1) ifneq ($(SKIPWHEREAMISYSTEM),1)
@ -199,7 +200,7 @@ ifneq ($(SKIPWHEREAMISYSTEM),1)
endif endif
STATICLIBS += $(WHEREAMILIB) STATICLIBS += $(WHEREAMILIB)
LDLIBS += $(WHEREAMILIBLD) LDLIBS += $(WHEREAMILIBLD)
INCLUDES += $(WHEREAMILIBINC) PM3INCLUDES += $(WHEREAMILIBINC)
#################### ####################
# system libraries # # system libraries #
@ -227,7 +228,7 @@ ifneq ($(SKIPBT),1)
endif endif
endif endif
LDLIBS += $(BTLIBLD) LDLIBS += $(BTLIBLD)
INCLUDES += $(BTLIBINC) PM3INCLUDES += $(BTLIBINC)
## Math ## Math
LDLIBS += -lm LDLIBS += -lm
@ -258,7 +259,7 @@ ifneq ($(SKIPPYTHON),1)
endif endif
endif endif
LDLIBS += $(PYTHONLIBLD) LDLIBS += $(PYTHONLIBLD)
INCLUDES += $(PYTHONLIBINC) PM3INCLUDES += $(PYTHONLIBINC)
## QT5 (or QT4 fallback) (optional) ## QT5 (or QT4 fallback) (optional)
ifneq ($(SKIPQT),1) ifneq ($(SKIPQT),1)
@ -303,13 +304,14 @@ CXXINCLUDES += $(QTINCLUDES)
## Readline ## Readline
ifneq ($(SKIPREADLINE),1) ifneq ($(SKIPREADLINE),1)
ifeq ($(USE_BREW),1) ifeq ($(USE_BREW),1)
ifdef MACPORTS_PREFIX
INCLUDES += -I$(MACPORTS_PREFIX)/include/readline
else
LDLIBS += -L$(BREW_PREFIX)/opt/readline/lib LDLIBS += -L$(BREW_PREFIX)/opt/readline/lib
INCLUDES += -I$(BREW_PREFIX)/opt/readline/include PM3INCLUDES += -I$(BREW_PREFIX)/opt/readline/include
endif endif
ifeq ($(USE_MACPORTS),1)
PM3INCLUDES += -I$(MACPORTS_PREFIX)/include/readline
endif endif
LDLIBS += -lreadline LDLIBS += -lreadline
READLINE_FOUND = 1 READLINE_FOUND = 1
endif endif
@ -331,7 +333,7 @@ endif
CFLAGS ?= $(DEFCFLAGS) CFLAGS ?= $(DEFCFLAGS)
# We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env: # We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env:
PM3CFLAGS = $(CFLAGS) PM3CFLAGS = $(CFLAGS)
PM3CFLAGS += -I./src -I./include -I../include -I../common -I../common_fpga $(INCLUDES) PM3CFLAGS += -I./src -I./include -I../include -I../common -I../common_fpga $(PM3INCLUDES) $(INCLUDES)
# WIP Testing # WIP Testing
#PM3CFLAGS += -std=c11 -pedantic #PM3CFLAGS += -std=c11 -pedantic