UI improvements

This commit is contained in:
Emmanuel BENOîT 2017-11-21 17:32:52 +01:00
parent 608d08d252
commit e13d0c3638
9 changed files with 88 additions and 19 deletions

View file

@ -3,7 +3,7 @@ OUTDIR = output
CXXFLAGS += $(shell sdl2-config --cflags) -std=c++14 -Wall -g
CFLAGS += $(shell sdl2-config --cflags)
CPPFLAGS += -I. -I$(OUTDIR) \
-Iimgui -Iglm -Iebcl/include \
-Iimgui -Iglm -IIconFontCppHeaders -Iebcl/include \
-DREAL_BUILD -DGLM_ENABLE_EXPERIMENTAL
LIBS += $(shell sdl2-config --libs) -lGL -lGLEW -ldl \
$(LIBEBCL) -latomic
@ -130,3 +130,14 @@ $(LIBEBCL): ebcl-config
$(PCH): externals.hh
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
#-------------------------------------------------------------------------------
$(OUTDIR)/window.o: window.cc $(OUTDIR)/font-awesome.inl
$(OUTDIR)/font-awesome.inl: font-awesome/fonts/fontawesome-webfont.ttf $(OUTDIR)/font-to-c
$(OUTDIR)/font-to-c -base85 font-awesome/fonts/fontawesome-webfont.ttf \
FontAwesome_ >$@
$(OUTDIR)/font-to-c: imgui/extra_fonts/binary_to_compressed_c.cpp
$(CXX) -o $@ $<