SWIG: test callback & output grabbing
This commit is contained in:
@@ -289,11 +289,11 @@ endif
|
||||
# SWIG #
|
||||
########
|
||||
|
||||
ifneq ("$(wildcard src/pm3_luawrap.c)","")
|
||||
ifneq ("$(wildcard src/pm3_luawrap.cpp)","")
|
||||
SWIG_LUA_FOUND = 1
|
||||
endif
|
||||
ifeq ($(PYTHON_FOUND),1)
|
||||
ifneq ("$(wildcard src/pm3_pywrap.c)","")
|
||||
ifneq ("$(wildcard src/pm3_pywrap.cpp)","")
|
||||
SWIG_PYTHON_FOUND = 1
|
||||
endif
|
||||
endif
|
||||
@@ -305,6 +305,10 @@ PM3CFLAGS = $(CFLAGS)
|
||||
PM3CFLAGS += -I./src -I./include -I../include -I../common -I../common_fpga $(INCLUDES)
|
||||
# WIP Testing
|
||||
#PM3CFLAGS += -std=c11 -pedantic
|
||||
CXXFLAGS ?= -Wall -Werror -O3
|
||||
PM3CXXFLAGS = $(CXXFLAGS)
|
||||
PM3CXXFLAGS += -I../include -I./include -I../common $(INCLUDES)
|
||||
|
||||
|
||||
PREFIX ?= /usr/local
|
||||
ifneq (,$(findstring MINGW,$(platform)))
|
||||
@@ -330,15 +334,13 @@ endif
|
||||
|
||||
ifeq ($(SWIG_LUA_FOUND),1)
|
||||
PM3CFLAGS += -DHAVE_LUA_SWIG
|
||||
PM3CXXFLAGS += -DHAVE_LUA_SWIG
|
||||
endif
|
||||
ifeq ($(SWIG_PYTHON_FOUND),1)
|
||||
PM3CFLAGS += -DHAVE_PYTHON_SWIG
|
||||
PM3CXXFLAGS += -DHAVE_PYTHON_SWIG
|
||||
endif
|
||||
|
||||
CXXFLAGS ?= -Wall -Werror -O3
|
||||
PM3CXXFLAGS = $(CXXFLAGS)
|
||||
PM3CXXFLAGS += -I../include -I./include
|
||||
|
||||
ifeq ($(QT_FOUND),1)
|
||||
PM3CFLAGS += -DHAVE_GUI
|
||||
PM3CXXFLAGS += -DQT_NO_DEBUG
|
||||
@@ -568,7 +570,6 @@ SRCS = aiddesfire.c \
|
||||
mifare/mifaredefault.c \
|
||||
mifare/mifarehost.c \
|
||||
mifare/ndef.c \
|
||||
pm3.c \
|
||||
pm3_binlib.c \
|
||||
pm3_bitlib.c \
|
||||
preferences.c \
|
||||
@@ -605,10 +606,10 @@ SRCS += bucketsort.c \
|
||||
|
||||
SWIGSRCS =
|
||||
ifeq ($(SWIG_LUA_FOUND),1)
|
||||
SWIGSRCS += pm3_luawrap.c
|
||||
SWIGSRCS += pm3_luawrap.cpp
|
||||
endif
|
||||
ifeq ($(SWIG_PYTHON_FOUND),1)
|
||||
SWIGSRCS += pm3_pywrap.c
|
||||
SWIGSRCS += pm3_pywrap.cpp
|
||||
endif
|
||||
|
||||
# gui
|
||||
@@ -617,6 +618,7 @@ ifeq ($(QT_FOUND),1)
|
||||
else
|
||||
CXXSRCS = guidummy.cpp
|
||||
endif
|
||||
CXXSRCS += pm3.cpp
|
||||
|
||||
# OS X
|
||||
ifeq ($(platform),Darwin)
|
||||
@@ -624,7 +626,7 @@ ifeq ($(platform),Darwin)
|
||||
endif
|
||||
|
||||
OBJS = $(SRCS:%.c=$(OBJDIR)/%.o)
|
||||
OBJS += $(SWIGSRCS:%.c=$(OBJDIR)/%.o)
|
||||
OBJS += $(SWIGSRCS:%.cpp=$(OBJDIR)/%.o)
|
||||
OBJS += $(CXXSRCS:%.cpp=$(OBJDIR)/%.o)
|
||||
OBJS += $(OBJCSRCS:%.m=$(OBJDIR)/%.o)
|
||||
|
||||
@@ -756,13 +758,13 @@ endif
|
||||
# SWIG #
|
||||
########
|
||||
|
||||
src/pm3_luawrap.c: pm3.i
|
||||
src/pm3_luawrap.cpp: pm3.i
|
||||
$(info [=] GEN $@)
|
||||
$(Q)$(SWIG) -lua -o $@ $<
|
||||
$(Q)$(SWIG) -c++ -lua -o $@ $<
|
||||
|
||||
src/pm3_pywrap.c: pm3.i
|
||||
src/pm3_pywrap.cpp: pm3.i
|
||||
$(info [=] GEN $@)
|
||||
$(Q)$(SWIG) -python -o $@ $<
|
||||
$(Q)$(SWIG) -c++ -python -o $@ $<
|
||||
|
||||
########
|
||||
# misc #
|
||||
@@ -779,11 +781,12 @@ src/version.c: default_version.c
|
||||
print-%: ; @echo $* = $($*)
|
||||
|
||||
# SWIG files emit a number of warnings, we've to ignore them
|
||||
%wrap.o: %wrap.c
|
||||
$(OBJDIR)/%wrap.o : %wrap.c $(OBJDIR)/%.d
|
||||
$(info [-] CC $<)
|
||||
%wrap.o: %wrap.cpp
|
||||
$(OBJDIR)/%wrap.o : %wrap.cpp $(OBJDIR)/%.d
|
||||
$(info [-] CXX $<)
|
||||
$(Q)$(MKDIR) $(dir $@)
|
||||
$(Q)$(CC) $(DEPFLAGS) $(PM3CFLAGS) -Wno-missing-prototypes -Wno-missing-declarations -Wno-missing-field-initializers -c -o $@ $<
|
||||
# $(Q)$(CXX) $(DEPFLAGS) $(PM3CXXFLAGS) -Wno-missing-prototypes -Wno-missing-declarations -Wno-missing-field-initializers -c -o $@ $<
|
||||
$(Q)$(CXX) $(DEPFLAGS) $(PM3CXXFLAGS) -c -o $@ $<
|
||||
$(Q)$(POSTCOMPILE)
|
||||
|
||||
%.o: %.c
|
||||
@@ -808,7 +811,7 @@ $(OBJDIR)/%.o : %.m $(OBJDIR)/%.d
|
||||
$(Q)$(POSTCOMPILE)
|
||||
|
||||
DEPENDENCY_FILES = $(patsubst %.c, $(OBJDIR)/%.d, $(SRCS)) \
|
||||
$(patsubst %wrap.c, $(OBJDIR)/%.d, $(SWIGSRCS)) \
|
||||
$(patsubst %wrap.cpp, $(OBJDIR)/%.d, $(SWIGSRCS)) \
|
||||
$(patsubst %.cpp, $(OBJDIR)/%.d, $(CXXSRCS)) \
|
||||
$(patsubst %.m, $(OBJDIR)/%.d, $(OBJCSRCS))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user