diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-14 15:55:07 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-14 15:55:07 +0000 |
commit | dc6231eef588c2720267978310154de5ee1c4bf2 (patch) | |
tree | ae0d6313e5df1e26bb657c913b105b20aba92420 /nuttx/Makefile.win | |
parent | 2eecebfb100a560236cb83806b84f7e54be8e4eb (diff) | |
download | px4-nuttx-dc6231eef588c2720267978310154de5ee1c4bf2.tar.gz px4-nuttx-dc6231eef588c2720267978310154de5ee1c4bf2.tar.bz2 px4-nuttx-dc6231eef588c2720267978310154de5ee1c4bf2.zip |
More native build fixes -- still problems in apps/ directory
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5352 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/Makefile.win')
-rw-r--r-- | nuttx/Makefile.win | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/Makefile.win b/nuttx/Makefile.win index 549185186..7da6e8e9c 100644 --- a/nuttx/Makefile.win +++ b/nuttx/Makefile.win @@ -69,7 +69,7 @@ BOARD_DIR = configs\$(CONFIG_ARCH_BOARD) ifeq ($(CONFIG_APPS_DIR),) CONFIG_APPS_DIR = ..\apps endif -APPDIR := ${shell if [ -r $(CONFIG_APPS_DIR)\Makefile ]; then echo "$(CONFIG_APPS_DIR)"; fi} +APPDIR := ${shell if exist "$(CONFIG_APPS_DIR)\Makefile" echo "$(CONFIG_APPS_DIR)"} # All add-on directories. # @@ -245,7 +245,7 @@ endif # LINKLIBS derives from NUTTXLIBS and is simply the same list with the subdirectory removed -LINKLIBS = $(patsubst lib\%,%,$(NUTTXLIBS)) +LINKLIBS = $(patsubst lib\\%,%,$(NUTTXLIBS)) # This is the name of the final target (relative to the top level directorty) @@ -339,7 +339,7 @@ include\nuttx\config.h: $(TOPDIR)\.config tools\mkconfig$(HOSTEXEEXT) # Targets used to create dependencies -tools/mkdeps$(HOSTEXEEXT): +tools\mkdeps$(HOSTEXEEXT): $(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" mkdeps$(HOSTEXEEXT) # dirlinks, and helpers @@ -348,7 +348,7 @@ tools/mkdeps$(HOSTEXEEXT): # setting up symbolic links with 'generic' directory names to specific, # configured directories. # -# Link the apps/include directory to include\apps +# Link the apps\include directory to include\apps include\apps: Make.defs ifneq ($(APPDIR),) @@ -640,10 +640,10 @@ download: $(BIN) # pass1dep: Create pass1 build dependencies # pass2dep: Create pass2 build dependencies -pass1dep: context tools/mkdeps$(HOSTEXEEXT) +pass1dep: context tools\mkdeps$(HOSTEXEEXT) $(Q) for %%G in ($(USERDEPDIRS)) do ( $(MAKE) -C %%G TOPDIR="$(TOPDIR)" depend ) -pass2dep: context tools/mkdeps$(HOSTEXEEXT) +pass2dep: context tools\mkdeps$(HOSTEXEEXT) $(Q) for %%G in ($(KERNDEPDIRS)) do ( $(MAKE) -C %%G TOPDIR="$(TOPDIR)" EXTRADEFINES=$(KDEFINE) depend ) # Configuration targets @@ -686,7 +686,7 @@ export: pass2deps depend: pass1dep pass2dep subdir_clean: - $(Q) for %%G in ($(CLEANDIRS)) do ( if exist %%G/Makefile $(MAKE) -C %%G TOPDIR="$(TOPDIR)" clean ) + $(Q) for %%G in ($(CLEANDIRS)) do ( if exist %%G\Makefile $(MAKE) -C %%G TOPDIR="$(TOPDIR)" clean ) $(Q) $(MAKE) -C tools -f Makefile.host TOPDIR="$(TOPDIR)" clean $(Q) $(MAKE) -C mm -f Makefile.test TOPDIR="$(TOPDIR)" clean ifeq ($(CONFIG_BUILD_2PASS),y) @@ -698,7 +698,7 @@ clean: subdir_clean $(Q) rm -f nuttx-export* subdir_distclean: - $(Q) for %%G in ($(CLEANDIRS)) do ( if exist %%G/Makefile $(MAKE) -C %%G TOPDIR="$(TOPDIR)" distclean ) + $(Q) for %%G in ($(CLEANDIRS)) do ( if exist %%G\Makefile $(MAKE) -C %%G TOPDIR="$(TOPDIR)" distclean ) distclean: clean subdir_distclean clean_context ifeq ($(CONFIG_BUILD_2PASS),y) |