From ffb708d403a97be2acf00226b5efb79ef1be38f5 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 29 Sep 2021 19:43:50 +0200 Subject: [PATCH] tools: idf_exe: compatibility with MSVC --- tools/windows/idf_exe/CMakeLists.txt | 2 +- tools/windows/idf_exe/idf_main.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/windows/idf_exe/CMakeLists.txt b/tools/windows/idf_exe/CMakeLists.txt index 95fda81c60..f0b5dd915a 100644 --- a/tools/windows/idf_exe/CMakeLists.txt +++ b/tools/windows/idf_exe/CMakeLists.txt @@ -7,7 +7,7 @@ set(ARCHIVE_NAME idf-exe-v${VERSION}.zip) add_executable(idf idf_main.c) target_compile_definitions(idf PRIVATE -DVERSION=\"${VERSION}\") set_target_properties(idf PROPERTIES C_STANDARD 99) -target_link_libraries(idf "-lshlwapi") +target_link_libraries(idf "shlwapi") if(CMAKE_BUILD_TYPE STREQUAL Release) add_custom_command(TARGET idf diff --git a/tools/windows/idf_exe/idf_main.c b/tools/windows/idf_exe/idf_main.c index 59f0350031..b40465b2bd 100644 --- a/tools/windows/idf_exe/idf_main.c +++ b/tools/windows/idf_exe/idf_main.c @@ -11,7 +11,11 @@ #define LINESIZE 1024 +#ifdef __GNUC__ static void fail(LPCSTR message, ...) __attribute__((noreturn)); +#else +__declspec(noreturn) static void fail(LPCSTR message, ...); +#endif static void fail(LPCSTR message, ...) { @@ -58,7 +62,7 @@ int main(int argc, LPTSTR argv[]) LPCTSTR idfpy_script_name = TEXT("idf.py"); /* Get IDF_PATH */ - TCHAR idf_path[LINESIZE] = {}; + TCHAR idf_path[LINESIZE] = { 0 }; if (GetEnvironmentVariable(TEXT("IDF_PATH"), idf_path, sizeof(idf_path)) == 0) { DWORD err = GetLastError(); if (err == ERROR_ENVVAR_NOT_FOUND) { @@ -69,7 +73,7 @@ int main(int argc, LPTSTR argv[]) } /* Prepare the command line: python.exe "%IDF_PATH%\\tools\idf.py" */ - TCHAR cmdline[LINESIZE] = {}; + TCHAR cmdline[LINESIZE] = { 0 }; StringCchCat(cmdline, sizeof(cmdline), TEXT("python.exe \"")); StringCchCat(cmdline, sizeof(cmdline), idf_path); StringCchCat(cmdline, sizeof(cmdline), TEXT("\\tools\\"));