Remove the rather pointless enable_if tests for now. And move to C++14.

[nageru] / Makefile

diff --git a/Makefile b/Makefile
index 42b5ea04fff974c5ccc3fbbf2144c94924fc63ae..7ae9a5cd93e8bca81093cfce5b23d7f28b6a50ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 CXX=g++
-PKG_MODULES := Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport libjpeg
+PKG_MODULES := Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL Qt5PrintSupport libjpeg movit
 CXXFLAGS ?= -O2 -g -Wall  # Will be overridden by environment.
-CXXFLAGS += -std=gnu++11 -fPIC $(shell pkg-config --cflags $(PKG_MODULES)) -pthread
+CXXFLAGS += -fPIC $(shell pkg-config --cflags $(PKG_MODULES)) -DMOVIT_SHADER_DIR=\"$(shell pkg-config --variable=shaderdir movit)\" -pthread
 
-LDLIBS=$(shell pkg-config --libs $(PKG_MODULES)) -pthread -lavformat -lavcodec -lavutil -lswscale
+LDLIBS=$(shell pkg-config --libs $(PKG_MODULES)) -pthread -lavformat -lavcodec -lavutil -lswscale -lGL
 
 # Qt objects
 OBJS_WITH_MOC = mainwindow.o jpeg_frame_view.o clip_list.o
@@ -25,12 +25,18 @@ OBJS += ffmpeg_raii.o main.o player.o
 %.moc.cpp: %.h
        moc $< -o $@
 
-all: futatabi
+all: futatabi flow vis eval
 
 mainwindow.o: ui_mainwindow.h
 
 futatabi: $(OBJS) $(CEF_LIBS)
        $(CXX) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+flow: flow.o gpu_timers.o
+       $(CXX) -o $@ $^ -lepoxy -lSDL2 -lSDL2_image
+eval: eval.o util.o
+       $(CXX) -o $@ $^
+vis: vis.o util.o
+       $(CXX) -o $@ $^
 
 DEPS=$(OBJS:.o=.d)
 -include $(DEPS)