github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of github.com:RfidResearchGroup/proxmark3

Browse source 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  Fix compilation under MacOSX
This commit is contained in:
Philippe Teuwen 2019-07-10 21:49:54 +02:00
commit e53ac8b715
6 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/Makefile
View file

@ -31,7 +31,12 @@ platform = $(shell uname)
VPATH = ../common ../zlib ../uart VPATH = ../common ../zlib ../uart
OBJDIR = obj OBJDIR = obj
LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm LDLIBS =
ifneq ($(platform),Darwin)
LDLIBS += -L/opt/local/lib
endif
LDLIBS += -L/usr/local/lib -lreadline -lpthread -lm
# RPi Zero gcc requires -latomic # RPi Zero gcc requires -latomic
# but MacOSX /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld # but MacOSX /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
# doesn't recognize option --as-needed # doesn't recognize option --as-needed

13
client/jansson/Makefile
View file

@ -36,15 +36,26 @@ CFILES = $(filter %.c, $(libjansson_la_SOURCES))
CMDOBJS = $(CFILES:%.c=%.o) CMDOBJS = $(CFILES:%.c=%.o)
CLEAN = $(CMDOBJS) CLEAN = $(CMDOBJS)
platform = $(shell uname)
CC= gcc CC= gcc
CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function -Wno-format-truncation CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
ifneq ($(platform),Darwin)
CFLAGS += -Wno-format-truncation
endif
LDFLAGS= $(SYSLDFLAGS) $(libjansson_la_LDFLAGS) LDFLAGS= $(SYSLDFLAGS) $(libjansson_la_LDFLAGS)
LIBS= $(SYSLIBS) $(MYLIBS) LIBS= $(SYSLIBS) $(MYLIBS)
DEFAULT_INCLUDES = -I. DEFAULT_INCLUDES = -I.
DEFS = -DHAVE_STDINT_H DEFS = -DHAVE_STDINT_H
ifeq ($(platform),Darwin)
AR= /usr/bin/ar rcs
RANLIB= /usr/bin/ranlib
else
AR= ar rcs AR= ar rcs
RANLIB= ranlib RANLIB= ranlib
endif
RM= rm -f RM= rm -f
TST= echo TST= echo

7
client/tinycbor/Makefile
View file

@ -19,14 +19,21 @@ CFILES = $(filter %.c, $(tinycbor_SOURCES))
CMDOBJS = $(CFILES:%.c=%.o) CMDOBJS = $(CFILES:%.c=%.o)
CLEAN = $(CMDOBJS) CLEAN = $(CMDOBJS)
platform = $(shell uname)
CC= gcc CC= gcc
CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
LIBS= $(SYSLIBS) $(MYLIBS) LIBS= $(SYSLIBS) $(MYLIBS)
DEFAULT_INCLUDES = -I. -I.. DEFAULT_INCLUDES = -I. -I..
DEFS = -DHAVE_STDINT_H DEFS = -DHAVE_STDINT_H
ifeq ($(platform),Darwin)
AR= /usr/bin/ar rcs
RANLIB= /usr/bin/ranlib
else
AR= ar rcs AR= ar rcs
RANLIB= ranlib RANLIB= ranlib
endif
RM= rm -f RM= rm -f
TST= echo TST= echo

6
common/Makefile.common
View file

@ -43,15 +43,13 @@ TARFLAGS = -C .. -rvf
# amount of shell command line parsing going on. echo "" on # amount of shell command line parsing going on. echo "" on
# Windows yields literal "", on Linux yields an empty line # Windows yields literal "", on Linux yields an empty line
ifeq ($(shell echo ""),) ifeq ($(shell echo ""),)
# This is probably a proper system, so we can use uname
UNAME := $(shell uname)
DELETE=rm -rf DELETE=rm -rf
MOVE=mv MOVE=mv
COPY=cp COPY=cp
PATHSEP=/ PATHSEP=/
FLASH_TOOL=client/flasher FLASH_TOOL=client/flasher
DETECTED_OS=$(UNAME) # This is probably a proper system, so we can use uname
DETECTED_OS=$(platform)
else else
# Assume that we are running on Windows. # Assume that we are running on Windows.

7
common/mbedtls/Makefile
View file

@ -59,6 +59,8 @@ CFILES = $(filter %.c, $(mbedtls_SOURCES))
CMDOBJS = $(CFILES:%.c=%.o) CMDOBJS = $(CFILES:%.c=%.o)
CLEAN = $(CMDOBJS) CLEAN = $(CMDOBJS)
platform = $(shell uname)
CC= gcc CC= gcc
CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function
LDFLAGS= $(SYSLDFLAGS) $(mbedtls_LDFLAGS) LDFLAGS= $(SYSLDFLAGS) $(mbedtls_LDFLAGS)
@ -66,8 +68,13 @@ LIBS= $(SYSLIBS) $(MYLIBS)
DEFAULT_INCLUDES = -I. -I.. DEFAULT_INCLUDES = -I. -I..
DEFS = -DHAVE_STDINT_H DEFS = -DHAVE_STDINT_H
ifeq ($(platform),Darwin)
AR= /usr/bin/ar rcs
RANLIB= /usr/bin/ranlib
else
AR= ar rcs AR= ar rcs
RANLIB= ranlib RANLIB= ranlib
endif
RM= rm -f RM= rm -f
TST= echo TST= echo

7
liblua/Makefile
View file

@ -12,13 +12,20 @@ endif
# Your platform. See PLATS for possible values. # Your platform. See PLATS for possible values.
PLAT= none PLAT= none
platform= $(shell uname)
CC= gcc CC= gcc
CFLAGS= -O3 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS) CFLAGS= -O3 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
LIBS= -lm $(SYSLIBS) $(MYLIBS) LIBS= -lm $(SYSLIBS) $(MYLIBS)
ifeq ($(platform),Darwin)
AR= /usr/bin/ar rc
RANLIB= /usr/bin/ranlib
else
AR= ar rc AR= ar rc
RANLIB= ranlib RANLIB= ranlib
endif
RM= rm -f RM= rm -f
SYSCFLAGS= SYSCFLAGS=