b49c5003f6f9dad3cae0cae0d334efc4c1e872e9

Use pkg-config if possible, don't use alloca()

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

diff --git a/examples/Makefile.opengl b/examples/Makefile.opengl
new file mode 100644 (file)
index 0000000..4b1f3a8
--- /dev/null
+++ b/examples/Makefile.opengl
@@ -0,0 +1,18 @@
+
+UNAME = ${shell uname}
+
+ifeq (${UNAME}, Darwin)
+LDFLAGS += -framework GLUT -framework OpenGL
+else
+ifeq  (${UNAME}, Linux)
+CFLAGS += ${shell pkg-config --cflags glu}
+LDFLAGS += ${shell pkg-config --libs glu} -lglut
+else
+CFLAGS += ${shell pkg-config --cflags glu glut} -DFREEBSD=1
+LDFLAGS += ${shell pkg-config --libs glu glut}
+endif
+endif
+
+ifeq  (${UNAME}, FreeBSD)
+CFLAGS += -DFREEBSD=1 -DNO_ALLOCA=1
+endif

diff --git a/examples/board_hd77480/Makefile b/examples/board_hd77480/Makefile
index dcae86483e401fdbeedb352327c9b701561d63e3..9666fa0a80c9e12368b47ab834d7d0baf561d95f 100644 (file)
--- a/examples/board_hd77480/Makefile
+++ b/examples/board_hd77480/Makefile
@@ -30,11 +30,8 @@ VPATH = .
 VPATH += ../parts
 
 LDFLAGS += -lpthread
-ifneq (${shell uname}, Darwin)
-LDFLAGS += -lGL -lglut
-else
-LDFLAGS += -framework GLUT -framework OpenGL 
-endif
+
+include ../Makefile.opengl
 
 all: obj atmega48_charlcd.axf ${target} 
 

diff --git a/examples/board_ledramp/Makefile b/examples/board_ledramp/Makefile
index 6a537d266e9521f8fc9d38dd00c9d20a2a3a2f8f..92dfc081e1101fec1787d89cc08189cf9c596766 100644 (file)
--- a/examples/board_ledramp/Makefile
+++ b/examples/board_ledramp/Makefile
@@ -30,11 +30,8 @@ VPATH = .
 VPATH += ../parts
 
 LDFLAGS += -lpthread
-ifneq (${shell uname}, Darwin)
-LDFLAGS += -lGL -lglut
-else
-LDFLAGS += -framework GLUT -framework OpenGL 
-endif
+
+include ../Makefile.opengl
 
 all: obj ${firmware} ${target}
 

diff --git a/examples/board_reprap/Makefile b/examples/board_reprap/Makefile
index 7a6ceb1cb9d949a03c7591142762978a3779265e..ccc3f4d3339f1dd2762eb5354fb21987e2184539 100644 (file)
--- a/examples/board_reprap/Makefile
+++ b/examples/board_reprap/Makefile
@@ -37,11 +37,8 @@ VPATH += ../shared
 CFLAGS += -DMOTHERBOARD=91
 CFLAGS += ${shell pkg-config --cflags pangocairo}
 
-ifneq (${shell uname}, Darwin)
-LDFLAGS += -lGL -lglut -lGLU
-else
-LDFLAGS += -framework GLUT -framework OpenGL 
-endif
+include ../Makefile.opengl
+
 LDFLAGS += ${shell pkg-config --libs pangocairo}
 LDFLAGS += -lpthread -lutil -ldl
 LDFLAGS += -lm

diff --git a/examples/board_reprap/src/c3/c_utils.h b/examples/board_reprap/src/c3/c_utils.h
index e6bad576c000727e0354b30aa79448962d33e552..2360fd8bc671e134b284cad4d5a369b8eb7e9883 100644 (file)
--- a/examples/board_reprap/src/c3/c_utils.h
+++ b/examples/board_reprap/src/c3/c_utils.h
@@ -26,6 +26,9 @@
 #ifndef __C_UTILS_H__
 #define __C_UTILS_H__
 
+#ifndef NO_ALLOCA
+#include <alloca.h>
+#endif
 #include "c_array.h"
 
 /********************************************************************
@@ -107,6 +110,7 @@ static inline str_p str_dup(const str_p s)
        memcpy(r, s, l);
        return r;
 }
+#ifndef NO_ALLOCA
 static inline str_p str_adup(const str_p s)
 {
        size_t l = sizeof(*s) + s->len + 1;
@@ -115,6 +119,7 @@ static inline str_p str_adup(const str_p s)
        r->rom = 1;
        return r;
 }
+#endif
 static inline uint16_t str_hash(str_p s)
 {
        if (!s->hash) s->hash = crc16_string(s->str);

diff --git a/examples/board_simduino/Makefile b/examples/board_simduino/Makefile
index 75de2bfbe6a4c071d6113e95f501e48ce35da801..cf72f3324c5fb5e2e671acd084cab0be1c0af4c5 100644 (file)
--- a/examples/board_simduino/Makefile
+++ b/examples/board_simduino/Makefile
@@ -30,11 +30,8 @@ VPATH = .
 VPATH += ../parts
 
 LDFLAGS += -lpthread -lutil
-ifneq (${shell uname}, Darwin)
-LDFLAGS += -lGL -lglut
-else
-LDFLAGS += -framework GLUT -framework OpenGL 
-endif
+
+include ../Makefile.opengl
 
 all: obj ${firmware} ${target}
 

diff --git a/examples/board_timer_64led/Makefile b/examples/board_timer_64led/Makefile
index 665025f3a6d0b1c66d60b062f242bb51afb0fd5a..231ae9208edb62e1bf4a72638b0f4f9c4219002d 100644 (file)
--- a/examples/board_timer_64led/Makefile
+++ b/examples/board_timer_64led/Makefile
@@ -30,11 +30,8 @@ VPATH = .
 VPATH += ../parts
 
 LDFLAGS += -lpthread
-ifneq (${shell uname}, Darwin)
-LDFLAGS += -lGL -lglut
-else
-LDFLAGS += -framework GLUT -framework OpenGL 
-endif
+
+include ../Makefile.opengl
 
 all: obj ${firmware} ${target}