# HG changeset patch # User John Tsiombikas # Date 1316520995 -10800 # Node ID b03c0dcd040541dff9c93c7ecdc15ff834a2b35b # Parent b599434670cbdcc3cc6b9ba810083b959d92e0ee fixed for macosx diff -r b599434670cb -r b03c0dcd0405 examples/simple/Makefile --- a/examples/simple/Makefile Sun Sep 18 14:18:25 2011 +0300 +++ b/examples/simple/Makefile Tue Sep 20 15:16:35 2011 +0300 @@ -5,23 +5,24 @@ CFLAGS = -pedantic -Wall -g -I../../src LDFLAGS = -L. -ldrawtext $(libgl) -lib_so = libdrawtext.so font = serif.ttf ifeq ($(shell uname -s), Darwin) libgl = -framework OpenGL -framework GLUT + lib_so = libdrawtext.dylib else libgl = -lGL -lGLU -lglut + lib_so = libdrawtext.so.0.0 endif $(bin): $(obj) $(lib_so) $(font) $(CC) -o $@ $(obj) $(LDFLAGS) -$(lib_so): ../../libdrawtext.so.0.0 +$(lib_so): ../../$(lib_so) rm -f $@ ln -s $< $@ -$(font): ../fonts/FreeSerif.ttf +$(font): ../fonts/linux-libertine.ttf rm -f $@ ln -s $< $@ diff -r b599434670cb -r b03c0dcd0405 examples/unicode/Makefile --- a/examples/unicode/Makefile Sun Sep 18 14:18:25 2011 +0300 +++ b/examples/unicode/Makefile Tue Sep 20 15:16:35 2011 +0300 @@ -5,19 +5,20 @@ CFLAGS = -pedantic -Wall -g -I../../src LDFLAGS = -L. -ldrawtext $(libgl) -lib_so = libdrawtext.so fonts = serif.ttf cjk.ttf klingon.ttf ifeq ($(shell uname -s), Darwin) libgl = -framework OpenGL -framework GLUT + lib_so = libdrawtext.dylib else libgl = -lGL -lGLU -lglut + lib_so = libdrawtext.so.0.0 endif $(bin): $(obj) $(lib_so) $(fonts) $(CC) -o $@ $(obj) $(LDFLAGS) -$(lib_so): ../../libdrawtext.so.0.0 +$(lib_so): ../../$(lib_so) rm -f $@ ln -s $< $@ diff -r b599434670cb -r b03c0dcd0405 src/drawgl.c --- a/src/drawgl.c Sun Sep 18 14:18:25 2011 +0300 +++ b/src/drawgl.c Tue Sep 20 15:16:35 2011 +0300 @@ -21,7 +21,7 @@ #include -#if defined(__IPHONE_3_0) || defined(__IPHONE_3_2) || defined(__IPHONE_4_0) +#ifdef TARGET_IPHONE #include #else #include