Browse Source

Don't build text stuff; lac pres update

gh-pages
falkTX 11 years ago
parent
commit
7a35b856d4
3 changed files with 13 additions and 13 deletions
  1. +10
    -10
      dgl/Makefile
  2. +3
    -3
      examples/Makefile
  3. BIN
      lac/2014-small-talk.odp

+ 10
- 10
dgl/Makefile View File

@@ -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


+ 3
- 3
examples/Makefile View File

@@ -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



BIN
lac/2014-small-talk.odp View File


Loading…
Cancel
Save