# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1457848586 -7200
# Node ID 73b16c2ae6bf9e7b071a5a1d23f880174e90f8d8
# Parent  d3f2a2b19504d6d6ca6f668cda74a38a11b3e8fd# Parent  daade2a35e69a4922ea3abb43fc526f9e473c17f
merge

diff -r d3f2a2b19504 -r 73b16c2ae6bf spycam/Makefile
--- a/spycam/Makefile	Sun Mar 13 07:56:03 2016 +0200
+++ b/spycam/Makefile	Sun Mar 13 07:56:26 2016 +0200
@@ -3,13 +3,15 @@
 obj = $(src:.cc=.o) $(csrc:.c=.o)
 bin = spycam
 
-warn = -pedantic -Wall
+warn = -pedantic -Wall -Wno-variadic-macros
 opt = -O0
 dbg = -g
+incdir = -I/opt/vc/include
+libdir = -L/opt/vc/lib
 
-CFLAGS = $(warn) $(opt) $(dbg)
-CXXFLAGS = $(warn) $(opt) $(dbg)
-LDFLAGS = -lX11 -lEGL -lGLESv2 -lm -lgmath
+CFLAGS = $(warn) $(opt) $(dbg) $(incdir)
+CXXFLAGS = $(warn) $(opt) $(dbg) $(incdir)
+LDFLAGS = $(libdir) -lX11 -lEGL -lGLESv2 -lm -lgmath
 
 $(bin): $(obj)
 	$(CXX) -o $@ $(obj) $(LDFLAGS)
diff -r d3f2a2b19504 -r 73b16c2ae6bf spycam/src/main.cc
--- a/spycam/src/main.cc	Sun Mar 13 07:56:03 2016 +0200
+++ b/spycam/src/main.cc	Sun Mar 13 07:56:26 2016 +0200
@@ -3,6 +3,7 @@
 #include <unistd.h>
 #include <sys/select.h>
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <GLES2/gl2.h>
 #include <EGL/egl.h>