From c802080bab1a4c9342089bd45ffc7e5e6d55f5f0 Mon Sep 17 00:00:00 2001 From: SushilRagoonath <48589447+SushilRagoonath@users.noreply.github.com> Date: Fri, 2 Dec 2022 14:05:51 +0100 Subject: [PATCH 1/5] fix win32 platform compile --- src/internal/blah_platform_win32.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/internal/blah_platform_win32.cpp b/src/internal/blah_platform_win32.cpp index 9218e94..684a2a7 100644 --- a/src/internal/blah_platform_win32.cpp +++ b/src/internal/blah_platform_win32.cpp @@ -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++) From 688e28ac65ec0c2a8fe63364053412a5dd258f80 Mon Sep 17 00:00:00 2001 From: SushilRagoonath <48589447+SushilRagoonath@users.noreply.github.com> Date: Fri, 2 Dec 2022 14:20:16 +0100 Subject: [PATCH 2/5] initial CI test --- .github/ci.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/ci.yml diff --git a/.github/ci.yml b/.github/ci.yml new file mode 100644 index 0000000..dbd5a16 --- /dev/null +++ b/.github/ci.yml @@ -0,0 +1,21 @@ +name: CI + +on: + push: + pull_request: + +jobs: + + build-html5: + runs-on: ubuntu-latest + strategy: + fail-fast: false + steps: + - uses: lukka/get-cmake@latest + - uses: actions/checkout@master + - name: install dependancies + run: | + mkdir build + cd build + cmake ../ + cmake --build . \ No newline at end of file From 4ee91d5812eb5e2f428d6485a03174b9cd23bcef Mon Sep 17 00:00:00 2001 From: SushilRagoonath <48589447+SushilRagoonath@users.noreply.github.com> Date: Fri, 2 Dec 2022 14:21:15 +0100 Subject: [PATCH 3/5] folder --- .github/{ => workflows}/ci.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/ci.yml (100%) diff --git a/.github/ci.yml b/.github/workflows/ci.yml similarity index 100% rename from .github/ci.yml rename to .github/workflows/ci.yml From f5d492e532f1cacc4e839f5329dbdbe7d926d205 Mon Sep 17 00:00:00 2001 From: SushilRagoonath <48589447+SushilRagoonath@users.noreply.github.com> Date: Fri, 2 Dec 2022 14:26:55 +0100 Subject: [PATCH 4/5] test windows --- .github/workflows/ci.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbd5a16..dde11f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: - build-html5: + build-ubuntu: runs-on: ubuntu-latest strategy: fail-fast: false @@ -18,4 +18,21 @@ jobs: 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: install dependancies + run: | + mkdir build + cd build + echo 'Building SDL2 platform' + cmake ../ + cmake --build . + echo 'Building win32 platform' + cmake ../ -DBLAH_PLATFORM_WIN32=ON -DBLAH_PLATFORM_SDL2=OFF cmake --build . \ No newline at end of file From 181e885598b2624891590bd6e8a5712ad154bc4d Mon Sep 17 00:00:00 2001 From: SushilRagoonath <48589447+SushilRagoonath@users.noreply.github.com> Date: Fri, 2 Dec 2022 14:33:25 +0100 Subject: [PATCH 5/5] clean --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dde11f1..1f016ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: lukka/get-cmake@latest - uses: actions/checkout@master - - name: install dependancies + - name: build run: | mkdir build cd build @@ -26,12 +26,12 @@ jobs: steps: - uses: lukka/get-cmake@latest - uses: actions/checkout@master - - name: install dependancies + - name: build run: | mkdir build cd build echo 'Building SDL2 platform' - cmake ../ + cmake ../ -DBLAH_PLATFORM_WIN32=OFF -DBLAH_PLATFORM_SDL2=ON cmake --build . echo 'Building win32 platform' cmake ../ -DBLAH_PLATFORM_WIN32=ON -DBLAH_PLATFORM_SDL2=OFF