diff options
| author | Sebastian Reichel <sre@ring0.de> | 2018-06-29 00:56:47 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@ring0.de> | 2018-06-29 14:10:59 +0200 |
| commit | 17560f8bf49a0be2e0b490159e29f4894fe12cba (patch) | |
| tree | 50ab47990e4e2cdb521bea732b67c9471815047a | |
| parent | a5d597f4f67349195a6508b15097d1f1d5181c8d (diff) | |
| download | serial-barcode-scanner-17560f8bf49a0be2e0b490159e29f4894fe12cba.tar.bz2 | |
libcairobarcode: move to src
| -rw-r--r-- | src/libcairobarcode/.gitignore (renamed from libcairobarcode/.gitignore) | 0 | ||||
| -rw-r--r-- | src/libcairobarcode/Makefile (renamed from libcairobarcode/Makefile) | 0 | ||||
| -rw-r--r-- | src/libcairobarcode/code39.vala (renamed from libcairobarcode/code39.vala) | 2 | ||||
| -rw-r--r-- | src/libcairobarcode/ean.vala (renamed from libcairobarcode/ean.vala) | 2 | ||||
| -rw-r--r-- | src/libcairobarcode/error.vala (renamed from libcairobarcode/error.vala) | 0 | ||||
| -rw-r--r-- | src/pdf-stock/Makefile | 6 |
6 files changed, 5 insertions, 5 deletions
diff --git a/libcairobarcode/.gitignore b/src/libcairobarcode/.gitignore index 8721023..8721023 100644 --- a/libcairobarcode/.gitignore +++ b/src/libcairobarcode/.gitignore diff --git a/libcairobarcode/Makefile b/src/libcairobarcode/Makefile index b51cf30..b51cf30 100644 --- a/libcairobarcode/Makefile +++ b/src/libcairobarcode/Makefile diff --git a/libcairobarcode/code39.vala b/src/libcairobarcode/code39.vala index dd3d8c5..ca5451c 100644 --- a/libcairobarcode/code39.vala +++ b/src/libcairobarcode/code39.vala @@ -19,7 +19,7 @@ public class Code39 { double height; /* 0 = wide black, 1 = narrow black, 2 = wide white, 3 = narrow white */ - static const uint32[] lookup_table = { + const uint32[] lookup_table = { 0x1d8cd, 0xd9dc, 0x1c9dc, 0xc9dd, 0x1d8dc, 0xd8dd, 0x1c8dd, 0x1d9cc, 0xd9cd, 0x1c9cd, 0xdd9c, 0x1cd9c, 0xcd9d, 0x1dc9c, 0xdc9d, 0x1cc9d, 0x1dd8c, 0xdd8d, 0x1cd8d, 0x1dc8d, 0xddd8, 0x1cdd8, 0xcdd9, 0x1dcd8, diff --git a/libcairobarcode/ean.vala b/src/libcairobarcode/ean.vala index 9709987..4a4f621 100644 --- a/libcairobarcode/ean.vala +++ b/src/libcairobarcode/ean.vala @@ -21,7 +21,7 @@ public class EAN { double basex; double basey; - static const uint8[] C = { 0x00, 0x0b, 0x0d, 0x0e, 0x13, 0x19, 0x1c, 0x15, 0x16, 0x1a }; + const uint8[] C = { 0x00, 0x0b, 0x0d, 0x0e, 0x13, 0x19, 0x1c, 0x15, 0x16, 0x1a }; static uint8[,] lookup = { { 0x0d, 0x19, 0x13, 0x3d, 0x23, 0x31, 0x2f, 0x3b, 0x37, 0x0b }, /* L */ diff --git a/libcairobarcode/error.vala b/src/libcairobarcode/error.vala index f81df91..f81df91 100644 --- a/libcairobarcode/error.vala +++ b/src/libcairobarcode/error.vala diff --git a/src/pdf-stock/Makefile b/src/pdf-stock/Makefile index c310c65..4e8f472 100644 --- a/src/pdf-stock/Makefile +++ b/src/pdf-stock/Makefile @@ -1,18 +1,18 @@ include ../../config.mk -LIBCAIROBARCODE=-X -I../../libcairobarcode -X -L../../libcairobarcode -X -lcairobarcode +LIBCAIROBARCODE=-X -I../libcairobarcode -X -L../libcairobarcode -X -lcairobarcode all: pdf-stock @echo > /dev/null -pdf-stock: main.vala pdf-stock.vala ../database/db-interface.vala ../price.vapi ../../libcairobarcode/libcairobarcode.vapi +pdf-stock: main.vala pdf-stock.vala ../database/db-interface.vala ../price.vapi ../libcairobarcode/libcairobarcode.vapi ${VALAC} -X -D'GETTEXT_PACKAGE="shopsystem"' -X -w ${LIBCAIROBARCODE} -o $@ --pkg cairo --pkg pangocairo --pkg gio-2.0 --pkg posix $^ test: test.vala pdf-stock-interface.vala ${VALAC} -X -D'GETTEXT_PACKAGE="shopsystem"' -X -w -o $@ --pkg gio-2.0 $^ run: pdf-stock - LD_LIBRARY_PATH=../../libcairobarcode ./pdf-stock + LD_LIBRARY_PATH=../libcairobarcode ./pdf-stock clean: rm -rf pdf-stock test |