check windows build2

devbis · Nov 26, 2023 · 81d10b5 · 81d10b5
1 parent 205b4e4
commit 81d10b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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")