Merge branch 'master' of github.com:r0ket/r0ket

simulat0r/bin/update-bridge-files.sh

@@ -44,3 +44,11 @@ do
 	(printf "# GENERATED INCLUDE BRIDGE/\n"; echo include `dirname $i | sed "s#[^/]*#..#g" `/../$i) >simulat0r/$i
     fi
 done
+
+if cmp firmware/.gitignore simulat0r/firmware/.gitignore;
+then
+    echo OK .gitignore is the same in firmware/ and simulat0r/firmware
+else
+    echo WARNING: .gitignore mismatch in firmware/ and simulat0r/firmware
+    diff -y firmware/.gitignore simulat0r/firmware/.gitignore
+fi 

simulat0r/firmware/.gitignore

@@ -0,0 +1,6 @@
+firmware.bin
+firmware.elf
+lpc1xxx/memory.ld
+applications/wrapper.c
+lcd/allfonts.h
+Makefile.dep

simulat0r/firmware/basic/idle.c

@@ -0,0 +1,2 @@
+/* AUTOGENERATED SOURCE FILE */
+#include "../../../firmware/basic/idle.c"

simulat0r/firmware/basic/idle.h

@@ -0,0 +1,2 @@
+/* AUTOGENERATED SOURCE FILE */
+#include "../../../firmware/basic/idle.h"

simulat0r/simcore/Makefile

@@ -5,15 +5,10 @@ CFLAGS += -I../firmware
 CFLAGS += -I../firmware/core # for gpio.h including projectconfig.h without path
 CFLAGS += -I../simcore
 
-OBJS+= ../firmware/basic/*.o
-OBJS+= ../firmware/core/*.o
-OBJS+= ../firmware/core/*/*.o
-LDFLAGS+= -L../firmware/applications
-LIBS+= ../firmware/applications/libapp.a
-LDFLAGS+= -L../firmware/lcd
-LIBS+= ../firmware/lcd/liblcd.a
-LDFLAGS+= -L../firmware/usb
-LIBS+= ../firmware/usb/libusb.a
+OBJS = simcore.o misc.o 
 
-.PHONY : all
-all : simcore.o misc.o #$(OBJS) $(LIBS)
+.PHONY : all clean
+all : $(OBJS)
+
+clean:
+	$(RM) $(OBJS)

simulat0r/tui/Makefile

@@ -28,3 +28,5 @@ all : simulat0r
 
 simulat0r : simulat0r.o $(OBJS) $(LIBS) 
 
+clean:
+	$(RM) simulat0r.o