Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Pekar committed Mar 2, 2024
2 parents e59f8c8 + 56ad576 commit e36de6b
Show file tree
Hide file tree
Showing 4,166 changed files with 200,120 additions and 228,773 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
25 changes: 0 additions & 25 deletions .appveyor.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@ indent_style = space
[*.md]
trim_trailing_whitespace = false
max_line_length = 80

[.github/workflows/*.yml]
indent_style = space
indent_size = 2
9 changes: 5 additions & 4 deletions .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
8 changes: 7 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: Bug report
name: Bug report (FOR BUGS ONLY! DO NOT SUBMIT QUESTIONS HERE!)
about: Create a report to help us improve
title: ''
labels: ''
Expand All @@ -10,6 +10,12 @@ assignees: ''
<!---
###########################################################################
**BEWARE!**
If you completely disregard this guidance, and submit random question as issue
(bug report), the issue will be deleted. If you submit the same issue after
deletion, you'll be blocked.
**IMPORTANT: READ FIRST!**
Issue tracker is **ONLY** used for reporting bugs.
Expand Down
211 changes: 211 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
name: CI

concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

on:
push:
pull_request:

jobs:
msvc:
strategy:
fail-fast: true
matrix:
include: [
{ config: Debug, platform: Win32, bindir: 'win32_vs2019' },
{ config: Debug, platform: x64, bindir: 'win64_vs2019' },
{ config: Release, platform: Win32, bindir: 'win32_vs2019' },
{ config: Release, platform: x64, bindir: 'win64_vs2019' },
]
name: msvc-${{ matrix.config }}-${{ matrix.platform }}
runs-on: windows-2019
steps:
- 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: Prepare
uses: microsoft/[email protected]
- name: Build
shell: cmd
run: |
cd bgfx
..\bx\tools\bin\windows\genie.exe --with-tools --with-combined-examples --with-shared-lib vs2019
msbuild ".build/projects/vs2019/bgfx.sln" /m /v:minimal /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }}
- name: Check
shell: cmd
run: |
cd bgfx
dir /s ".build\${{ matrix.bindir }}\bin"
".build\${{ matrix.bindir }}\bin\geometryc${{ matrix.config }}.exe" --version
".build\${{ matrix.bindir }}\bin\shaderc${{ matrix.config }}.exe" --version
".build\${{ matrix.bindir }}\bin\texturec${{ matrix.config }}.exe" --version
mingw:
strategy:
fail-fast: true
matrix:
include: [
{ msystem: MINGW64, project: 'mingw-gcc', bindir: 'win64_mingw-gcc' },
{ msystem: CLANG64, project: 'mingw-clang', bindir: 'win64_mingw-clang' },
]
name: mingw-${{ matrix.msystem }}
runs-on: windows-latest
steps:
- 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: Prepare
uses: msys2/setup-msys2@v2
with:
msystem: ${{ matrix.msystem }}
update: true
install: make
pacboy: cc:p
- name: Build
shell: msys2 {0}
run: |
cd bgfx
make ${{ matrix.project }}-release64 -j$(nproc) AR=ar CC=cc CXX=c++ MINGW=$MINGW_PREFIX
- name: Check
shell: cmd
run: |
cd bgfx
dir /s ".build\${{ matrix.bindir }}\bin"
".build\${{ matrix.bindir }}\bin\geometrycRelease.exe" --version
".build\${{ matrix.bindir }}\bin\shadercRelease.exe" --version
".build\${{ matrix.bindir }}\bin\texturecRelease.exe" --version
linux:
strategy:
fail-fast: true
matrix:
include: [
{ config: debug, binsuffix: Debug },
{ config: release, binsuffix: Release },
]
name: linux-${{ matrix.config }}64
runs-on: ubuntu-22.04
steps:
- 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: |
sudo apt install libgl-dev
cd bgfx
make -j$(nproc) linux-${{ matrix.config }}64
- name: Check
run: |
cd bgfx
ls -lash ".build/linux64_gcc/bin"
".build/linux64_gcc/bin/geometryc${{ matrix.binsuffix}}" --version
".build/linux64_gcc/bin/shaderc${{ matrix.binsuffix}}" --version
".build/linux64_gcc/bin/texturec${{ matrix.binsuffix}}" --version
osx:
strategy:
fail-fast: true
matrix:
include: [
{ config: debug, binsuffix: Debug },
{ config: release, binsuffix: Release },
]
name: osx-x64-${{ matrix.config }}
runs-on: macos-latest
steps:
- 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) osx-x64-${{ matrix.config }}
- name: Check
run: |
cd bgfx
ls -lash ".build/osx-x64/bin"
".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 .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
36 changes: 0 additions & 36 deletions .travis.yml

This file was deleted.

Loading

0 comments on commit e36de6b

Please sign in to comment.