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 pull request #103 from Gator96100/patch-1

Browse source 
Fix crashes when compiled with a different cpu
This commit is contained in:
Iceman 2017-04-23 17:25:10 +02:00 • committed by GitHub
commit a9637433d5
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/Makefile
View file

@ -7,7 +7,7 @@ include ../common/Makefile.common
CC = gcc
CXX = g++
COMMON_FLAGS += -std=c99 -O3 -march=native -g
COMMON_FLAGS += -std=c99 -O3 -g
#VPATH = ../common ../zlib
OBJDIR = obj
@ -20,7 +20,7 @@ LUAPLATFORM = generic
ifneq (,$(findstring MINGW,$(platform)))
LDLIBS += -L/mingw/lib -lgdi32
CFLAGS += -I/mingw/include -D__USE_MINGW_ANSI_STDIO=1
CFLAGS += -I/mingw/include -D__USE_MINGW_ANSI_STDIO=1 -march=x86-64
CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
MOC = $(QTDIR)/bin/moc
LUAPLATFORM = mingw
@ -46,6 +46,7 @@ else ifeq ($(platform),Darwin)
# OS X, QT5 detection needs this.
export PKG_CONFIG_PATH=/usr/local/Cellar/qt5/5.6.1-1/lib/pkgconfig/
CFLAGS += -march=native
CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
MOC = $(shell pkg-config --variable=moc_location QtCore)
@ -64,6 +65,7 @@ else ifeq ($(platform),Darwin)
LUAPLATFORM = macosx
else
CFLAGS += -march=native
CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
LUALIB += -ldl