Skip to content

Commit

Permalink
chore: bump zxing-cpp to b58682b
Browse files Browse the repository at this point in the history
  • Loading branch information
Sec-ant committed Mar 18, 2024
1 parent 3ea05b5 commit a2339d3
Show file tree
Hide file tree
Showing 8 changed files with 92 additions and 135 deletions.
5 changes: 5 additions & 0 deletions .changeset/popular-dryers-hear.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"zxing-wasm": patch
---

Bump zxing-cpp to [`b58682b`](https://github.com/zxing-cpp/zxing-cpp/commit/b58682b90ff082cee8d946c73f8852574478fb09).
7 changes: 1 addition & 6 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,12 @@
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
"files": {
"ignoreUnknown": true,
"ignore": ["zxing-cpp", "docs", "dist", "build"]
},
"organizeImports": {
"enabled": true
"ignore": ["zxing-cpp"]
},
"formatter": {
"enabled": true,
"indentStyle": "space"
},
"linter": {
"enabled": true,
"rules": {
"recommended": true,
"suspicious": {
Expand Down
106 changes: 53 additions & 53 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,21 @@
"devDependencies": {
"@babel/core": "^7.24.0",
"@babel/types": "^7.24.0",
"@biomejs/biome": "1.6.0",
"@biomejs/biome": "1.6.1",
"@changesets/cli": "^2.27.1",
"@types/babel__core": "^7.20.5",
"@types/node": "^20.11.25",
"@types/node": "^20.11.28",
"concurrently": "^8.2.2",
"copy-files-from-to": "^3.9.1",
"lint-staged": "^15.2.2",
"npm-check-updates": "^16.14.15",
"npm-check-updates": "^16.14.17",
"prettier": "^3.2.5",
"rimraf": "^5.0.5",
"simple-git-hooks": "^2.10.0",
"simple-git-hooks": "^2.11.0",
"tsx": "^4.7.1",
"typedoc": "^0.25.11",
"typedoc": "^0.25.12",
"typescript": "^5.4.2",
"vite": "^5.1.5",
"vite": "^5.1.6",
"vite-plugin-babel": "^1.2.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/.clang-format
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ColumnLimit: 80
ColumnLimit: 120
PenaltyReturnTypeOnItsOwnLine: 200
ContinuationIndentWidth: 2
IndentWidth: 2
Expand Down
14 changes: 7 additions & 7 deletions src/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ zxing_add_package_stb()
set(CMAKE_CXX_STANDARD 20)

# Build options
option(BUILD_WRITERS "Build with writer support (encoders)" ON)
option(BUILD_READERS "Build with reader support (decoders)" ON)
option(ZXING_WRITERS "Build with writer support (encoders)" ON)
option(ZXING_READERS "Build with reader support (decoders)" ON)

# Build environment
set(BUILD_EMSCRIPTEN_ENVIRONMENT "web,worker" CACHE STRING "Optimize build for given emscripten runtime environment (web/node/shell/worker)")
set(ZXING_EMSCRIPTEN_ENVIRONMENT "web,worker" CACHE STRING "Optimize build for given emscripten runtime environment (web/node/shell/worker)")

# Default build type
if(NOT CMAKE_BUILD_TYPE)
Expand All @@ -29,7 +29,7 @@ add_definitions("-s DISABLE_EXCEPTION_CATCHING=0")
# Set linker flags
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
-lembind \
-s ENVIRONMENT=${BUILD_EMSCRIPTEN_ENVIRONMENT} \
-s ENVIRONMENT=${ZXING_EMSCRIPTEN_ENVIRONMENT} \
-s DISABLE_EXCEPTION_CATCHING=0 \
-s FILESYSTEM=0 \
-s EXPORT_ES6=1 \
Expand All @@ -43,23 +43,23 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
)

# Build targets
if(BUILD_READERS AND BUILD_WRITERS)
if(ZXING_READERS AND ZXING_WRITERS)
add_executable(zxing_full ZXingWasm.cpp)
target_compile_definitions(zxing_full PRIVATE READER WRITER)
target_link_libraries(zxing_full ZXing::ZXing stb::stb)
set_target_properties(zxing_full PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../full")
endif()

if(BUILD_READERS)
if(ZXING_READERS)
add_executable(zxing_reader ZXingWasm.cpp)
target_compile_definitions(zxing_reader PRIVATE READER)
target_link_libraries(zxing_reader ZXing::ZXing stb::stb)
set_target_properties(zxing_reader PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../reader")
endif()

if(BUILD_WRITERS)
if(ZXING_WRITERS)
add_executable(zxing_writer ZXingWasm.cpp)
target_compile_definitions(zxing_writer PRIVATE WRITER)
target_link_libraries(zxing_writer ZXing::ZXing stb::stb)
Expand Down
Loading

0 comments on commit a2339d3

Please sign in to comment.