f6ca3d424e173484953bb28b7c8f2911bf90ca3a

Makefiles for the examples should work in ubuntu

Signed-off-by: Michel Pollet <buserror@gmail.com>

diff --git a/.simavr.jcc b/.simavr.jcc
index 595a2edf056f93f49a3cc31cd97cbd135de5eb4f..6fd6a812f3df8f5f170b88055dd01323f304da41 100644 (file)
--- a/.simavr.jcc
+++ b/.simavr.jcc
@@ -24,13 +24,13 @@ T
 F
 "./simavr/sim/avr_spi.h"
 T
-2 "avr_timer8.c"
+2 "avr_timer.c"
 F
-"./simavr/sim/avr_timer8.c"
+"./simavr/sim/avr_timer.c"
 T
-2 "avr_timer8.h"
+2 "avr_timer.h"
 F
-"./simavr/sim/avr_timer8.h"
+"./simavr/sim/avr_timer.h"
 T
 2 "avr_ioport.c"
 F

diff --git a/README b/README
index 185162bb953bec3a6548c2e012e182fcfa9e58d6..bc153a9b70fa84f7d4926ddea5f1f7edd8250dfd 100644 (file)
--- a/README
+++ b/README
@@ -30,6 +30,7 @@ PREQUISTES:
        The code rudely assumes the avr-gcc is in /usr/lib/avr/include/...
        On OSX, the Makefile tries to use the Arduino.app toolchain & headers
 + libelf-dev
++ glut (or freeglut) to build the example "boards" in examples/
 
 BUILD:
 + make

diff --git a/examples/board_ledramp/Makefile b/examples/board_ledramp/Makefile
index 9072185426a5cef308908d754a6e7fc007424f26..e3ef7c69bfe1ff8773373b7799d3ad655c3d4059 100644 (file)
--- a/examples/board_ledramp/Makefile
+++ b/examples/board_ledramp/Makefile
@@ -21,6 +21,8 @@ firm_src = ${wildcard at*${board}.c}
 firmware = ${firm_src:.c=.axf}
 simavr = ../../
 
+SHELL   = /bin/bash
+
 IPATH = .
 IPATH += ../parts
 IPATH += ${simavr}/include

diff --git a/examples/board_timer_64led/Makefile b/examples/board_timer_64led/Makefile
index 976db0febf9d6b4e576e4ccfb93e4f76d99343f9..5eb60a2e9bc77046a9959ac232356d27a696a05c 100644 (file)
--- a/examples/board_timer_64led/Makefile
+++ b/examples/board_timer_64led/Makefile
@@ -21,6 +21,8 @@ firm_src = ${wildcard at*${board}.c}
 firmware = ${firm_src:.c=.axf}
 simavr = ../../
 
+SHELL   = /bin/bash
+
 IPATH = .
 IPATH += ../parts
 IPATH += ${simavr}/include