Merge branch 'develop' into feature/VSbuild

EmbeddedRPC · Mar 7, 2023 · 763ee5b · 763ee5b
2 parents 90f4b3e + 8f77dad
commit 763ee5b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -65,7 +65,6 @@ jobs:
       - run: powershell.exe  "& 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe' .\erpcgen\VisualStudio_v14\erpcgen.sln /property:Configuration=Release"
       - store_artifacts:
           path: ./erpcgen/VisualStudio_v14/Release/erpcgen.exe
-
 workflows:
   build-workflow:
     jobs:

diff --git a/erpcgen/Makefile b/erpcgen/Makefile
@@ -112,6 +112,10 @@ ifeq "$(build)" "release"
     endif
 endif
 
+ifeq "$(is_mingw)" "1"
+CXXFLAGS += -DBOOST_FILESYSTEM_VERSION=4
+endif
+
 # Run flex
 $(OBJS_ROOT)/erpcgen_lexer.cpp: $(ERPC_ROOT)/erpcgen/src/erpcgen_lexer.l $(OBJS_ROOT)/erpcgen_parser.tab.hpp | $(OBJECTS_DIRS)
 	@$(call printmessage,orange,Generating, $(subst $(ERPC_ROOT)/,,$<))

diff --git a/erpcgen/src/Utils.cpp b/erpcgen/src/Utils.cpp
@@ -1,3 +1,11 @@
+/* Copyright 2023 NXP
+ * Copyright 2023 ACRIOS Systems s.r.o.
+ * All rights reserved.
+ *
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
 #include "Utils.hpp"
 
 void erpcgen::replaceAll(std::string &str, const std::string &from, const std::string &to)