Merge pull request #31 from SushilRagoonath/CI

Ci
This commit is contained in:
Noel Berry 2022-12-02 13:54:26 -08:00 committed by GitHub
commit 05743b7dfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 1 deletions

38
.github/workflows/ci.yml vendored Normal file
View File

@ -0,0 +1,38 @@
name: CI
on:
push:
pull_request:
jobs:
build-ubuntu:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- uses: lukka/get-cmake@latest
- uses: actions/checkout@master
- name: build
run: |
mkdir build
cd build
cmake ../
cmake --build .
build-windows:
runs-on: windows-latest
strategy:
fail-fast: false
steps:
- uses: lukka/get-cmake@latest
- uses: actions/checkout@master
- name: build
run: |
mkdir build
cd build
echo 'Building SDL2 platform'
cmake ../ -DBLAH_PLATFORM_WIN32=OFF -DBLAH_PLATFORM_SDL2=ON
cmake --build .
echo 'Building win32 platform'
cmake ../ -DBLAH_PLATFORM_WIN32=ON -DBLAH_PLATFORM_SDL2=OFF
cmake --build .

View File

@ -689,7 +689,7 @@ void Platform::open_url(const char* url)
system(cmd.cstr());
}
void win32_detect_joysticks()
void Blah::win32_detect_joysticks()
{
// mark all joysticks as unnacounted for
for (int i = 0; i < Input::max_controllers; i++)