From patchwork Fri Dec 12 18:27:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 5484701 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 746A19F1D4 for ; Fri, 12 Dec 2014 18:27:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA260201EF for ; Fri, 12 Dec 2014 18:27:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5268200F3 for ; Fri, 12 Dec 2014 18:27:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932945AbaLLS12 (ORCPT ); Fri, 12 Dec 2014 13:27:28 -0500 Received: from mout.gmx.net ([212.227.17.22]:59317 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759274AbaLLS1H (ORCPT ); Fri, 12 Dec 2014 13:27:07 -0500 Received: from linux.local ([94.216.58.185]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0M3eDF-1XhpUG29Zp-00rHUw for ; Fri, 12 Dec 2014 19:27:05 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH] qv4l2: fix qmake project file Date: Fri, 12 Dec 2014 19:27:04 +0100 Message-Id: <1418408824-4621-1-git-send-email-ps.report@gmx.net> X-Mailer: git-send-email 2.1.2 X-Provags-ID: V03:K0:2KTCQt2NZwcfgXUWJz4RUxHU3xl6y13/8158N04WgbvAlbH7Y0H +Yhy3RFJQS9sdsMSTXm9vpWh4+Nu4MHnEZVFinqUEUfjIQA6NaSrc8+Tq8qIryAW7cvc8nJ W6XtvJr//eRjJ20VBiwL09PTZ+1tFXDat0ElRjVuifI6PyhDkNiLLTDnK2zlFoRNJ30VpMl TzzaAn2EhlZSC62cNsgvw== X-UI-Out-Filterresults: notjunk:1; Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP - do not use private paths (as done by mistake) - fix v4l-utils in place library paths Signed-off-by: Peter Seiderer --- utils/qv4l2/qv4l2.pro | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/qv4l2/qv4l2.pro b/utils/qv4l2/qv4l2.pro index 19a046a..82500af 100644 --- a/utils/qv4l2/qv4l2.pro +++ b/utils/qv4l2/qv4l2.pro @@ -15,9 +15,9 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets # line and the line '#define HAVE_QTGL 1' from ../../config.h lessThan(QT_MAJOR_VERSION, 5): QT += opengl -INCLUDEPATH += /home/seiderer/Work/v4l_utils/v4l-utils -INCLUDEPATH += /home/seiderer/Work/v4l_utils/v4l-utils/utils/v4l2-ctl/ -INCLUDEPATH += /home/seiderer/Work/v4l_utils/v4l-utils/utils/v4l2-compliance +INCLUDEPATH += $$PWD/../.. +INCLUDEPATH += $$PWD/../v4l2-ctl/ +INCLUDEPATH += $$PWD/../v4l2-compliance # Input HEADERS += alsa_stream.h @@ -44,9 +44,9 @@ SOURCES += vbi-tab.cpp SOURCES += ../v4l2-ctl/vivid-tpg.c SOURCES += ../v4l2-ctl/vivid-tpg-colors.c -LIBS += -L$$PWD/../../lib/libv4l2 -lv4l2 -LIBS += -L$$PWD/../../lib/libv4lconvert -lv4lconvert -LIBS += -L$$PWD/../libv4l2util -lv4l2util +LIBS += -L$$PWD/../../lib/libv4l2/.libs -lv4l2 +LIBS += -L$$PWD/../../lib/libv4lconvert/.libs -lv4lconvert +LIBS += -L$$PWD/../libv4l2util/.libs -lv4l2util LIBS += -lrt -ldl -ljpeg RESOURCES += qv4l2.qrc