Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix linker ssl error fix (libcrypto-1_1-x64.dll not found) #9

Merged
merged 14 commits into from
Jun 4, 2024
Merged

Fix linker ssl error fix (libcrypto-1_1-x64.dll not found) #9

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4179e59
Only build for windows
IsaacShoebottom May 2, 2024
03c1e15
Update skia and make workflow manually runnable
IsaacShoebottom May 2, 2024
7b5e0f2
Allow unsecure commands
IsaacShoebottom May 2, 2024
e30efb2
Update windows build tools version
IsaacShoebottom May 2, 2024
6e97d62
Update workflow from this repo:
IsaacShoebottom May 31, 2024
24cae86
Only build on windows
IsaacShoebottom May 31, 2024
613f619
Make release public and add note
IsaacShoebottom May 31, 2024
c045044
Update note [skip ci]
IsaacShoebottom May 31, 2024
119cab6
Install openssl maybe
IsaacShoebottom May 31, 2024
c4bfa9a
Change how to install ssl and add reccomended skia arg
IsaacShoebottom May 31, 2024
fc6ab16
install ssl to fix link errors at runtime [skip ci]
IsaacShoebottom May 31, 2024
7eaf4f9
Merge branch 'master' into link-ssl-error
IsaacShoebottom May 31, 2024
4d72d05
Fix modified README in pr
IsaacShoebottom May 31, 2024
bf69473
Remove OpenSSL to prevent linking against it
IsaacShoebottom May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Change how to install ssl and add reccomended skia arg
  • Loading branch information
@IsaacShoebottom
IsaacShoebottom committed May 31, 2024
commit c4bfa9a86e36dfe83e50a66c732d0ec8242c20d9
6 changes: 2 additions & 4 deletions .github/workflows/aseprite_build_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ jobs:
- name: (Windows) Enable SSL
if: matrix.os == 'windows-latest'
shell: powershell
run: |
echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
vcpkg install openssl:x64-windows-static-md
run: choco install openssl
- name: (Ubuntu) Install dependencies
if: matrix.os == 'ubuntu-latest'
run: sudo apt update && sudo apt install -y cmake ninja-build libxcursor-dev libxi-dev libgl1-mesa-dev
Expand Down Expand Up @@ -117,7 +115,7 @@ jobs:
if: matrix.os == 'windows-latest'
working-directory: aseprite/build
shell: cmd
run: cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_IGNORE_PATH='C:/ProgramData/chocolatey/bin/;C:/Strawberry/c/bin/' -DLAF_BACKEND=skia -DSKIA_DIR=../../skia -DSKIA_LIBRARY_DIR=../../skia/out/Release-x64 -G Ninja ..
run: cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCMAKE_IGNORE_PATH='C:/ProgramData/chocolatey/bin/;C:/Strawberry/c/bin/' -DLAF_BACKEND=skia -DSKIA_DIR=../../skia -DSKIA_LIBRARY_DIR=../../skia/out/Release-x64 -DSKIA_LIBRARY=../../skia/out/Release-x64/skia.lib -G Ninja ..
- name: (Ubuntu) Run CMake
if: matrix.os == 'ubuntu-latest'
working-directory: aseprite/build
Expand Down