mirror of
https://github.com/thepigeongenerator/mcaselector-lite.git
synced 2025-12-17 09:25:44 +01:00
add libarchive to the dependencies.
library for handling archives, like gzip, xz, zstd, et cetera. This'll be crucial later on.
This commit is contained in:
8
.github/workflows/ci.yaml
vendored
8
.github/workflows/ci.yaml
vendored
@@ -11,7 +11,7 @@ on:
|
|||||||
env:
|
env:
|
||||||
VCPKG_DISABLE_METRICS: 1
|
VCPKG_DISABLE_METRICS: 1
|
||||||
VCPKG_ROOT: ${{github.workspace}}/.vcpkg
|
VCPKG_ROOT: ${{github.workspace}}/.vcpkg
|
||||||
DEPS_VCPKG: glfw3:x64-linux-dynamic glfw3:x64-mingw-static
|
DEPS_VCPKG: glfw3:x64-linux-dynamic glfw3:x64-mingw-static libarchive:x64-linux-dynamic libarchive:x64-mingw-static
|
||||||
WINEPREFIX: /tmp/wineprefix
|
WINEPREFIX: /tmp/wineprefix
|
||||||
jobs:
|
jobs:
|
||||||
#
|
#
|
||||||
@@ -40,7 +40,13 @@ jobs:
|
|||||||
# setup vcpkg if the cache didn't hit
|
# setup vcpkg if the cache didn't hit
|
||||||
- if: steps.vcpkg-cache.outputs.cache-hit != 'true'
|
- if: steps.vcpkg-cache.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
|
if [ -d "$VCPKG_ROOT" ]; then
|
||||||
|
cd "$VCPKG_ROOT"
|
||||||
|
git pull -f
|
||||||
|
cd -
|
||||||
|
else
|
||||||
git clone https://github.com/microsoft/vcpkg.git "$VCPKG_ROOT"
|
git clone https://github.com/microsoft/vcpkg.git "$VCPKG_ROOT"
|
||||||
|
fi
|
||||||
"$VCPKG_ROOT/bootstrap-vcpkg.sh"
|
"$VCPKG_ROOT/bootstrap-vcpkg.sh"
|
||||||
"$VCPKG_ROOT/vcpkg" install $DEPS_VCPKG
|
"$VCPKG_ROOT/vcpkg" install $DEPS_VCPKG
|
||||||
- name: compilation (using bulk compilation)
|
- name: compilation (using bulk compilation)
|
||||||
|
|||||||
4
makefile
4
makefile
@@ -63,8 +63,8 @@ $(error neither VCPKG_ROOT nor pkg-config were available!)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# use pkg-config to set the include and linker information
|
# use pkg-config to set the include and linker information
|
||||||
CFLAGS += $(shell pkg-config --cflags glfw3)
|
CFLAGS += $(shell pkg-config --cflags glfw3 libarchive)
|
||||||
LDFLAGS += $(shell pkg-config --libs glfw3)
|
LDFLAGS += $(shell pkg-config --libs glfw3 libarchive)
|
||||||
|
|
||||||
# windows specific handling
|
# windows specific handling
|
||||||
ifeq ($(ISWIN),1)
|
ifeq ($(ISWIN),1)
|
||||||
|
|||||||
Reference in New Issue
Block a user