Skip to content

Commit

Permalink
Merge pull request #1080 from slyshykO/fix-msvc-build
Browse files Browse the repository at this point in the history
[feature] Included ITM functionality for building with MSVC
  • Loading branch information
Nightwalker-87 committed Dec 20, 2020
2 parents a66557a + ffbecc4 commit 4918223
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ if (MSVC)
# Add getopt to sources
include_directories(src/win32/getopt)
set(ST-UTIL_SOURCES "${ST-UTIL_SOURCES};src/win32/getopt/getopt.c")
set(ST-TRACE_SOURCES "${ST-TRACE_SOURCES};src/win32/getopt/getopt.c")
endif ()

add_executable(st-flash ${ST-FLASH_SOURCES})
Expand Down
3 changes: 2 additions & 1 deletion src/st-trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,8 @@ int main(int argc, char** argv)
}

ILOG("Reading Trace\n");
st_trace_t trace = {};
st_trace_t trace;
memset(&trace, 0, sizeof(trace));
trace.start_time = time(NULL);

if (stlink_run(stlink)) {
Expand Down

0 comments on commit 4918223

Please sign in to comment.