From 4c9b9776fafa21f6c4195068fff5ce60b5827572 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Wed, 8 Feb 2012 12:04:51 +0100 Subject: [PATCH] cec: use the local cec.h/cectypes.h instead of system wide when compiling libCEC and cec-client --- src/lib/CECProcessor.h | 2 +- src/lib/LibCEC.h | 2 +- src/lib/LibCECC.cpp | 4 ++-- src/lib/adapter/USBCECAdapterCommunication.h | 2 +- src/lib/adapter/USBCECAdapterDetection.h | 2 +- src/lib/devices/CECBusDevice.h | 2 +- src/lib/implementations/CECCommandHandler.h | 2 +- src/lib/libcec.pc.in | 4 ++-- src/testclient/main.cpp | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h index c21110d..f0dbda4 100644 --- a/src/lib/CECProcessor.h +++ b/src/lib/CECProcessor.h @@ -32,7 +32,7 @@ */ #include -#include +#include "../../include/cectypes.h" #include "platform/threads/threads.h" #include "platform/util/buffer.h" #include "adapter/AdapterCommunication.h" diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h index b5cf2bf..ad2eca9 100644 --- a/src/lib/LibCEC.h +++ b/src/lib/LibCEC.h @@ -32,7 +32,7 @@ */ #include -#include +#include "../../include/cec.h" #include "platform/util/buffer.h" namespace CEC diff --git a/src/lib/LibCECC.cpp b/src/lib/LibCECC.cpp index e2ae7f5..1a7b045 100644 --- a/src/lib/LibCECC.cpp +++ b/src/lib/LibCECC.cpp @@ -30,8 +30,8 @@ * http://www.pulse-eight.net/ */ -#include -#include +#include "../../include/cec.h" +#include "../../include/cecc.h" using namespace CEC; using namespace std; diff --git a/src/lib/adapter/USBCECAdapterCommunication.h b/src/lib/adapter/USBCECAdapterCommunication.h index f4fab4b..0815682 100644 --- a/src/lib/adapter/USBCECAdapterCommunication.h +++ b/src/lib/adapter/USBCECAdapterCommunication.h @@ -31,7 +31,7 @@ * http://www.pulse-eight.net/ */ -#include +#include "../../../include/cectypes.h" #include "../platform/threads/threads.h" #include "../platform/util/buffer.h" #include "AdapterCommunication.h" diff --git a/src/lib/adapter/USBCECAdapterDetection.h b/src/lib/adapter/USBCECAdapterDetection.h index 45b641b..9be3a57 100644 --- a/src/lib/adapter/USBCECAdapterDetection.h +++ b/src/lib/adapter/USBCECAdapterDetection.h @@ -31,7 +31,7 @@ * http://www.pulse-eight.net/ */ -#include +#include "../../../include/cectypes.h" namespace CEC { diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h index 79ae987..94810fb 100644 --- a/src/lib/devices/CECBusDevice.h +++ b/src/lib/devices/CECBusDevice.h @@ -31,7 +31,7 @@ * http://www.pulse-eight.net/ */ -#include +#include "../../../include/cectypes.h" #include #include "../platform/threads/mutex.h" #include "../platform/util/StdString.h" diff --git a/src/lib/implementations/CECCommandHandler.h b/src/lib/implementations/CECCommandHandler.h index e265302..be553a9 100644 --- a/src/lib/implementations/CECCommandHandler.h +++ b/src/lib/implementations/CECCommandHandler.h @@ -31,7 +31,7 @@ * http://www.pulse-eight.net/ */ -#include +#include "../../../include/cectypes.h" #include #include "../platform/threads/mutex.h" #include "../platform/util/StdString.h" diff --git a/src/lib/libcec.pc.in b/src/lib/libcec.pc.in index 3814770..9dd31cb 100644 --- a/src/lib/libcec.pc.in +++ b/src/lib/libcec.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/libcec +includedir=@includedir@ Name: libcec Description: Pulse-Eight CEC adapter library @@ -9,4 +9,4 @@ URL: http://www.pulse-eight.com/ Version: @VERSION@ Requires: @REQUIRES@ Libs: -L${libdir} -lcec -Cflags: -I${includedir} +Cflags: -I${includedir} -I${includedir}/libcec diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp index b987ff9..b049286 100644 --- a/src/testclient/main.cpp +++ b/src/testclient/main.cpp @@ -30,7 +30,7 @@ * http://www.pulse-eight.net/ */ -#include +#include "../../include/cec.h" #include #include -- 2.34.1