From acc91e1262c2360f1bf2d436e89a47549278ad73 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Fri, 15 Mar 2024 12:42:05 +0100 Subject: [PATCH] Use interfaces.h from current libCA --- APservice.pro | 30 ++++++++++++++++++++++++++++-- plugin.h | 2 +- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/APservice.pro b/APservice.pro index d70148a..c326b2a 100755 --- a/APservice.pro +++ b/APservice.pro @@ -15,6 +15,33 @@ QMAKE_CXXFLAGS += -Wno-deprecated-copy # In order to do so, uncomment the following line. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +contains( CONFIG, PTU5 ) { + # QMAKE_CC = ccache $$QMAKE_CC + # QMAKE_CXX = ccache $$QMAKE_CXX + QMAKE_CXXFLAGS += -std=c++11 + linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments } + CONFIG += link_pkgconfig + PTU5BASEPATH = /opt/devel/ptu5 + ARCH = PTU5 + + INCLUDEPATH += $$PTU5BASEPATH/qt/libs/deviceController/include/ + LIBS += -L$$PTU5BASEPATH/qt/libs/deviceController/library + + LIBS += -lCAslave + LIBS += -lCAmaster +} + +contains( CONFIG, PTU5_YOCTO ) { + PTU5BASEPATH = /opt/devel/ptu5 + ARCH = PTU5 + + LIBS += -lCAslave + LIBS += -lCAmaster +} + + + SOURCES += \ globVars.cpp \ keypad.cpp \ @@ -76,5 +103,4 @@ HEADERS += \ win20.h \ win_template.h \ datei.h \ - plugin.h \ - interfaces.h + plugin.h diff --git a/plugin.h b/plugin.h index aec497c..c993158 100755 --- a/plugin.h +++ b/plugin.h @@ -1,5 +1,5 @@ #ifndef PLUGIN_H #define PLUGIN_H -#include "interfaces.h" +#include #endif