RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 15:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Makefile: move mingw defines to Makefile.host"

Browse source 
This reverts commit 0665b3f40a.
This commit is contained in:
Philippe Teuwen 2020-04-26 22:30:41 +02:00
parent 20335e175d
commit f7f33f2732
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.host
View file

@ -17,12 +17,6 @@ endif
CFLAGS ?= -Wall -Werror -O3 CFLAGS ?= -Wall -Werror -O3
CFLAGS += $(MYDEFS) $(MYCFLAGS) $(MYINCLUDES) CFLAGS += $(MYDEFS) $(MYCFLAGS) $(MYINCLUDES)
ifneq (,$(findstring MINGW,$(platform)))
# Mingw uses by default Microsoft printf, we want the GNU printf (e.g. for %z)
# and setting _ISOC99_SOURCE sets internally __USE_MINGW_ANSI_STDIO=1
CFLAGS += -D_ISOC99_SOURCE
PM3CFLAGS += -mno-ms-bitfields -fexec-charset=cp850
endif
vpath %.c $(MYSRCPATHS) vpath %.c $(MYSRCPATHS)

7
tools/mfkey/Makefile
View file

@ -9,6 +9,13 @@ INSTALLTOOLS = $(BINS)
include ../../Makefile.host include ../../Makefile.host
# checking platform can be done only after Makefile.host
ifneq (,$(findstring MINGW,$(platform)))
# Mingw uses by default Microsoft printf, we want the GNU printf (e.g. for %z)
# and setting _ISOC99_SOURCE sets internally __USE_MINGW_ANSI_STDIO=1
CFLAGS += -D_ISOC99_SOURCE
endif
mfkey32 : $(OBJDIR)/mfkey32.o $(MYOBJS) mfkey32 : $(OBJDIR)/mfkey32.o $(MYOBJS)
mfkey32v2 : $(OBJDIR)/mfkey32v2.o $(MYOBJS) mfkey32v2 : $(OBJDIR)/mfkey32v2.o $(MYOBJS)
mfkey64 : $(OBJDIR)/mfkey64.o $(MYOBJS) mfkey64 : $(OBJDIR)/mfkey64.o $(MYOBJS)

7
tools/nonce2key/Makefile
View file

@ -9,4 +9,11 @@ INSTALLTOOLS = $(BINS)
include ../../Makefile.host include ../../Makefile.host
# checking platform can be done only after Makefile.host
ifneq (,$(findstring MINGW,$(platform)))
# Mingw uses by default Microsoft printf, we want the GNU printf (e.g. for %z)
# and setting _ISOC99_SOURCE sets internally __USE_MINGW_ANSI_STDIO=1
CFLAGS += -D_ISOC99_SOURCE
endif
nonce2key : $(OBJDIR)/nonce2key.o $(MYOBJS) nonce2key : $(OBJDIR)/nonce2key.o $(MYOBJS)