@@ -5,7 +5,7 @@ Description: we should always check for full path
55 Perhap we should changes the file hierarchy of zxing-cpp project instead?
66--- a/configure.ac
77+++ b/configure.ac
8- @@ -11777 ,35 +11777 ,16 @@ else
8+ @@ -11865 ,35 +11865 ,16 @@ else
99 SYSTEM_ZXING=TRUE
1010 ZXING_CFLAGS=
1111 AC_LANG_PUSH([C++])
@@ -46,7 +46,7 @@ Description: we should always check for full path
4646 FilterLibs "${ZXING_LIBS}"
4747 ZXING_LIBS="${filteredlibs}"
4848 else
49- @@ -11822 ,8 +11803 ,8 @@ else
49+ @@ -11910 ,8 +11891 ,8 @@ else
5050 save_CXXFLAGS=$CXXFLAGS
5151 CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11 $ZXING_CFLAGS"
5252 AC_COMPILE_IFELSE([AC_LANG_SOURCE([
@@ -59,16 +59,21 @@ Description: we should always check for full path
5959 matrix.set(0, 0, true);
6060--- a/cui/source/dialogs/QrCodeGenDialog.cxx
6161+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
62- @@ -19,7 +19,7 @@
62+ @@ -19,10 +19,10 @@
6363 #include <vcl/svapp.hxx>
6464
6565 #if ENABLE_ZXING
66+ - #if __has_include(<Version.h>)
67+ - #include <Version.h>
68+ + #if __has_include(<ZXing/Version.h>)
69+ + #include <ZXing/Version.h>
70+ #else
6671- #include <ZXVersion.h>
6772+ #include <ZXing/ZXVersion.h>
73+ #endif
6874 #include <rtl/strbuf.hxx>
6975
70- #ifdef __GNUC__
71- @@ -27,20 +27,20 @@
76+ @@ -31,20 +31,20 @@
7277 #pragma GCC diagnostic ignored "-Wshadow"
7378 #endif
7479
0 commit comments