Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-02-23 15:14:15 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #402 from pwpiwi/env_flags

Browse source 
Don't ignore environment variables CFLAGS and LDFLAGS
This commit is contained in:
Iceman 2017-09-29 12:01:54 +02:00 committed by GitHub
commit 0060e3daa2
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client/Makefile
View file

@ -12,14 +12,15 @@ TARFLAGS = -C .. --ignore-failed-read -rvf
RM = rm -f RM = rm -f
MV = mv MV = mv
#COMMON_FLAGS = -m32 ENV_LDFLAGS := $(LDFLAGS)
ENV_CFLAGS := $(CFLAGS)
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 = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
LUALIB = ../liblua/liblua.a LUALIB = ../liblua/liblua.a
LDFLAGS = $(COMMON_FLAGS) LDFLAGS = $(ENV_LDFLAGS)
CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I../uart -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O3 CFLAGS = $(ENV_CFLAGS) -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I../uart -I/opt/local/include -I../liblua -Wall -g -O3
CXXFLAGS = -I../include -Wall -O3 CXXFLAGS = -I../include -Wall -O3
LUAPLATFORM = generic LUAPLATFORM = generic

4
tools/mfkey/Makefile
View file

@ -1,8 +1,8 @@
VPATH = ../../common ../../common/crapto1 ../../client VPATH = ../../common ../../common/crapto1 ../../client
CC = gcc CC = gcc
LD = gcc LD = gcc
CFLAGS = -std=c99 -D_ISOC99_SOURCE -I../../include -I../../common -I../../client -Wall -O3 CFLAGS += -std=c99 -D_ISOC99_SOURCE -I../../include -I../../common -I../../client -Wall -O3
LDFLAGS = LDFLAGS +=
OBJS = crypto1.o crapto1.o parity.o util_posix.o mfkey.o OBJS = crypto1.o crapto1.o parity.o util_posix.o mfkey.o
EXES = mfkey32 mfkey64 EXES = mfkey32 mfkey64