From 14b42a7c9e74682a938df68ea4424382345719f6 Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Sat, 14 Sep 2024 12:44:25 +0200 Subject: [PATCH] fixing macos and windows CI ? --- .github/workflows/macos_x86.yml | 6 ------ .github/workflows/windows.yml | 7 ------- xmake.lua | 16 ++-------------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/.github/workflows/macos_x86.yml b/.github/workflows/macos_x86.yml index 42e8af3..18919d5 100644 --- a/.github/workflows/macos_x86.yml +++ b/.github/workflows/macos_x86.yml @@ -29,12 +29,6 @@ jobs: uses: actions/checkout@v4 # Install system dependencies - - name: Install Vulkan SDK - uses: humbletim/install-vulkan-sdk@v1.1.1 - with: - version: 1.3.204.1 - cache: true - - name: Install Dependancies run: | brew install SDL2 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 83c5cc3..ad4d479 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -28,13 +28,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - # Install system dependencies - - name: Install Vulkan SDK - uses: humbletim/install-vulkan-sdk@v1.1.1 - with: - version: 1.3.204.1 - cache: true - # Force xmake to a specific folder (for cache) - name: Set xmake env run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV diff --git a/xmake.lua b/xmake.lua index d9f1b9b..13d7be0 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,21 +1,9 @@ --------------------------------------------------------------------------------- --- -- --- ::: :::::::: -- --- xmake.lua :+: :+: :+: -- --- +:+ +:+ +:+ -- --- By: maldavid +#+ +:+ +#+ -- --- +#+#+#+#+#+ +#+ -- --- Created: 2023/12/07 15:21:38 by kbz_8 #+# #+# -- --- Updated: 2024/01/02 23:40:20 by kbz_8 ### ########.fr -- --- -- --------------------------------------------------------------------------------- - -- Global settings -add_requires("libsdl", {configs = { sdlmain = false }}) +add_requires("libsdl", { configs = { sdlmain = false }}) add_rules("mode.debug", "mode.release") -set_languages("cxx17", "c99") +set_languages("cxx20", "c99") set_objectdir("objs/xmake/$(os)_$(arch)") set_targetdir("./")