This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit afd3c65cf63c5c7322872a941bc571f1c72eae39 Author: zouboan <[email protected]> AuthorDate: Wed Nov 9 08:56:52 2022 +0800 tools/Win.mk Fix some issue caused by out-sync of Win.mk and Unix.mk --- tools/Win.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/Win.mk b/tools/Win.mk index 4cc65d3c59..1013903626 100644 --- a/tools/Win.mk +++ b/tools/Win.mk @@ -165,8 +165,8 @@ NEED_MATH_H = y endif ifeq ($(NEED_MATH_H),y) -include\math.h: include\nuttx\math.h - $(Q) cp -f include\nuttx\math.h include\math.h +include\math.h: include\nuttx\lib\math.h + $(Q) cp -f include\nuttx\lib\math.h include\math.h else include\math.h: endif @@ -178,8 +178,8 @@ endif # the settings in this float.h are actually correct for your platform! ifeq ($(CONFIG_ARCH_FLOAT_H),y) -include\float.h: include\nuttx\float.h - $(Q) cp -f include\nuttx\float.h include\float.h +include\float.h: include\nuttx\lib\float.h + $(Q) cp -f include\nuttx\lib\float.h include\float.h else include\float.h: endif @@ -190,8 +190,8 @@ endif # have to copy stdarg.h from include\nuttx\. to include\. ifeq ($(CONFIG_ARCH_STDARG_H),y) -include\stdarg.h: include\nuttx\stdarg.h - $(Q) cp -f include\nuttx\stdarg.h include\stdarg.h +include\stdarg.h: include\nuttx\lib\stdarg.h + $(Q) cp -f include\nuttx\lib\stdarg.h include\stdarg.h else include\stdarg.h: endif @@ -202,8 +202,8 @@ endif # have to copy setjmp.h from include\nuttx\. to include\. ifeq ($(CONFIG_ARCH_SETJMP_H),y) -include\setjmp.h: include\nuttx\setjmp.h - $(Q) cp -f include\nuttx\setjmp.h include\setjmp.h +include\setjmp.h: include\nuttx\lib\setjmp.h + $(Q) cp -f include\nuttx\lib\setjmp.h include\setjmp.h else include\setjmp.h: endif @@ -460,6 +460,8 @@ clean_context: # execution will then be built from those libraries. The following targets # build those libraries. +include tools/LibTargets.mk + # pass1 and pass2 # # If the 2 pass build option is selected, then this pass1 target is
