4570a6e37e546fa40d59d6c7d2e9b8a2204b66e3

Uses OSX frameworks if applicable

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

diff --git a/Makefile.common b/Makefile.common
index 0949fb8f211f2793c3ed0a81a91b8d644e8a8e09..d4bab2303a5d57c5fa465b1f44f3fe34e5fb4a16 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -34,6 +34,7 @@ ifeq (${shell uname}, Darwin)
 AVR_ROOT := "/Applications/Arduino.app/Contents/Resources/Java/hardware/tools/avr/"
 AVR_INC := ${AVR_ROOT}/avr-4/
 AVR := ${AVR_ROOT}/bin/avr-
+LFLAGS += -L/opt/local/lib
 else
 AVR_ROOT := /usr/lib/avr
 AVR_INC := ${AVR_ROOT}

diff --git a/examples/board_ledramp/Makefile b/examples/board_ledramp/Makefile
index e3ef7c69bfe1ff8773373b7799d3ad655c3d4059..bafabae7191f2b2fd2735334cdfd0bd9a0689beb 100644 (file)
--- a/examples/board_ledramp/Makefile
+++ b/examples/board_ledramp/Makefile
@@ -31,7 +31,12 @@ IPATH += ${simavr}/simavr/sim
 VPATH = .
 VPATH += ../parts
 
-LDFLAGS += -lglut -lpthread
+LDFLAGS += -lpthread
+ifneq (${shell uname}, Darwin)
+LDFLAGS += -lglut
+else
+LDFLAGS += -framework GLUT -framework OpenGL 
+endif
 
 all: obj ${firmware} ${board}
 
@@ -40,7 +45,7 @@ include ${simavr}/Makefile.common
 ${board} : ${OBJ}/button.o
 ${board} : ${OBJ}/${board}.o
        @echo LD $@
-       @gcc -MD ${CFLAGS} -o $@ $^ $(LDFLAGS) ${simavr}/simavr/libsimavr.a
+       @gcc -MD ${CFLAGS}  ${LFLAGS} -o $@ $^ $(LDFLAGS) ${simavr}/simavr/libsimavr.a
 
 clean:
        rm -rf obj *.hex *.a *.axf ${board} *.vcd

diff --git a/examples/board_ledramp/ledramp.c b/examples/board_ledramp/ledramp.c
index 59fa967c598aaa9b98d2bc8c397b57bd871f092b..5167c66faa950eb545f91f088035b84b113cea89 100644 (file)
--- a/examples/board_ledramp/ledramp.c
+++ b/examples/board_ledramp/ledramp.c
@@ -22,8 +22,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <libgen.h>
-
+#if __APPLE__
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include <pthread.h>
 
 #include "sim_avr.h"

diff --git a/examples/board_simduino/Makefile b/examples/board_simduino/Makefile
index 6d811787bbf6dd03ecc51ab34c18543acbbdb302..ae182500ae9f2d24e77cd9897517574801b1047d 100644 (file)
--- a/examples/board_simduino/Makefile
+++ b/examples/board_simduino/Makefile
@@ -31,7 +31,12 @@ IPATH += ${simavr}/simavr/sim
 VPATH = .
 VPATH += ../parts
 
-LDFLAGS += -lglut -lpthread
+LDFLAGS += -lpthread
+ifneq (${shell uname}, Darwin)
+LDFLAGS += -lglut
+else
+LDFLAGS += -framework GLUT -framework OpenGL 
+endif
 
 all: obj ${firmware} ${board}
 
@@ -41,7 +46,7 @@ ${board} : ${OBJ}/button.o
 ${board} : ${OBJ}/uart_udp.o
 ${board} : ${OBJ}/${board}.o
        @echo LD $@
-       @gcc -MD ${CFLAGS} -o $@ $^ $(LDFLAGS) ${simavr}/simavr/libsimavr.a
+       @gcc -MD ${CFLAGS}  ${LFLAGS} -o $@ $^ $(LDFLAGS) ${simavr}/simavr/libsimavr.a
 
 clean:
        rm -rf obj *.a *.axf ${board} *.vcd

diff --git a/examples/board_simduino/simduino.c b/examples/board_simduino/simduino.c
index 6a3dcdc9725f2cbdae47c2e573c15fea480ad285..3152c4828f11d82e4697a8728a3b2f028605c124 100644 (file)
--- a/examples/board_simduino/simduino.c
+++ b/examples/board_simduino/simduino.c
@@ -28,7 +28,11 @@
 #include <stdio.h>
 #include <libgen.h>
 
+#if __APPLE__
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include <pthread.h>
 
 #include "sim_avr.h"

diff --git a/examples/board_timer_64led/Makefile b/examples/board_timer_64led/Makefile
index 5eb60a2e9bc77046a9959ac232356d27a696a05c..ecc286fd58c345eea908b457e1056d7e34024cd3 100644 (file)
--- a/examples/board_timer_64led/Makefile
+++ b/examples/board_timer_64led/Makefile
@@ -31,7 +31,12 @@ IPATH += ${simavr}/simavr/sim
 VPATH = .
 VPATH += ../parts
 
-LDFLAGS += -lglut -lpthread
+LDFLAGS += -lpthread
+ifneq (${shell uname}, Darwin)
+LDFLAGS += -lglut
+else
+LDFLAGS += -framework GLUT -framework OpenGL 
+endif
 
 all: obj ${firmware} ${board}
 
@@ -41,7 +46,7 @@ ${board} : ${OBJ}/button.o
 ${board} : ${OBJ}/hc595.o
 ${board} : ${OBJ}/${board}.o
        @echo LD $@
-       @gcc -MD ${CFLAGS} -o $@ $^ $(LDFLAGS) ${simavr}/simavr/libsimavr.a
+       @gcc -MD ${CFLAGS}  ${LFLAGS} -o $@ $^ $(LDFLAGS) ${simavr}/simavr/libsimavr.a
 
 clean:
        rm -rf obj *.hex *.a *.axf ${board} *.vcd

diff --git a/examples/board_timer_64led/timer_64led.c b/examples/board_timer_64led/timer_64led.c
index f85c285e4aef6f8acd1bc865c3a027d7853c7ff2..567303ca6af6d0a8fdda8d02202ef0ad1b49f825 100644 (file)
--- a/examples/board_timer_64led/timer_64led.c
+++ b/examples/board_timer_64led/timer_64led.c
@@ -22,8 +22,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <libgen.h>
-
+#if __APPLE__
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include <pthread.h>
 
 #include "sim_avr.h"