From 1a6d528c1b775d7f1a9f9e6383986ada94c9ac78 Mon Sep 17 00:00:00 2001 From: dev0 Date: Mon, 22 Dec 2025 00:29:09 +0530 Subject: [PATCH] [WORKFLOW]: CI Update --- .github/workflows/ci.yaml | 2 +- CMakePresets.json | 8 ++++++-- Src/IACore/inc/IACore/PCH.hpp | 9 ++------- vcpkg.json | 1 + 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 43a2c01..7adc9dd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ on: branches: [ "main" ] jobs: - build-linux-wasm: + build-linux-and-wasm: runs-on: ubuntu-latest permissions: contents: read diff --git a/CMakePresets.json b/CMakePresets.json index c6f1ef1..ab286b3 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -40,7 +40,9 @@ "displayName": "Windows x64 (Clang)", "inherits": "base-common", "cacheVariables": { - "VCPKG_TARGET_TRIPLET": "windows-x64-clang" + "VCPKG_TARGET_TRIPLET": "windows-x64-clang", + "CMAKE_C_COMPILER": "clang-cl", + "CMAKE_CXX_COMPILER": "clang-cl" } }, { @@ -48,7 +50,9 @@ "displayName": "Windows ARM64 (Clang Cross)", "inherits": "base-common", "cacheVariables": { - "VCPKG_TARGET_TRIPLET": "windows-arm64-clang" + "VCPKG_TARGET_TRIPLET": "windows-arm64-clang", + "CMAKE_C_COMPILER": "clang-cl", + "CMAKE_CXX_COMPILER": "clang-cl" } }, { diff --git a/Src/IACore/inc/IACore/PCH.hpp b/Src/IACore/inc/IACore/PCH.hpp index 7418974..f7707a8 100644 --- a/Src/IACore/inc/IACore/PCH.hpp +++ b/Src/IACore/inc/IACore/PCH.hpp @@ -50,6 +50,8 @@ #elif __linux__ # define IA_PLATFORM_LINUX 1 # define IA_PLATFORM_UNIX 1 +#elif __wasm__ +# define IA_PLATFORM_WASM 1 #else # error "IACore: Unsupported Platform. Only Windows, Linux, MacOS, Android and iOS are supported." #endif @@ -99,13 +101,6 @@ # define DEBUG_ONLY(f) #endif -#if IA_CHECK(IA_PLATFORM_WIN64) || IA_CHECK(IA_PLATFORM_UNIX) -# define IA_CORE_PLATFORM_FEATURES 1 -#else -# define IA_CORE_PLATFORM_FEATURES 0 -# warning "IACore Unsupported Platform: Platform specific features will be disabled" -#endif - #include #include #include diff --git a/vcpkg.json b/vcpkg.json index 15a4b62..8ff5ea3 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,7 @@ { "name": "iacore", "version": "0.1.0", + "builtin-baseline": "84bab45d415d22042bd0b9081aea57f362da3f35", "dependencies": [ "openssl", "zlib-ng",