Merge branch 'master' of ssh://klon2.itfuzzi.de/home/pubgit/r0ket
This commit is contained in:
roy rocket
commit
9add0367fe
|
|
@ -3,6 +3,8 @@ all : tui gui
|
|||
.PHONY : tui gui tui-core clean
|
||||
|
||||
tui-core :
|
||||
$(MAKE) -C ../firmware/l0dable usetable.h
|
||||
cd ..; $(SHELL) simulat0r/bin/update-bridge-files.sh
|
||||
$(MAKE) -C firmware
|
||||
$(MAKE) -C simcore
|
||||
$(MAKE) -C tui
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ fi
|
|||
done
|
||||
|
||||
echo "Updating bridge files for C source"
|
||||
for i in `find firmware/ \! -path firmware/lcd/allfonts.h -type f -iname \*.[ch]`
|
||||
for i in `find firmware/ \! -path firmware/lcd/allfonts.h \! -path firmware/l0dable/usetable.h -type f -iname \*.[ch]`
|
||||
do
|
||||
if test -f simulat0r/$i;
|
||||
then
|
||||
|
|
@ -45,10 +45,13 @@ do
|
|||
fi
|
||||
done
|
||||
|
||||
if cmp firmware/.gitignore simulat0r/firmware/.gitignore;
|
||||
|
||||
for i in `find firmware -type f -name .gitignore`; do
|
||||
if cmp $i simulat0r/$i
|
||||
then
|
||||
echo OK .gitignore is the same in firmware/ and simulat0r/firmware
|
||||
echo OK $i and simulat0r/$i are the same
|
||||
else
|
||||
echo WARNING: .gitignore mismatch in firmware/ and simulat0r/firmware
|
||||
diff -y firmware/.gitignore simulat0r/firmware/.gitignore
|
||||
echo WARNING: $i mismatches simulat0r/$i
|
||||
diff -y $i simulat0r/$i
|
||||
fi
|
||||
done
|
||||
|
|
|
|||
|
|
@ -4,3 +4,5 @@ lpc1xxx/memory.ld
|
|||
applications/wrapper.c
|
||||
lcd/allfonts.h
|
||||
Makefile.dep
|
||||
table.c
|
||||
table.h
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
*.gen
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/applications/executor.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/applications/final.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../../firmware/applications/final/beacon.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../../firmware/applications/final/config.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../../firmware/applications/final/exe.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../../firmware/applications/final/flame.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../../firmware/applications/final/mesh.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../../firmware/applications/final/nickname.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../../firmware/applications/final/util.c"
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/applications/funk.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/applications/l0dable.c"
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/applications/mandelbrot.c"
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/applications/mandelbrot2.c"
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include "../../../firmware/applications/rect.c"
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/applications/remote.c"
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../../firmware/applications/serial/config.c"
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../../firmware/applications/serial/remote.c"
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../../firmware/applications/serial/uuid.c"
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/applications/spaceinvaders.c"
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../../firmware/applications/tester/config.c"
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include "../../../firmware/applications/waldbrand.c"
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
*.elf
|
||||
*.bin
|
||||
usetable.h
|
||||
loadable.ld
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
# GENERATED INCLUDE BRIDGE/
|
||||
include ../../../firmware/l0dable/Makefile
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/l0dable/blink.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/l0dable/debug.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/l0dable/invaders.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/l0dable/mandel.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/l0dable/recvcard.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/l0dable/sendcard.c"
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
*.elf
|
||||
*.bin
|
||||
*.h
|
||||
loadable.ld
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/loadable/blinktest2.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/loadable/mandelbrot.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/loadable/recvcard.c"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
/* AUTOGENERATED SOURCE FILE */
|
||||
#include "../../../firmware/loadable/sendcard.c"
|
||||
|
|
@ -37,6 +37,7 @@ set(FIRMWARE_OBJS
|
|||
../simcore/simcore.o
|
||||
../simcore/misc.o
|
||||
../simcore/timecounter.o
|
||||
../firmware/table.o
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ LIBS += ../firmware/basic/libbasic.a
|
|||
|
||||
OBJS+=../simcore/simcore.o ../simcore/misc.o ../simcore/timecounter.o
|
||||
|
||||
OBJS += ../firmware/table.o
|
||||
|
||||
OBJS += simulat0r.o
|
||||
|
||||
.PHONY : all
|
||||
|
|
|
|||
Loading…
Reference in New Issue