diff --git a/dgl/Makefile b/dgl/Makefile index 2209ac6c..4b3b9aab 100644 --- 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 index 8da131ea..58926c36 100644 --- 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 index d3ad04cb..89465757 100644 Binary files a/lac/2014-small-talk.odp and b/lac/2014-small-talk.odp differ