Skip to content

Commit

Permalink
Add new zint submodule.
Browse files Browse the repository at this point in the history 
Use this in preference to zint within zxing-cpp.

This means we don't need a "--recursive" submodule clone.
  • Loading branch information
@robinwatts
robinwatts committed Feb 24, 2025
1 parent 210b727 commit 98226fe
Show file tree
Hide file tree
Showing 6 changed files with 240 additions and 236 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@
[submodule "thirdparty/zxing-cpp"]
path = thirdparty/zxing-cpp
url = ../thirdparty-zxing-cpp.git
[submodule "thirdparty/zint"]
path = thirdparty/zint
url = ../thirdparty-zint.git
98 changes: 49 additions & 49 deletions Makelists
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ ZXINGCPP_DEFINES = -DZXING_USE_ZINT
ZXINGCPP_DEFINES += -DZXING_EXPERIMENTAL_API
ZXINGCPP_DEFINES += -DZINT_NO_PNG

ZXINGCPP_BUILD_CFLAGS += -Ithirdparty/zxing-cpp/zint/backend
ZXINGCPP_BUILD_CFLAGS += -Ithirdparty/zint/backend
ZXINGCPP_BUILD_CFLAGS += -Iscripts/zxing-cpp

ZXINGCPP_LIBS += -lstdc++
Expand Down Expand Up @@ -888,54 +888,54 @@ ZXINGCPP_SRC += thirdparty/zxing-cpp/core/src/WhiteRectDetector.cpp
ZXINGCPP_SRC += thirdparty/zxing-cpp/core/src/WriteBarcode.cpp
ZXINGCPP_SRC += thirdparty/zxing-cpp/core/src/ZXingC.cpp
ZXINGCPP_SRC += thirdparty/zxing-cpp/core/src/ZXingCpp.cpp
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/2of5.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/auspost.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/aztec.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/bc412.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/bmp.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/codablock.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/code.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/code1.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/code128.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/code16k.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/code49.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/common.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/composite.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/dllversion.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/dmatrix.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/dotcode.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/dxfilmedge.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/eci.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/emf.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/filemem.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/general_field.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/gif.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/gridmtx.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/gs1.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/hanxin.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/imail.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/large.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/library.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/mailmark.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/maxicode.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/medical.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/output.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/pcx.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/pdf417.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/plessey.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/png.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/postal.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/ps.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/qr.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/raster.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/reedsol.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/rss.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/svg.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/telepen.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/tif.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/ultra.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/upcean.c
ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/vector.c
ZXINGCPP_SRC += thirdparty/zint/backend/2of5.c
ZXINGCPP_SRC += thirdparty/zint/backend/auspost.c
ZXINGCPP_SRC += thirdparty/zint/backend/aztec.c
ZXINGCPP_SRC += thirdparty/zint/backend/bc412.c
ZXINGCPP_SRC += thirdparty/zint/backend/bmp.c
ZXINGCPP_SRC += thirdparty/zint/backend/codablock.c
ZXINGCPP_SRC += thirdparty/zint/backend/code.c
ZXINGCPP_SRC += thirdparty/zint/backend/code1.c
ZXINGCPP_SRC += thirdparty/zint/backend/code128.c
ZXINGCPP_SRC += thirdparty/zint/backend/code16k.c
ZXINGCPP_SRC += thirdparty/zint/backend/code49.c
ZXINGCPP_SRC += thirdparty/zint/backend/common.c
ZXINGCPP_SRC += thirdparty/zint/backend/composite.c
ZXINGCPP_SRC += thirdparty/zint/backend/dllversion.c
ZXINGCPP_SRC += thirdparty/zint/backend/dmatrix.c
ZXINGCPP_SRC += thirdparty/zint/backend/dotcode.c
ZXINGCPP_SRC += thirdparty/zint/backend/dxfilmedge.c
ZXINGCPP_SRC += thirdparty/zint/backend/eci.c
ZXINGCPP_SRC += thirdparty/zint/backend/emf.c
ZXINGCPP_SRC += thirdparty/zint/backend/filemem.c
ZXINGCPP_SRC += thirdparty/zint/backend/general_field.c
ZXINGCPP_SRC += thirdparty/zint/backend/gif.c
ZXINGCPP_SRC += thirdparty/zint/backend/gridmtx.c
ZXINGCPP_SRC += thirdparty/zint/backend/gs1.c
ZXINGCPP_SRC += thirdparty/zint/backend/hanxin.c
ZXINGCPP_SRC += thirdparty/zint/backend/imail.c
ZXINGCPP_SRC += thirdparty/zint/backend/large.c
ZXINGCPP_SRC += thirdparty/zint/backend/library.c
ZXINGCPP_SRC += thirdparty/zint/backend/mailmark.c
ZXINGCPP_SRC += thirdparty/zint/backend/maxicode.c
ZXINGCPP_SRC += thirdparty/zint/backend/medical.c
ZXINGCPP_SRC += thirdparty/zint/backend/output.c
ZXINGCPP_SRC += thirdparty/zint/backend/pcx.c
ZXINGCPP_SRC += thirdparty/zint/backend/pdf417.c
ZXINGCPP_SRC += thirdparty/zint/backend/plessey.c
ZXINGCPP_SRC += thirdparty/zint/backend/png.c
ZXINGCPP_SRC += thirdparty/zint/backend/postal.c
ZXINGCPP_SRC += thirdparty/zint/backend/ps.c
ZXINGCPP_SRC += thirdparty/zint/backend/qr.c
ZXINGCPP_SRC += thirdparty/zint/backend/raster.c
ZXINGCPP_SRC += thirdparty/zint/backend/reedsol.c
ZXINGCPP_SRC += thirdparty/zint/backend/rss.c
ZXINGCPP_SRC += thirdparty/zint/backend/svg.c
ZXINGCPP_SRC += thirdparty/zint/backend/telepen.c
ZXINGCPP_SRC += thirdparty/zint/backend/tif.c
ZXINGCPP_SRC += thirdparty/zint/backend/ultra.c
ZXINGCPP_SRC += thirdparty/zint/backend/upcean.c
ZXINGCPP_SRC += thirdparty/zint/backend/vector.c
ZXINGCPP_SRC += source/fitz/barcode.cpp

ZXINGCPP_BUILD_CFLAGS += $(ZXINGCPP_DEFINES)
Expand Down
2 changes: 1 addition & 1 deletion Makethird
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ $(OUT)/thirdparty/zxing-cpp/core/src/pdf147/%.o: thirdparty/zxing-cpp/core/src/p
$(CXX_CMD) $(LIB_CFLAGS) $(ZXINGCPP_CFLAGS) $(ZXINGCPP_BUILD_CFLAGS) $(ZXINGCPP_LANGFLAGS)
$(OUT)/thirdparty/zxing-cpp/core/src/qrcode/%.o: thirdparty/zxing-cpp/core/src/qrcode/%.cpp
$(CXX_CMD) $(LIB_CFLAGS) $(ZXINGCPP_CFLAGS) $(ZXINGCPP_BUILD_CFLAGS) $(ZXINGCPP_LANGFLAGS)
$(OUT)/thirdparty/zxing-cpp/zint/backend/%.o: thirdparty/zxing-cpp/zint/backend/%.c
$(OUT)/thirdparty/zint/backend/%.o: thirdparty/zint/backend/%.c
$(CC_CMD) $(LIB_CFLAGS) $(ZXINGCPP_CFLAGS) $(ZXINGCPP_BUILD_CFLAGS)
endif
endif
Expand Down
Loading

0 comments on commit 98226fe

Please sign in to comment.