Skip to content

Commit

Permalink
use liblzma for compression, remove 7zip SDK from codebase
Browse files Browse the repository at this point in the history
  • Loading branch information
DyXel committed Jun 29, 2022
1 parent 579d9e5 commit eead467
Show file tree
Hide file tree
Showing 16 changed files with 22 additions and 5,310 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/x64-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 1
- name: Install dependencies
run: |
sudo apt-get --no-install-recommends --yes install libfmt-dev libgit2-dev libsqlite3-dev libssl-dev ninja-build
sudo apt-get --no-install-recommends --yes install libfmt-dev liblzma-dev libgit2-dev libsqlite3-dev libssl-dev ninja-build
pip install meson
- name: Get boost
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/x86-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
with:
vcpkgGitCommitId: e809a42f87565e803b2178a0c11263f462d1800a
vcpkgTriplet: ${{ env.VCPKG_TRIPLET }}
vcpkgArguments: boost-asio boost-filesystem boost-date-time boost-interprocess boost-json fmt libgit2 openssl sqlite3
vcpkgArguments: boost-asio boost-filesystem boost-date-time boost-interprocess boost-json fmt libgit2 liblzma openssl sqlite3
- name: Fix Boost.Filesystem library location
shell: bash
run: |
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ RUN apt-get update && \
apt-get --no-install-recommends --yes install \
ca-certificates \
libfmt7 \
liblzma5 \
libgit2-1.1 \
libsqlite3-0 \
libssl1.1 \
Expand All @@ -18,6 +19,7 @@ RUN apt-get update && \
apt-get --no-install-recommends --yes install \
build-essential \
libfmt-dev \
liblzma-dev \
libgit2-dev \
libsqlite3-dev \
libssl-dev \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ This project depends on the following libraries:
* json
* fmt
* libgit2
* liblzma (provided as xz in some systems)
* openssl
* sqlite3

Expand Down
6 changes: 2 additions & 4 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ boost_dep = dependency('boost', version : '>=1.78', modules : ['filesystem'],
dl_dep = meson.get_compiler('cpp').find_library('dl', required : false)
fmt_dep = dependency('fmt', version : '>=6.0.0', static : static_deps)
libgit2_dep = dependency('libgit2', static : static_deps)
lzma_dep = dependency('liblzma')
openssl_dep = dependency('openssl', static : static_deps)
rt_dep = meson.get_compiler('cpp').find_library('rt', required : false)
sqlite3_dep = dependency('sqlite3', static : static_deps)
Expand Down Expand Up @@ -61,9 +62,6 @@ multirole_src_files = files([
'src/Multirole/YGOPro/Deck.cpp',
'src/Multirole/YGOPro/Replay.cpp',
'src/Multirole/YGOPro/StringUtils.cpp',
'src/Multirole/YGOPro/LZMA/Alloc.c',
'src/Multirole/YGOPro/LZMA/LzFind.c',
'src/Multirole/YGOPro/LZMA/LzmaEnc.c'
])

hornet_src_files = files([
Expand All @@ -73,7 +71,6 @@ hornet_src_files = files([

executable('multirole', multirole_src_files,
c_args: [
'-D_7ZIP_ST',
'-D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS',
'-D_WINSOCK_DEPRECATED_NO_WARNINGS',
'-DNOMINMAX'
Expand All @@ -89,6 +86,7 @@ executable('multirole', multirole_src_files,
dl_dep,
fmt_dep,
libgit2_dep,
lzma_dep,
openssl_dep,
rt_dep,
sqlite3_dep,
Expand Down
Loading

0 comments on commit eead467

Please sign in to comment.