DPF

commit 7a35b856d4f22f4d9bc5a12430ae3e348373238b
parent bd53e783dbdce4e4da22d4c19d458a0aca0e9a4d
Author: falkTX <falktx@gmail.com>
Date:   Tue, 29 Apr 2014 23:30:02 +0100

Don't build text stuff; lac pres update

Diffstat:
M
dgl/Makefile
 | 
20
++++++++++----------
M
examples/Makefile
 | 
6
+++---
M
lac/2014-small-talk.odp
 | 
0

3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dgl/Makefile b/dgl/Makefile
@@ -26,16 +26,16 @@ OBJS = \
 	src/Window.cpp.o
 
 # freetype-gl
-OBJS += \
-	src/freetype-gl/font-manager.c.o \
-	src/freetype-gl/mat4.c.o \
-	src/freetype-gl/shader.c.o \
-	src/freetype-gl/text-buffer.c.o \
-	src/freetype-gl/texture-atlas.c.o \
-	src/freetype-gl/texture-font.c.o \
-	src/freetype-gl/vector.c.o \
-	src/freetype-gl/vertex-attribute.c.o \
-	src/freetype-gl/vertex-buffer.c.o
+# OBJS += \
+# 	src/freetype-gl/font-manager.c.o \
+# 	src/freetype-gl/mat4.c.o \
+# 	src/freetype-gl/shader.c.o \
+# 	src/freetype-gl/text-buffer.c.o \
+# 	src/freetype-gl/texture-atlas.c.o \
+# 	src/freetype-gl/texture-font.c.o \
+# 	src/freetype-gl/vector.c.o \
+# 	src/freetype-gl/vertex-attribute.c.o \
+# 	src/freetype-gl/vertex-buffer.c.o
 
 ifeq ($(MACOS),true)
 OBJS += src/pugl/pugl_osx_extended.m.o
diff --git a/examples/Makefile b/examples/Makefile
@@ -14,12 +14,12 @@ LINK_FLAGS      += -L.. -ldgl $(DGL_LIBS)
 # --------------------------------------------------------------
 
 ifeq ($(WIN32),true)
-TARGETS = app.exe color.exe images.exe nekobi-ui.exe text.exe
+TARGETS = app.exe color.exe images.exe nekobi-ui.exe
 else
 ifeq ($(MACOS),true)
-TARGETS = app color images nekobi-ui text
+TARGETS = app color images nekobi-ui
 else
-TARGETS = app cairo color images nekobi-ui text
+TARGETS = app cairo color images nekobi-ui
 endif
 endif
 
diff --git a/lac/2014-small-talk.odp b/lac/2014-small-talk.odp
Binary files differ.