diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-02-06 11:42:26 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-02-06 11:42:26 +0000 |
| commit | ea6abe0731888c334b721970d37d3aef0a8ab220 (patch) | |
| tree | 3c75aebc26617d71661268423131a1d1dbf27bf4 /demos/various | |
| parent | 433537d2cfdba474bf5e2a9dce72edca88c7040e (diff) | |
| download | ChibiOS-ea6abe0731888c334b721970d37d3aef0a8ab220.tar.gz ChibiOS-ea6abe0731888c334b721970d37d3aef0a8ab220.tar.bz2 ChibiOS-ea6abe0731888c334b721970d37d3aef0a8ab220.zip | |
chprintf and streams are now part of the HAL library.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7665 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/various')
| -rw-r--r-- | demos/various/RT-Win32-Simulator/Makefile | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/demos/various/RT-Win32-Simulator/Makefile b/demos/various/RT-Win32-Simulator/Makefile index 7621091b1..5723fb09f 100644 --- a/demos/various/RT-Win32-Simulator/Makefile +++ b/demos/various/RT-Win32-Simulator/Makefile @@ -58,12 +58,12 @@ UADEFS = # Imported source files
CHIBIOS = ../../..
include $(CHIBIOS)/os/hal/boards/simulator/board.mk
-include ${CHIBIOS}/os/hal/hal.mk
-include ${CHIBIOS}/os/hal/ports/simulator/win32/platform.mk
+include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS)/os/hal/ports/simulator/win32/platform.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
-include ${CHIBIOS}/os/rt/ports/SIMIA32/compilers/GCC/port.mk
-include ${CHIBIOS}/os/rt/rt.mk
-include ${CHIBIOS}/test/rt/test.mk
+include $(CHIBIOS)/os/rt/ports/SIMIA32/compilers/GCC/port.mk
+include $(CHIBIOS)/os/rt/rt.mk
+include $(CHIBIOS)/test/rt/test.mk
# List C source files here
SRC = $(PORTSRC) \
@@ -73,9 +73,9 @@ SRC = $(PORTSRC) \ $(OSALSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
- ${CHIBIOS}/os/various/shell.c \
- ${CHIBIOS}/os/various/memstreams.c \
- ${CHIBIOS}/os/various/chprintf.c \
+ $(CHIBIOS)/os/various/shell.c \
+ $(CHIBIOS)/os/hal/lib/streams/memstreams.c \
+ $(CHIBIOS)/os/hal/lib/streams/chprintf.c \
main.c
# List ASM source files here
@@ -84,7 +84,7 @@ ASRC = # List all user directories here
UINCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
$(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
- ${CHIBIOS}/os/various
+ $(CHIBIOS)/os/various
# List the user directory to look for the libraries here
ULIBDIR =
@@ -99,7 +99,6 @@ OPT = -ggdb -O2 -fomit-frame-pointer # End of user defines
##############################################################################################
-
INCDIR = $(patsubst %,-I%,$(DINCDIR) $(UINCDIR))
LIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))
DEFS = $(DDEFS) $(UDEFS)
|