From: martin.holst@gmail.com <martin.holst@gmail.com@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Tue, 25 Jun 2013 20:25:18 +0000 (+0000)
Subject: Attempt to make the makefile generic, so lua compilation works well also under windows
X-Git-Tag: v1.0.0~80^2~18
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/30a46ed86a7c531b5d2601d6ef74c717b28c330d

Attempt to make the makefile generic, so lua compilation works well also under windows
---

diff --git a/client/Makefile b/client/Makefile
index 71da64fd..0ce06975 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -16,11 +16,13 @@ OBJDIR = obj
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O4 
+LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 MOC = $(QTDIR)/bin/moc
+LUAPLATFORM = mingw
 else ifeq ($(platform),Darwin)
 CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
 QTLDLIBS = -framework QtGui -framework QtCore
@@ -29,6 +31,7 @@ else
 CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 MOC = $(shell pkg-config --variable=moc_location QtCore)
+LUAPLATFORM = linux
 endif
 
 
@@ -131,7 +134,7 @@ install_kext: Info.plist
 	@echo "*** You may need to reboot for the kext to take effect."
 
 lua_build:
-	@echo Compiling liblua;
-	cd ../liblua && make linux
+	@echo Compiling liblua, using platform $(LUAPLATFORM)
+	cd ../liblua && make $(LUAPLATFORM)
 
 .PHONY: all clean