feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

tools: idf_exe: compatibility with MSVC

Browse Source
This commit is contained in:
Ivan Grokhotkov
2021-09-29 19:43:50 +02:00
parent b8d6985dca
commit ffb708d403
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/windows/idf_exe/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ set(ARCHIVE_NAME idf-exe-v${VERSION}.zip)
add_executable(idf idf_main.c) add_executable(idf idf_main.c)
target_compile_definitions(idf PRIVATE -DVERSION=\"${VERSION}\") target_compile_definitions(idf PRIVATE -DVERSION=\"${VERSION}\")
set_target_properties(idf PROPERTIES C_STANDARD 99) set_target_properties(idf PROPERTIES C_STANDARD 99)
target_link_libraries(idf "-lshlwapi") target_link_libraries(idf "shlwapi")
if(CMAKE_BUILD_TYPE STREQUAL Release) if(CMAKE_BUILD_TYPE STREQUAL Release)
add_custom_command(TARGET idf add_custom_command(TARGET idf

8
tools/windows/idf_exe/idf_main.c
View File

@@ -11,7 +11,11 @@
#define LINESIZE 1024 #define LINESIZE 1024
#ifdef __GNUC__
static void fail(LPCSTR message, ...) __attribute__((noreturn)); static void fail(LPCSTR message, ...) __attribute__((noreturn));
#else
__declspec(noreturn) static void fail(LPCSTR message, ...);
#endif
static void fail(LPCSTR message, ...) static void fail(LPCSTR message, ...)
{ {
@@ -58,7 +62,7 @@ int main(int argc, LPTSTR argv[])
LPCTSTR idfpy_script_name = TEXT("idf.py"); LPCTSTR idfpy_script_name = TEXT("idf.py");
/* Get IDF_PATH */ /* Get IDF_PATH */
TCHAR idf_path[LINESIZE] = {}; TCHAR idf_path[LINESIZE] = { 0 };
if (GetEnvironmentVariable(TEXT("IDF_PATH"), idf_path, sizeof(idf_path)) == 0) { if (GetEnvironmentVariable(TEXT("IDF_PATH"), idf_path, sizeof(idf_path)) == 0) {
DWORD err = GetLastError(); DWORD err = GetLastError();
if (err == ERROR_ENVVAR_NOT_FOUND) { 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" <rest of the args> */ /* Prepare the command line: python.exe "%IDF_PATH%\\tools\idf.py" <rest of the args> */
TCHAR cmdline[LINESIZE] = {}; TCHAR cmdline[LINESIZE] = { 0 };
StringCchCat(cmdline, sizeof(cmdline), TEXT("python.exe \"")); StringCchCat(cmdline, sizeof(cmdline), TEXT("python.exe \""));
StringCchCat(cmdline, sizeof(cmdline), idf_path); StringCchCat(cmdline, sizeof(cmdline), idf_path);
StringCchCat(cmdline, sizeof(cmdline), TEXT("\\tools\\")); StringCchCat(cmdline, sizeof(cmdline), TEXT("\\tools\\"));