From ea31cfdcc06cab5ba0127db53f64c655ab408c9e Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Thu, 2 Feb 2017 11:42:58 +0000 Subject: Simulator works. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10080 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/various/RT-Posix-Simulator/Makefile | 2 +- demos/various/RT-Win32-Simulator/Makefile | 2 +- os/common/startup/SIMIA32/compilers/GCC/rules.mk | 4 ++-- release_note_next.txt | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/demos/various/RT-Posix-Simulator/Makefile b/demos/various/RT-Posix-Simulator/Makefile index d74bced6e..9578952a9 100755 --- a/demos/various/RT-Posix-Simulator/Makefile +++ b/demos/various/RT-Posix-Simulator/Makefile @@ -139,7 +139,7 @@ CPPWARN = -Wall -Wextra -Wundef # Compiler settings ############################################################################## -############################################################################## +###################cd ..########################################################### # Start of user section # diff --git a/demos/various/RT-Win32-Simulator/Makefile b/demos/various/RT-Win32-Simulator/Makefile index 718212340..b818f72b6 100644 --- a/demos/various/RT-Win32-Simulator/Makefile +++ b/demos/various/RT-Win32-Simulator/Makefile @@ -61,7 +61,7 @@ endif # # Define project name here -PROJECT = ch +PROJECT = ch.exe # Imported source files and paths CHIBIOS = ../../.. diff --git a/os/common/startup/SIMIA32/compilers/GCC/rules.mk b/os/common/startup/SIMIA32/compilers/GCC/rules.mk index 1a77dee9e..54c27f0fa 100644 --- a/os/common/startup/SIMIA32/compilers/GCC/rules.mk +++ b/os/common/startup/SIMIA32/compilers/GCC/rules.mk @@ -34,7 +34,7 @@ endif ifeq ($(BUILDDIR),.) BUILDDIR = build endif -OUTFILES = $(BUILDDIR)/$(PROJECT).exe +OUTFILES = $(BUILDDIR)/$(PROJECT) # Source files groups and paths @@ -143,7 +143,7 @@ else @$(CC) -c $(ASXFLAGS) -I. $(IINCDIR) $< -o $@ endif -%.exe: $(OBJS) +$(BUILDDIR)/$(PROJECT): $(OBJS) ifeq ($(USE_VERBOSE_COMPILE),yes) @echo $(LD) $(OBJS) $(LDFLAGS) $(LIBS) -o $@ diff --git a/release_note_next.txt b/release_note_next.txt index d3dd7c90b..ae5c9dc51 100644 --- a/release_note_next.txt +++ b/release_note_next.txt @@ -59,6 +59,7 @@ a series of important improvements, new features have been added. - New kernel hooks for a more flexible code instrumentation. - Removed I/O queues, now the HAL has an improved equivalent. - Experimental NASA OSAL implementation. +- Posix simulator added. *** What's new in NIL 2.0.0 *** -- cgit v1.2.3