doorbell

changeset 3:73b16c2ae6bf
merge
author: John Tsiombikas <nuclear@member.fsf.org>
date: Sun, 13 Mar 2016 07:56:26 +0200
parents: d3f2a2b19504 daade2a35e69
children: 08ea0abdbb8a
diffstat: 2 files changed, 7 insertions(+), 4 deletions(-) [+]
[-]

spycam/Makefile 10

spycam/src/main.cc 1 spycam/Makefile 10 spycam/src/main.cc 1
spycam/Makefile 10
spycam/src/main.cc 1
     1.1 --- a/spycam/Makefile	Sun Mar 13 07:56:03 2016 +0200
     1.2 +++ b/spycam/Makefile	Sun Mar 13 07:56:26 2016 +0200
     1.3 @@ -3,13 +3,15 @@
     1.4  obj = $(src:.cc=.o) $(csrc:.c=.o)
     1.5  bin = spycam
     1.6  
     1.7 -warn = -pedantic -Wall
     1.8 +warn = -pedantic -Wall -Wno-variadic-macros
     1.9  opt = -O0
    1.10  dbg = -g
    1.11 +incdir = -I/opt/vc/include
    1.12 +libdir = -L/opt/vc/lib
    1.13  
    1.14 -CFLAGS = $(warn) $(opt) $(dbg)
    1.15 -CXXFLAGS = $(warn) $(opt) $(dbg)
    1.16 -LDFLAGS = -lX11 -lEGL -lGLESv2 -lm -lgmath
    1.17 +CFLAGS = $(warn) $(opt) $(dbg) $(incdir)
    1.18 +CXXFLAGS = $(warn) $(opt) $(dbg) $(incdir)
    1.19 +LDFLAGS = $(libdir) -lX11 -lEGL -lGLESv2 -lm -lgmath
    1.20  
    1.21  $(bin): $(obj)
    1.22  	$(CXX) -o $@ $(obj) $(LDFLAGS)

     2.1 --- a/spycam/src/main.cc	Sun Mar 13 07:56:03 2016 +0200
     2.2 +++ b/spycam/src/main.cc	Sun Mar 13 07:56:26 2016 +0200
     2.3 @@ -3,6 +3,7 @@
     2.4  #include <unistd.h>
     2.5  #include <sys/select.h>
     2.6  #include <X11/Xlib.h>
     2.7 +#include <X11/Xutil.h>
     2.8  #include <X11/Xatom.h>
     2.9  #include <GLES2/gl2.h>
    2.10  #include <EGL/egl.h>