Skip to content

Commit

Permalink
Merge pull request #7 from tritao/update-bgfx
Browse files Browse the repository at this point in the history
Update bgfx to latest and fix Emscripten compilation
  • Loading branch information
emoon authored Oct 21, 2023
2 parents bb4a2b7 + 60d5006 commit 8817d8f
Show file tree
Hide file tree
Showing 2,457 changed files with 99,151 additions and 102,538 deletions.
9 changes: 5 additions & 4 deletions bgfx/.gitattributes
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
*.bin binary diff=hex
*.c eol=lf
*.cpp eol=lf
*.h eol=lf
*.sc eol=lf
*.sh eol=lf
*.lua eol=lf
*.m eol=lf
*.mm eol=lf
*.md eol=lf
*.lua eol=lf
*.mk eol=lf
*.mm eol=lf
*.sc eol=lf
*.sh eol=lf
makefile eol=lf
39 changes: 39 additions & 0 deletions bgfx/.github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,3 +206,42 @@ jobs:
".build/osx-x64/bin/geometryc${{ matrix.binsuffix}}" --version
".build/osx-x64/bin/shaderc${{ matrix.binsuffix}}" --version
".build/osx-x64/bin/texturec${{ matrix.binsuffix}}" --version
android:
strategy:
fail-fast: true
matrix:
include: [
{ platform: arm64 },
]
name: android-${{ matrix.platform }}
runs-on: ubuntu-22.04
steps:
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r25b
add-to-path: false
- name: Checkout bgfx
uses: actions/checkout@v3
with:
path: bgfx
- name: Checkout bx
uses: actions/checkout@v3
with:
repository: bkaradzic/bx
path: bx
- name: Checkout bimg
uses: actions/checkout@v3
with:
repository: bkaradzic/bimg
path: bimg
- name: Build
run: |
cd bgfx
make -j$(sysctl -n hw.physicalcpu) android-${{ matrix.platform }}
env:
ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
- name: Check
run: |
cd bgfx
ls -lash ".build/android-${{ matrix.platform }}/bin"
10 changes: 6 additions & 4 deletions bgfx/.gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
*.TMP
*.dxvk-cache
*.log
.DS_Store
.build
.debug
.DS_Store
.gdb_history
.git
.svn
tags
.gdb_history
.vscode
*.TMP
tags
Loading

0 comments on commit 8817d8f

Please sign in to comment.