Skip to content

Commit

Permalink
Rewrite cinterop definition system
Browse files Browse the repository at this point in the history
  • Loading branch information
toasterofbread committed May 1, 2024
1 parent 509abad commit 8420591
Show file tree
Hide file tree
Showing 5 changed files with 274 additions and 325 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-linux-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
run: chmod +x gradle

- name: Build linux-arm64 binaries
run: ./gradlew linux-arm64BinariesStatic
run: ./gradlew linux-arm64Binaries -PlinkStatic

- name: Strip release binary
run: $TOOLCHAIN/bin/aarch64-unknown-linux-gnu-strip build/bin/linux-arm64/releaseExecutable/*.kexe
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-linux-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
run: chmod +x gradle

- name: Build linux-x86_64 binaries
run: ./gradlew linux-x86_64BinariesStatic
run: ./gradlew linux-x86_64Binaries -PlinkStatic

- name: Strip release binary
run: $TOOLCHAIN/bin/x86_64-unknown-linux-gnu-strip build/bin/linux-x86_64/releaseExecutable/*.kexe
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/build-windows-x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,14 @@ jobs:
- name: Copy built files
run: xcopy /s /i /y "${{ github.workspace }}\vcpkg\installed\x64-windows\*" "${{ github.workspace }}\src\nativeInterop\windows-x86_64"

- name: Download 7-Zip
run: curl https://www.7-zip.org/a/7z2301-x64.exe --output 7z-installer.exe

- name: Extract 7-Zip
run: .\7z-installer.exe /S /D="${{ github.workspace }}\7zip"

- name: Download mpv
run: curl -L https://downloads.sourceforge.net/project/mpv-player-windows/libmpv/mpv-dev-x86_64-20240114-git-bd35dc8.7z --output mpv.7z


- name: Extract mpv
run: 7zip\7z.exe x mpv.7z -osrc\nativeInterop\windows-x86_64
shell: bash
run: |
"/c/Program Files/7-Zip/7z.exe" x mpv.7z -o"src\nativeInterop\windows-x86_64"
- name: Move libmpv.dll.a
run: move src\nativeInterop\windows-x86_64\libmpv.dll.a src\nativeInterop\windows-x86_64\lib\libmpv.dll.a
Expand All @@ -55,7 +52,7 @@ jobs:
uses: gradle/gradle-build-action@v3

- name: Build windows-x86_64 binaries
run: .\gradlew.bat windows-x86_64BinariesStatic
run: .\gradlew.bat windows-x86_64Binaries -PlinkStatic

- name: Upload debug binary
uses: actions/upload-artifact@v3
Expand Down
Loading

0 comments on commit 8420591

Please sign in to comment.