From 81d10b56d8541251cacfa244d6662b4531cdaba1 Mon Sep 17 00:00:00 2001 From: Ivan Belokobylskiy Date: Sun, 26 Nov 2023 15:22:55 +0400 Subject: [PATCH] check windows build2 --- .github/workflows/build-windows.yml | 2 +- cmake/TelinkSDK.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index afa392b..e532936 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -29,7 +29,7 @@ jobs: - name: Build LYWSD03MMC id: lywsd03mmc run: | - cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSDK_PREFIX=${{env.SDK_DIR}} -DTOOLCHAIN_PREFIX=${{env.TOOLCHAIN_DIR}} -DMANUFACTURER_CODE=0x1141 + cmake -G "MSYS Makefiles" -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSDK_PREFIX=${{env.SDK_DIR}} -DTOOLCHAIN_PREFIX=${{env.TOOLCHAIN_DIR}} -DMANUFACTURER_CODE=0x1141 cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target=z03mmc.zigbee echo "status=success" >> $GITHUB_OUTPUT diff --git a/cmake/TelinkSDK.cmake b/cmake/TelinkSDK.cmake index fc5a556..48cbbf1 100644 --- a/cmake/TelinkSDK.cmake +++ b/cmake/TelinkSDK.cmake @@ -11,14 +11,14 @@ file(TO_CMAKE_PATH "${SDK_PREFIX}" SDK_PREFIX) file(TO_CMAKE_PATH "${TOOLCHAIN_PREFIX}" TOOLCHAIN_PREFIX) SET(CMAKE_SYSTEM_NAME Generic) -SET(TARGET_PREFIX "tc32-elf") +SET(TARGET_PREFIX "tc32-elf-") SET(TOOLCHAIN_BIN_DIR ${TOOLCHAIN_PREFIX}/bin) SET(TOOLCHAIN_INC_DIR ${TOOLCHAIN_PREFIX}/include) SET(TOOLCHAIN_LIB_DIR ${TOOLCHAIN_PREFIX}/lib) IF(NOT CMAKE_C_COMPILER) - SET(CMAKE_C_COMPILER ${TOOLCHAIN_BIN_DIR}/${TARGET_PREFIX}-gcc${TOOL_EXECUTABLE_SUFFIX}) + SET(CMAKE_C_COMPILER ${TOOLCHAIN_BIN_DIR}/${TARGET_PREFIX}gcc${TOOL_EXECUTABLE_SUFFIX}) ENDIF() set(TELINK_PLATFORM "8258")