From 6186e639be8c3699e14006fe2e6bf34ff714e6af Mon Sep 17 00:00:00 2001
From: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
Date: Fri, 29 May 2015 21:16:16 +0100
Subject: [PATCH 1/2] updated support for proper libc3 build on OSX

Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
---
 Makefile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 14f7d15..7e0bfc4 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ CC = gcc
 target=	reprap
 firm_src = ${wildcard atmega*.c}
 firmware = ${firm_src:.c=.hex}
+PLATFORM	= ${shell uname | tr '[A-Z]' '[a-z]'}
 
 SIMAVR_R	= shared/simavr
 LIBC3		= shared/libc3
@@ -52,9 +53,13 @@ CPPFLAGS += ${patsubst %,-I%,${subst :, ,${IPATH}}}
 LDFLAGS = ${shell pkg-config --libs IL 2>/dev/null}
 LDFLAGS += -lpthread -lutil -ldl
 LDFLAGS += -lm
-LDFLAGS += -Wl,-rpath $(LIBC3)/${OBJ}/.libs -L$(LIBC3)/${OBJ}/.libs -lc3 -lc3gl
 LDFLAGS += -Wl,-rpath ${SIMAVR_R}/simavr/${OBJ} -L${SIMAVR_R}/simavr/${OBJ} 
 LDFLAGS += -L${FTGL}/${OBJ} -lfreetype-gl ${shell $(FTC) --libs} 
+ifeq (${PLATFORM}, darwin)
+  LDFLAGS += -Wl,-rpath $(LIBC3)/${OBJ}/ -L$(LIBC3)/${OBJ}/ -lc3 -lc3gl
+else
+  LDFLAGS += -Wl,-rpath $(LIBC3)/${OBJ}/.libs -L$(LIBC3)/${OBJ}/.libs -lc3 -lc3gl
+endif
 
 include ${SIMAVR_R}/examples/Makefile.opengl
 
@@ -76,8 +81,15 @@ ${board} : ${OBJ}/${target}_gl.o
 
 build-simavr:
 	$(MAKE) -C $(SIMAVR_R) CC="$(CC)" CFLAGS="$(CFLAGS)" build-simavr
+ifeq (${PLATFORM}, darwin)
 build-libc3:
 	$(MAKE) -C $(LIBC3) CC="$(CC)" CFLAGS="$(CFLAGS)"
+	cp ${LIBC3}/${OBJ}/libc3.dylib ${OBJ}
+	cp ${LIBC3}/${OBJ}/libc3gl.dylib ${OBJ}
+else
+build-libc3:
+	$(MAKE) -C $(LIBC3) CC="$(CC)" CFLAGS="$(CFLAGS)"
+endif
 build-ftgl:
 	$(MAKE) -C $(FTGL) CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" \
 		CFLAGS="$(CFLAGS)" lib

From dd7deaeaf187e75b5d5b21e6124506eae6c9f0d2 Mon Sep 17 00:00:00 2001
From: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
Date: Fri, 29 May 2015 21:17:41 +0100
Subject: [PATCH 2/2] fixed libc3 compilation on OSX

Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
---
 shared/libc3/Makefile | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/shared/libc3/Makefile b/shared/libc3/Makefile
index ae5fe9c..d33a99b 100644
--- a/shared/libc3/Makefile
+++ b/shared/libc3/Makefile
@@ -44,7 +44,11 @@ DESTDIR		= /usr/local
 
 -include ${wildcard .make.options*}
 
+ifeq (${PLATFORM}, darwin)
+all:	${OBJ} src/$(CONFIG_H) ${OBJ}/libc3.dylib ${OBJ}/libc3gl.dylib
+else
 all:	${OBJ} src/$(CONFIG_H) ${OBJ}/libc3.la ${OBJ}/libc3gl.la
+endif
 
 ${OBJ}:
 	mkdir -p ${OBJ}
@@ -66,6 +70,18 @@ src/$(CONFIG_H): Makefile
 	printf "#endif\n"; \
 	) >$@
 
+${OBJ}/libc3.dylib: ${C3OBJ}
+	@echo LINK $@
+	$(E)$(CC) -dynamiclib -undefined suppress \
+		-compatibility_version 1.0.0 -current_version 1.0.0 \
+		-flat_namespace ${C3OBJ:.lo=.o} -o $@ $(LDFLAGS)
+
+${OBJ}/libc3gl.dylib: ${C3GLOBJ}
+	@echo LINK $@
+	$(E)$(CC) -dynamiclib -undefined suppress \
+		-compatibility_version 1.0.0 -current_version 1.0.0 \
+		-flat_namespace ${C3GLOBJ:.lo=.o} -o $@ $(LDFLAGS)
+
 ${OBJ}/libc3.la: ${C3OBJ}
 	@echo LINK $@
 	$(E)$(LIBTOOL) --mode=link --tag=CC \
@@ -106,4 +122,4 @@ clean:
 
 # include the dependency files generated by gcc, if any
 -include ${wildcard ${OBJ}/*.d}
- 
\ No newline at end of file
+