diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-01-04 09:14:42 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-01-04 09:14:42 -0600 |
| commit | 20185b1f87528b647e92623c368a8bf0522885ba (patch) | |
| tree | 3e8478974c4ff0ce3da4cbef3839f9452f4103ea | |
| parent | e594add443fe7713afcc90cfe78e8bcd3145fac3 (diff) | |
| download | nuttx-20185b1f87528b647e92623c368a8bf0522885ba.tar.gz nuttx-20185b1f87528b647e92623c368a8bf0522885ba.tar.bz2 nuttx-20185b1f87528b647e92623c368a8bf0522885ba.zip | |
Makefile.win: Native windows build fixes from Max Holtzberg
| -rw-r--r-- | nuttx/ChangeLog | 4 | ||||
| -rw-r--r-- | nuttx/Makefile.win | 28 |
2 files changed, 19 insertions, 13 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 76631516e..855fc2c80 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -6362,4 +6362,8 @@ from Max Holtzberg (2014-1-4). * configs/olimex-stm32-p107/nsh/Make.defs: Add native Windoes build 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). diff --git a/nuttx/Makefile.win b/nuttx/Makefile.win index 7ca04070f..3acf4187b 100644 --- a/nuttx/Makefile.win +++ b/nuttx/Makefile.win @@ -338,11 +338,16 @@ tools\mkversion$(HOSTEXEEXT): $(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" mkversion$(HOSTEXEEXT) $(TOPDIR)\.version: - $(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 + $(Q) echo CONFIG_VERSION_STRING="0" > .version + $(Q) echo CONFIG_VERSION_MAJOR=0 >> .version + $(Q) echo CONFIG_VERSION_MINOR=0 >> .version + $(Q) echo CONFIG_VERSION_BUILD="0" >> .version + +# $(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) $(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 # misc\tools\README.txt for additional information. -configenv: - $(Q) set APPSDIR=${CONFIG_APPS_DIR} - -config: configenv - $(Q) kconfig-conf Kconfig +config: + $(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf Kconfig -oldconfig: configenv - $(Q) kconfig-conf --oldconfig Kconfig +oldconfig: + $(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --oldconfig Kconfig menuconfig: configenv - $(Q) kconfig-mconf Kconfig + $(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-mconf Kconfig # export # |