An neue Bibliotheksstruktur angepasst.

cmdopt.c

@@ -11,8 +11,8 @@
 #include <time.h>
 #include <errno.h>
 #include <getopt.h>
-#include <gfaserial.h>
-#include <gfabootlmast.h>
+#include <gfa/gfaserial.h>
+#include <gfa/gfabootlmast.h>
 #include "main.h"
 #include "cmdopt.h"
 #include "error.h"

error.c

@@ -1,4 +1,4 @@
-#include <gfabootlmast.h>
+#include <gfa/gfabootlmast.h>
 #include "error.h"
 
 /////////////////////////////////////////////////////////////////////////////

gfativaflashutil.pro

@@ -3,6 +3,9 @@ CONFIG += console
 CONFIG -= app_bundle
 CONFIG -= qt
 
+QMAKE_LIBDIR += $$[QT_SYSROOT]/usr/lib/gfa
+QMAKE_RPATHDIR += /usr/lib/gfa
+
 CONFIG(debug, debug|release) {
     QMAKE_CXXFLAGS -= -Os
     QMAKE_CFLAGS -= -Os
@@ -22,9 +25,6 @@ linux-buildroot-g++ {
 	INSTALLS += target
 }
 
-#QMAKE_INCDIR += ../ti
-#QMAKE_LIBDIR += $$OUT_PWD/../../../libmininet/Debug/Desktop_Qt_5_7_0_GCC_64bit
-
 SOURCES += main.c \
     image.c \
     cmdopt.c \

image.c

@@ -12,11 +12,10 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <errno.h>
 #include <getopt.h>
-#include <gfaserial.h>
-#include <gfabootlmast.h>
+#include <gfa/gfaserial.h>
+#include <gfa/gfabootlmast.h>
 #include "main.h"
 #include "image.h"
 #include "error.h"

main.c

@@ -14,8 +14,8 @@
 #include <getopt.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <gfaserial.h>
-#include <gfabootlmast.h>
+#include <gfa/gfaserial.h>
+#include <gfa/gfabootlmast.h>
 #include "main.h"
 #include "cmdopt.h"
 #include "image.h"

modbmst.c

@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <errno.h>
-#include <gfaserial.h>
+#include <gfa/gfaserial.h>
 #include "output.h"
 #include "error.h"
 #include "modbmst.h"

modbmst.h

@@ -4,9 +4,9 @@
 #if !defined(AGD_MODBMST_H__7E9090EE_6B4D_4499_8080_03241FAC527B__INCLUDED_)
 #define AGD_MODBMST_H__7E9090EE_6B4D_4499_8080_03241FAC527B__INCLUDED_
 
-#include <gfamininetmst.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <gfa/gfamininetmst.h>
 
 #ifdef __cplusplus
 extern "C" {

output.h

@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <gfabootlmast.h>
+#include <gfa/gfabootlmast.h>
 #include "qmlplugin/libgfativaflashplugin/tagnames.h"
 
 #ifdef __cplusplus

qmlplugin/Demo/Demo.pro

@@ -13,17 +13,14 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
+QMAKE_LIBDIR += $$[QT_SYSROOT]/usr/lib/gfa
+QMAKE_RPATHDIR += /usr/lib/gfa
+
 SOURCES += \
         main.cpp
 
 RESOURCES += qml.qrc
 
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
-
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin

qmlplugin/libgfativaflashplugin/gfativaflashplugin.pro

@@ -15,6 +15,10 @@ CONFIG(release, debug|release) {
     QMAKE_LIBS += -lgfamininet
 }
 
+QMAKE_LIBDIR += $$[QT_SYSROOT]/usr/lib/gfa
+QMAKE_RPATHLINKDIR += /usr/lib/gfa
+QMAKE_RPATHDIR += /usr/lib/gfa
+
 uri = gfa.plugins.qml.tivaflash
 
 DISTFILES = qmldir