From 2def0d877d22bb0a1753725477cb9ea5728832b3 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 25 Nov 2012 20:58:39 +0000 Subject: [PATCH] A few native window build updates git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5387 42af7a65-404d-4744-a932-0658087f49c3 --- Makefile.unix | 12 ++--- Makefile.win | 12 ++--- TODO | 25 ++++++---- arch/z80/src/Makefile.zdsii | 2 +- configs/ez80f910200kitg/README.txt | 18 +++++-- configs/ez80f910200kitg/ostest/defconfig | 3 +- configs/ez80f910200kitg/scripts/setenv.bat | 50 +++++++++++++++++++ .../scripts}/setenv.bat | 2 +- drivers/Makefile | 32 ++++++------ drivers/analog/Make.defs | 4 +- drivers/bch/Make.defs | 2 +- drivers/input/Make.defs | 2 +- drivers/lcd/Make.defs | 2 +- drivers/mmcsd/Make.defs | 2 +- drivers/power/Make.defs | 4 +- drivers/sensors/Make.defs | 2 +- drivers/usbdev/Make.defs | 2 +- drivers/usbhost/Make.defs | 4 +- drivers/wireless/Make.defs | 6 +-- 19 files changed, 127 insertions(+), 59 deletions(-) create mode 100644 configs/ez80f910200kitg/scripts/setenv.bat rename configs/{ez80f910200kitg/ostest => ez80f910200zco/scripts}/setenv.bat (95%) diff --git a/Makefile.unix b/Makefile.unix index 78c34c2de5..5ecdabb643 100644 --- a/Makefile.unix +++ b/Makefile.unix @@ -359,7 +359,7 @@ tools/mkdeps$(HOSTEXEEXT): include/apps: Make.defs ifneq ($(APPDIR),) - @echo "LN: include/apps -> $(APPDIR)/include" + @echo "LN: include/apps to $(APPDIR)/include" $(Q) if [ -d $(TOPDIR)/$(APPDIR)/include ]; then \ $(DIRLINK) $(TOPDIR)/$(APPDIR)/include include/apps; \ fi @@ -368,26 +368,26 @@ endif # Link the arch//include directory to include/arch include/arch: Make.defs - @echo "LN: include/arch -> $(ARCH_DIR)/include" + @echo "LN: include/arch to $(ARCH_DIR)/include" $(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_DIR)/include include/arch # Link the configs//include directory to include/arch/board include/arch/board: include/arch Make.defs include/arch - @echo "LN: include/arch/board -> $(BOARD_DIR)/include" + @echo "LN: include/arch/board to $(BOARD_DIR)/include" $(Q) $(DIRLINK) $(TOPDIR)/$(BOARD_DIR)/include include/arch/board # Link the configs//src dir to arch//src/board $(ARCH_SRC)/board: Make.defs - @echo "LN: $(ARCH_SRC)/board -> $(BOARD_DIR)/src" + @echo "LN: $(ARCH_SRC)/board to $(BOARD_DIR)/src" $(Q) $(DIRLINK) $(TOPDIR)/$(BOARD_DIR)/src $(ARCH_SRC)/board # Link arch//include/ to arch//include/chip $(ARCH_SRC)/chip: Make.defs ifneq ($(CONFIG_ARCH_CHIP),) - @echo "LN: $(ARCH_SRC)/chip -> $(ARCH_SRC)/$(CONFIG_ARCH_CHIP)" + @echo "LN: $(ARCH_SRC)/chip to $(ARCH_SRC)/$(CONFIG_ARCH_CHIP)" $(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_SRC)/$(CONFIG_ARCH_CHIP) $(ARCH_SRC)/chip endif @@ -395,7 +395,7 @@ endif include/arch/chip: include/arch Make.defs ifneq ($(CONFIG_ARCH_CHIP),) - @echo "LN: include/arch/chip -> $(ARCH_INC)/$(CONFIG_ARCH_CHIP)" + @echo "LN: include/arch/chip to $(ARCH_INC)/$(CONFIG_ARCH_CHIP)" $(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_INC)/$(CONFIG_ARCH_CHIP) include/arch/chip endif diff --git a/Makefile.win b/Makefile.win index 6257dbdc85..34da12ad09 100644 --- a/Makefile.win +++ b/Makefile.win @@ -352,7 +352,7 @@ tools\mkdeps$(HOSTEXEEXT): include\apps: Make.defs ifneq ($(APPDIR),) - @echo "LN: include\apps $(APPDIR)\include" + @echo LN: include\apps $(APPDIR)\include ifeq ($(CONFIG_WINDOWS_MKLINK),y) $(Q) /user:administrator mklink /d include\apps $(APPDIR)\include else @@ -364,7 +364,7 @@ endif # Link the arch\\include directory to include\arch include\arch: Make.defs - @echo "LN: include\arch -> $(ARCH_DIR)\include" + @echo LN: include\arch to $(ARCH_DIR)\include ifeq ($(CONFIG_WINDOWS_MKLINK),y) $(Q) /user:administrator mklink /d include\arch $(TOPDIR)\$(ARCH_DIR)\include else @@ -375,7 +375,7 @@ endif # Link the configs\\include directory to include\arch\board include\arch\board: include\arch Make.defs include\arch - @echo "LN: include\arch\board -> $(BOARD_DIR)\include" + @echo LN: include\arch\board to $(BOARD_DIR)\include ifeq ($(CONFIG_WINDOWS_MKLINK),y) $(Q) /user:administrator mklink /d include\arch\board $(TOPDIR)\$(BOARD_DIR)\include else @@ -386,7 +386,7 @@ endif # Link the configs\\src dir to arch\\src\board $(ARCH_SRC)\board: Make.defs - @echo "LN: $(ARCH_SRC)\board -> $(BOARD_DIR)\src" + @echo LN: $(ARCH_SRC)\board to $(BOARD_DIR)\src ifeq ($(CONFIG_WINDOWS_MKLINK),y) $(Q) /user:administrator mklink /d $(ARCH_SRC)\board $(TOPDIR)\$(BOARD_DIR)\src else @@ -398,7 +398,7 @@ endif $(ARCH_SRC)\chip: Make.defs ifneq ($(CONFIG_ARCH_CHIP),) - @echo "LN: $(ARCH_SRC)\chip -> $(ARCH_SRC)\$(CONFIG_ARCH_CHIP)" + @echo LN: $(ARCH_SRC)\chip to $(ARCH_SRC)\$(CONFIG_ARCH_CHIP) ifeq ($(CONFIG_WINDOWS_MKLINK),y) $(Q) /user:administrator mklink /d $(ARCH_SRC)\chip $(TOPDIR)\$(ARCH_SRC)\$(CONFIG_ARCH_CHIP) else @@ -411,7 +411,7 @@ endif include\arch\chip: include\arch Make.defs ifneq ($(CONFIG_ARCH_CHIP),) - @echo "LN: include\arch\chip -> $(ARCH_INC)\$(CONFIG_ARCH_CHIP)" + @echo LN: include\arch\chip to $(ARCH_INC)\$(CONFIG_ARCH_CHIP) ifeq ($(CONFIG_WINDOWS_MKLINK),y) $(Q) /user:administrator mklink /d include\arch\chip $(TOPDIR)\$(ARCH_INC)\$(CONFIG_ARCH_CHIP) else diff --git a/TODO b/TODO index 28ffa1387f..fcc418a0e9 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -NuttX TODO List (Last updated September 16, 2012) +NuttX TODO List (Last updated November 25, 2012) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This file summarizes known NuttX bugs, limitations, inconsistencies with @@ -895,23 +895,30 @@ o Build system Description: Need a NuttX configuration tool. The number of configuration settings has become quite large and difficult to manage manually. Update: This task is essentially completed. But probably not for - all platforms and all features. When do we know that the the - features is complete and that we can switch to exclusive use of - the tool? + all platforms and all features. When do we know that the feature + is complete and that we can switch to exclusive use of the tool? Status: Open Priority: Medium-low Title: NATIVE WINDOWS BUILD - Description: At present, NuttX builds only under Linux or Cygwin. - Investigate the possibility of a native Windows build using - something like the GNUWin32 tools (coreutils+make+grep+sed+uname). + Description: This effort is underway using MinGW-GCC and GNUWin32 tools + for (coreutils+make+grep+sed+uname). Current status: + + 1. configs/stm32f4discovery/winbuild - builds okay natively + 2. configs/ez80f910200kitg - Can be reconfigured to build natively. + Requires some manual intervention to get a clean build. + See configs/ez80f910200kitg/README.txt. + Status: Open Priority: Low Title: WINDOWS DEPENDENCY GENERATION Description: Dependency generation is currently disabled when a Windows native - toolchain is used. I think that the only issue is that all of the - Windows dependencies needed to be quoted in the Make.dep files. + toolchain is used in a POSIX-like enviornment (like Cygwin). The + issue is that the Windows tool generates dependencies use Windows + path formatting and this fails with the dependency file (Make.dep) + is include). Perhaps the only issue is that all of the Windows + dependencies needed to be quoted in the Make.dep files. Status: Open Priority: Low -- unless some dependency-related build issues is discovered. diff --git a/arch/z80/src/Makefile.zdsii b/arch/z80/src/Makefile.zdsii index 7a145017c4..a3c6639f50 100644 --- a/arch/z80/src/Makefile.zdsii +++ b/arch/z80/src/Makefile.zdsii @@ -106,7 +106,7 @@ nuttx.linkcmd: $(LINKCMDTEMPLATE) ifeq ($(CONFIG_WINDOWS_NATIVE),y) @echo "$(TOPDIR)\nuttx"= \>>nuttx.linkcmd @echo "$(ARCHSRCDIR)\$(HEAD_OBJ)", \>>nuttx.linkcmd - $(Q) for %%G in ($(LINKLIBS)) do ( echo "$(TOPDIR)\lib\%%G", \>>nuttx.linkcmd ) + $(Q) for %%G in ($(LINKLIBS)) do ( echo "$(TOPDIR)\lib\%%G", \>>nuttx.linkcmd ) @echo "$(ARCHSRCDIR)\board\libboard$(LIBEXT)", \>>nuttx.linkcmd ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y) @echo "$(ZDSSTDLIBDIR)\chelprevaaD$(LIBEXT)", \>>nuttx.linkcmd diff --git a/configs/ez80f910200kitg/README.txt b/configs/ez80f910200kitg/README.txt index 222a25db1f..004f607d4a 100644 --- a/configs/ez80f910200kitg/README.txt +++ b/configs/ez80f910200kitg/README.txt @@ -107,8 +107,20 @@ available: CONFIG_APPS_DIR="..\apps" - NOTE: If you need to change the toolchain path used in Make.defs, - you will need to use the short 8.3 filenames to avoid spaces. On - my change C:\PROGRA~1\ is C:\PROGRA~2\ is C:\Program Files (x86)\ + NOTES: + + a. If you need to change the toolchain path used in Make.defs, you + will need to use the short 8.3 filenames to avoid spaces. On my + PC, C:\PROGRA~1\ is is C:\Program Files\ and C:\PROGRA~2\ is + C:\Program Files (x86)\ + b. You can't use setenv.sh in the native Windows environment. Try + scripts/setenv.bat instead. + c. At present, the native Windows build fails at the final link stages. + The failure is due to problems in arch/z80/src/nuttx/linkcmd that + is autogenerated by arch/z80/src/Makefile.zdsii. The basic program + is the spurious spaces and and carrirage returns are generated at + the end of the lines after a line continuation (\ ^M). If these + trailing bad characters are manually eliminated, then the build + will succeed on the next try. Check out any README.txt files in these s. diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig index e061e6289f..757916281c 100644 --- a/configs/ez80f910200kitg/ostest/defconfig +++ b/configs/ez80f910200kitg/ostest/defconfig @@ -232,11 +232,10 @@ CONFIG_MMCSD_SDIO=y # CONFIG_SENSORS is not set # CONFIG_SERCOMM_CONSOLE is not set CONFIG_SERIAL=y -# CONFIG_LOWLEVEL_CONSOLE is not set +CONFIG_LOWLEVEL_CONSOLE=y # CONFIG_16550_UART is not set CONFIG_ARCH_HAVE_UART0=y CONFIG_MCU_SERIAL=y -CONFIG_STANDARD_SERIAL=y CONFIG_UART0_SERIAL_CONSOLE=y # CONFIG_NO_SERIAL_CONSOLE is not set diff --git a/configs/ez80f910200kitg/scripts/setenv.bat b/configs/ez80f910200kitg/scripts/setenv.bat new file mode 100644 index 0000000000..3a1b987b4d --- /dev/null +++ b/configs/ez80f910200kitg/scripts/setenv.bat @@ -0,0 +1,50 @@ +@echo off + +rem configs/ez80f810200kitg/scripts/setenv.bat +rem +rem Copyright (C) 2012 Gregory Nutt. All rights reserved. +rem Author: Gregory Nutt +rem +rem Redistribution and use in source and binary forms, with or without +rem modification, are permitted provided that the following conditions +rem are met: +rem +rem 1. Redistributions of source code must retain the above copyright +rem notice, this list of conditions and the following disclaimer. +rem 2. Redistributions in binary form must reproduce the above copyright +rem notice, this list of conditions and the following disclaimer in +rem the documentation and/or other materials provided with the +rem distribution. +rem 3. Neither the name NuttX nor the names of its contributors may be +rem used to endorse or promote products derived from this software +rem without specific prior written permission. +rem +rem THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +rem "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +rem LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +rem FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +rem COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +rem INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +rem BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +rem OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +rem AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +rem LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +rem ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +rem POSSIBILITY OF SUCH DAMAGE. + +rem This is the location where I installed in the MinGW compiler. With +rem this configuration, it is recommended that you do NOT install the +rem MSYS tools; they conflict with the GNUWin32 tools. See +rem http://www.mingw.org/ for further info. + +set PATH=C:\MinGW\bin;%PATH% + +rem This is the location where I installed the ZDS-II toolchain. + +set PATH=C:\Program Files (x86)\ZiLOG\ZDSII_eZ80Acclaim!_5.1.1\bin;%PATH% + +rem This is the location where I installed the GNUWin32 tools. See +rem http://gnuwin32.sourceforge.net/. + +set PATH=C:\gnuwin32\bin;%PATH% +echo %PATH% diff --git a/configs/ez80f910200kitg/ostest/setenv.bat b/configs/ez80f910200zco/scripts/setenv.bat similarity index 95% rename from configs/ez80f910200kitg/ostest/setenv.bat rename to configs/ez80f910200zco/scripts/setenv.bat index f461cf1cc2..88fc6cbf31 100644 --- a/configs/ez80f910200kitg/ostest/setenv.bat +++ b/configs/ez80f910200zco/scripts/setenv.bat @@ -1,6 +1,6 @@ @echo off -rem configs/ez80f810200kitg/ostest/setenv.bat +rem configs/ez80f910200zco/scripts/setenv.bat rem rem Copyright (C) 2012 Gregory Nutt. All rights reserved. rem Author: Gregory Nutt diff --git a/drivers/Makefile b/drivers/Makefile index 13a5078236..b2bf1b6119 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -48,22 +48,22 @@ VPATH = . # files to the source file list, add its DEPPATH info, and will add # the appropriate paths to the VPATH variable -include analog/Make.defs -include bch/Make.defs -include input/Make.defs -include lcd/Make.defs -include mmcsd/Make.defs -include mtd/Make.defs -include net/Make.defs -include pipes/Make.defs -include power/Make.defs -include sensors/Make.defs -include sercomm/Make.defs -include serial/Make.defs -include syslog/Make.defs -include usbdev/Make.defs -include usbhost/Make.defs -include wireless/Make.defs +include analog$(DELIM)Make.defs +include bch$(DELIM)Make.defs +include input$(DELIM)Make.defs +include lcd$(DELIM)Make.defs +include mmcsd$(DELIM)Make.defs +include mtd$(DELIM)Make.defs +include net$(DELIM)Make.defs +include pipes$(DELIM)Make.defs +include power$(DELIM)Make.defs +include sensors$(DELIM)Make.defs +include sercomm$(DELIM)Make.defs +include serial$(DELIM)Make.defs +include syslog$(DELIM)Make.defs +include usbdev$(DELIM)Make.defs +include usbhost$(DELIM)Make.defs +include wireless$(DELIM)Make.defs ifneq ($(CONFIG_NFILE_DESCRIPTORS),0) CSRCS += dev_null.c dev_zero.c loop.c diff --git a/drivers/analog/Make.defs b/drivers/analog/Make.defs index 425193f7e5..89cc5bd3f7 100644 --- a/drivers/analog/Make.defs +++ b/drivers/analog/Make.defs @@ -76,12 +76,12 @@ endif ifeq ($(CONFIG_DAC),y) DEPPATH += --dep-path analog VPATH += :analog - CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/analog} + CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog} else ifeq ($(CONFIG_ADC),y) DEPPATH += --dep-path analog VPATH += :analog - CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/analog} + CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)analog} endif endif diff --git a/drivers/bch/Make.defs b/drivers/bch/Make.defs index 2745fcfff0..78dfbff30e 100644 --- a/drivers/bch/Make.defs +++ b/drivers/bch/Make.defs @@ -46,7 +46,7 @@ CSRCS += bchlib_setup.c bchlib_teardown.c bchlib_read.c bchlib_write.c \ DEPPATH += --dep-path bch VPATH += :bch -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/bch} +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)bch} endif endif diff --git a/drivers/input/Make.defs b/drivers/input/Make.defs index 8afd76f89e..10e6db62fb 100644 --- a/drivers/input/Make.defs +++ b/drivers/input/Make.defs @@ -71,6 +71,6 @@ endif DEPPATH += --dep-path input VPATH += :input -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/input} +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)input} endif diff --git a/drivers/lcd/Make.defs b/drivers/lcd/Make.defs index 8b6d300523..1b445b6a78 100644 --- a/drivers/lcd/Make.defs +++ b/drivers/lcd/Make.defs @@ -67,6 +67,6 @@ endif DEPPATH += --dep-path lcd VPATH += :lcd -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/lcd} +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd} endif diff --git a/drivers/mmcsd/Make.defs b/drivers/mmcsd/Make.defs index 0ba5efb7f1..06e689c753 100644 --- a/drivers/mmcsd/Make.defs +++ b/drivers/mmcsd/Make.defs @@ -49,7 +49,7 @@ endif DEPPATH += --dep-path mmcsd VPATH += :mmcsd -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/mmcsd} +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)mmcsd} endif diff --git a/drivers/power/Make.defs b/drivers/power/Make.defs index 9e6307ae21..e3452120dd 100644 --- a/drivers/power/Make.defs +++ b/drivers/power/Make.defs @@ -47,7 +47,7 @@ CSRCS += pm_activity.c pm_changestate.c pm_checkstate.c pm_initialize.c pm_regis POWER_DEPPATH := --dep-path power POWER_VPATH := :power -POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/power} +POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} endif @@ -73,7 +73,7 @@ endif POWER_DEPPATH := --dep-path power POWER_VPATH := :power -POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/power} +POWER_CFLAGS := ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)power} endif diff --git a/drivers/sensors/Make.defs b/drivers/sensors/Make.defs index 17750831ec..1713edb994 100644 --- a/drivers/sensors/Make.defs +++ b/drivers/sensors/Make.defs @@ -57,4 +57,4 @@ endif DEPPATH += --dep-path sensors VPATH += :sensors -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/sensors} +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)sensors} diff --git a/drivers/usbdev/Make.defs b/drivers/usbdev/Make.defs index 782c185452..e43693b290 100644 --- a/drivers/usbdev/Make.defs +++ b/drivers/usbdev/Make.defs @@ -59,5 +59,5 @@ CSRCS += usbdev_trace.c usbdev_trprintf.c DEPPATH += --dep-path usbdev VPATH += :usbdev -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/usbdev} +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbdev} endif diff --git a/drivers/usbhost/Make.defs b/drivers/usbhost/Make.defs index 91753ef318..ebb5226950 100644 --- a/drivers/usbhost/Make.defs +++ b/drivers/usbhost/Make.defs @@ -45,7 +45,7 @@ CSRCS += usbhost_enumerate.c usbhost_storage.c usbhost_hidkbd.c # Include add-on USB host driver logic (see misc/drivers) ifeq ($(CONFIG_NET),y) - RTL8187_CSRC := ${shell if [ -f usbhost/rtl8187x.c ]; then echo "rtl8187x.c"; fi} + RTL8187_CSRC := ${shell if [ -f usbhost$(DELIM)rtl8187x.c ]; then echo "rtl8187x.c"; fi} CSRCS += $(RTL8187_CSRC) endif endif @@ -54,4 +54,4 @@ endif DEPPATH += --dep-path usbhost VPATH += :usbhost -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/usbhost} +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbhost} diff --git a/drivers/wireless/Make.defs b/drivers/wireless/Make.defs index 86ea90e25e..fa8e8acb54 100644 --- a/drivers/wireless/Make.defs +++ b/drivers/wireless/Make.defs @@ -41,7 +41,7 @@ CSRCS += cc1101.c ISM1_868MHzGFSK100kbps.c ISM2_905MHzGFSK250kbps.c # Include wireless build support -DEPPATH += --dep-path wireless/cc1101 -VPATH += :wireless/cc1101 -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/wireless/cc1101} +DEPPATH += --dep-path wireless$(DELIM)cc1101 +VPATH += :wireless$(DELIM)cc1101 +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)wireless$(DELIM)cc1101} endif