1 files changed, 10 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 8c91f24..3e15b46 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,10 @@ LIB = lib/launchpad_pro.a
 ELF = $(BUILDDIR)/launchpad_pro.elf
 HEX = $(BUILDDIR)/launchpad_pro.hex
 HEXTOSYX = $(BUILDDIR)/hextosyx
+SIMULATOR = $(BUILDDIR)/simulator
 
-HOST_CC = g++
+HOST_GPP = g++
+HOST_GCC = gcc
 CC = arm-none-eabi-gcc
 LD = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
@@ -33,12 +35,17 @@ LDFLAGS += -T$(LDSCRIPT) -u _start -u _Minimum_Stack_Size  -mcpu=cortex-m3 -mthu
 all: $(SYX)
 
 # build the final sysex file from the ELF
-$(SYX): $(HEX) $(HEXTOSYX)
+$(SYX): $(HEX) $(HEXTOSYX) $(SIMULATOR)
+        ./$(SIMULATOR)
         ./$(HEXTOSYX) $(HEX) $(SYX)
 
 # build the tool for conversion of ELF files to sysex ready for upload to the unit
 $(HEXTOSYX):
-        $(HOST_CC) -Ofast -std=c++0x -I./$(TOOLS)/libintelhex/include ./$(TOOLS)/libintelhex/src/intelhex.cc $(TOOLS)/hextosyx.cpp -o $(HEXTOSYX)
+        $(HOST_GPP) -Ofast -std=c++0x -I./$(TOOLS)/libintelhex/include ./$(TOOLS)/libintelhex/src/intelhex.cc $(TOOLS)/hextosyx.cpp -o $(HEXTOSYX)
+
+# build the simulator and run it (it's a very basic test of the code before it runs on the device!)
+$(SIMULATOR):
+        $(HOST_GCC) -O0 -std=c99 -Iinclude $(TOOLS)/simulator.c src/app.c -o $(SIMULATOR)
 
 $(HEX): $(ELF)
         $(OBJCOPY) -O ihex $< $@