Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Makefile.win: Native windows build fixes from Max Holtzberg

Browse Source
This commit is contained in:
Gregory Nutt
2014-01-04 09:14:42 -06:00
parent f9189ae64e
commit b46aa97ac4
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -6362,4 +6362,8 @@
from Max Holtzberg (2014-1-4). from Max Holtzberg (2014-1-4).
* configs/olimex-stm32-p107/nsh/Make.defs: Add native Windoes build * configs/olimex-stm32-p107/nsh/Make.defs: Add native Windoes build
support for the Olimex STM32 P107. From Max Holtzberg (2014-1-4). support for the Olimex STM32 P107. From Max Holtzberg (2014-1-4).
* Makefile.win: Changes for native Windows build: fix creation of
a .version file if one does not exist. Make sure that the APPDIR
environment variable is set before configuring. From Max Holtzberg
(2014-1-4).
Makefile.win
+15 -13
View File
@@ -338,11 +338,16 @@ tools\mkversion$(HOSTEXEEXT):
$(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" mkversion$(HOSTEXEEXT) $(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" mkversion$(HOSTEXEEXT)
$(TOPDIR)\.version: $(TOPDIR)\.version:
$(Q) if [ ! -f .version ]; then \ $(Q) echo CONFIG_VERSION_STRING="0" > .version
echo "No .version file found, creating one"; \ $(Q) echo CONFIG_VERSION_MAJOR=0 >> .version
tools\version.sh -v 0.0 -b 0 .version; \ $(Q) echo CONFIG_VERSION_MINOR=0 >> .version
chmod 755 .version; \ $(Q) echo CONFIG_VERSION_BUILD="0" >> .version
fi
# $(Q) if [ ! -f .version ]; then \
# echo "No .version file found, creating one"; \
# tools\version.sh -v 0.0 -b 0 .version; \
# chmod 755 .version; \
# fi
include\nuttx\version.h: $(TOPDIR)\.version tools\mkversion$(HOSTEXEEXT) include\nuttx\version.h: $(TOPDIR)\.version tools\mkversion$(HOSTEXEEXT)
$(Q) tools\mkversion$(HOSTEXEEXT) $(TOPDIR) > include\nuttx\version.h $(Q) tools\mkversion$(HOSTEXEEXT) $(TOPDIR) > include\nuttx\version.h
@@ -717,17 +722,14 @@ pass2dep: context tools\mkdeps$(HOSTEXEEXT)
# location: http://ymorin.is-a-geek.org/projects/kconfig-frontends. See # location: http://ymorin.is-a-geek.org/projects/kconfig-frontends. See
# misc\tools\README.txt for additional information. # misc\tools\README.txt for additional information.
configenv: config:
$(Q) set APPSDIR=${CONFIG_APPS_DIR} $(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf Kconfig
config: configenv oldconfig:
$(Q) kconfig-conf Kconfig $(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --oldconfig Kconfig
oldconfig: configenv
$(Q) kconfig-conf --oldconfig Kconfig
menuconfig: configenv menuconfig: configenv
$(Q) kconfig-mconf Kconfig $(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-mconf Kconfig
# export # export
# #