From 7e3477aec59f818de007e5383c3eb09e228c0a54 Mon Sep 17 00:00:00 2001 From: Josh Wu Date: Wed, 23 Oct 2013 15:47:27 +0800 Subject: [Buildroot][PATCH] zxing: change the makefile to compile the barcode reader example Signed-off-by: Josh Wu --- package/zxing/zxing-makefile.patch | 22 ++++++++++++++++++---- package/zxing/zxing.mk | 4 +++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/package/zxing/zxing-makefile.patch b/package/zxing/zxing-makefile.patch index 66896bf..9a373a9 100644 --- a/package/zxing/zxing-makefile.patch +++ b/package/zxing/zxing-makefile.patch @@ -1,22 +1,36 @@ -[PATCH] add Makefile +[PATCH] add Makefile for zxing barcode reader example The scons based build system doesn't handle cross compilation, special compiler flags or (un)installation, so add a simple makefile instead which does. Signed-off-by: Peter Korsgaard +[josh.wu@atmel.com: also compile the zxing barcode example] +Signed-off-by: Josh Wu --- - cpp/core/src/Makefile | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) + cpp/core/src/Makefile | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) Index: zxing-2.0/cpp/core/src/Makefile =================================================================== --- /dev/null +++ zxing-2.0/cpp/core/src/Makefile -@@ -0,0 +1,14 @@ +@@ -0,0 +1,26 @@ +override CXXFLAGS += -I. ++override CXXFLAGS += -I$(DESTDIR)/usr/include/ImageMagick/ +SRCS := $(shell find -name '*.cpp') + ++OUT = zxing_barcode ++SOURCES = ../../magick/src/MagickBitmapSource.cpp ../../magick/src/main.cpp ++OBJECTS = ${SOURCES:.cpp=.o} ++LIBS = -lMagick++ -lMagickWand -lMagickCore -lzxing -liconv ++ ++all: $(OUT) ++ @echo Build DONE. ++ ++$(OUT): $(OBJECTS) libzxing.a ++ $(CC) $(LDFLAGS) -o $(OUT) $(OBJECTS) $(LIBS) ++ +libzxing.a: $(SRCS:.cpp=.o) + $(AR) $(ARFLAGS) $@ $^ + diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk index 851aef6..9657db0 100644 --- a/package/zxing/zxing.mk +++ b/package/zxing/zxing.mk @@ -11,7 +11,7 @@ ZXING_LICENSE_FILES = COPYING ZXING_INSTALL_STAGING = YES ifneq ($(BR2_ENABLE_LOCALE),y) -ZXING_DEPENDENCIES += libiconv +ZXING_DEPENDENCIES += libiconv imagemagick endif define ZXING_EXTRACT_CMDS @@ -32,9 +32,11 @@ endef define ZXING_INSTALL_TARGET_CMDS $(MAKE) -C $(@D)/cpp/core/src DESTDIR=$(TARGET_DIR) install + install -D $(@D)/cpp/core/src/zxing_barcode $(TARGET_DIR)/usr/bin/zxing_barcode endef define ZXING_UNINSTALL_TARGET_CMDS + rm -f $(TARGET_DIR)/usr/bin/zxing_barcode $(MAKE) -C $(@D)/cpp/core/src DESTDIR=$(TARGET_DIR) uninstall endef -- 1.7.9.5