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

[nageru] / Makefile

diff --git a/Makefile b/Makefile
index 2608903245524df9dc936e1fb7d737f8e4e81d23..7ae9a5cd93e8bca81093cfce5b23d7f28b6a50ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
 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
+OBJS_WITH_MOC = mainwindow.o jpeg_frame_view.o clip_list.o
 OBJS += $(OBJS_WITH_MOC)
 OBJS += $(OBJS_WITH_MOC:.o=.moc.o) 
 
-OBJS += ffmpeg_raii.o main.o
+OBJS += ffmpeg_raii.o main.o player.o
 
 %.o: %.cpp
        $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
@@ -25,12 +25,18 @@ OBJS += ffmpeg_raii.o main.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)