CArunGUI/CArunGUI.pro

@@ -4,8 +4,6 @@ QT      +=network
     # for TCP-IP
 
 TARGET  = CArunGui
-VERSION = "1.0.0"
-
 DESTDIR=$${_PRO_FILE_PWD_}/../build
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

DCLibraries.pri

@@ -2,7 +2,6 @@ CONFIG += plugin
 QT -= gui
 QT += widgets serialport
 
-
 win32 {
     BUILD_DATE=$$system("date /t")
     BUILD_TIME=$$system("time /t")
@@ -30,26 +29,10 @@ DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 # keep comments, as /* fall through */
 QMAKE_CXXFLAGS += -C
 # _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
-QMAKE_CXXFLAGS += -O2 -O
+QMAKE_CXXFLAGS += -O
 QMAKE_CXXFLAGS += -g
 QMAKE_CXXFLAGS += -Wno-deprecated-copy
 
-QMAKE_LFLAGS += -Wl,-e,main
-
-gccmain.input = SOURCES_MAIN
-gccmain.output = main.o
-gccmain.commands = \
-    $$QMAKE_CXX -c $$PWD/src/main.cpp -o main.o -fPIC -O0 -DAPP_VERSION=\\\"$$VERSION\\\" \
-                -DAPP_BUILD_DATE=\\\"$$BUILD_DATE\\\" \
-                -DAPP_BUILD_TIME=\\\"$$BUILD_TIME\\\" \
-                -DAPP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\" \
-                -I. \
-                -I../../DCLibraries/include \
-                -I/opt/ptu5/opt/phytec-yogurt/i.MX6-thud-PCM058-KSP30-ATB-PTU5-2019-10-30/sysroots/cortexa9t2hf-neon-phytec-linux-gnueabi/usr/include/
-
-QMAKE_EXTRA_COMPILERS += gccmain
-SOURCES_MAIN += $$PWD/src/main.cpp
-
 # default
 ARCH = PTU5
 CONFIG += PTU5
@@ -97,8 +80,9 @@ HEADERS += \
 
 SOURCES += \
     $${PWD}/src/com.cpp \
-    $${PWD}/src/datei.cpp \
+    $$PWD/src/datei.cpp \
-    $${PWD}/src/runProc.cpp \
+    $$PWD/src/runProc.cpp \
+    $$PWD/src/main.cpp \
     $${PWD}/src/controlBus.cpp \
     $${PWD}/src/datIf.cpp \
     $${PWD}/src/dcBL.cpp \

dCArun/dCArun.pro

@@ -4,8 +4,6 @@ QT      +=network
     # for TCP-IP
 
 TARGET  = dCArun
-VERSION = "1.0.0"
-
 DESTDIR=$${_PRO_FILE_PWD_}/../build
 
 

lib_ca_master/lib_ca_master.pro

@@ -6,8 +6,5 @@ include(../DCLibraries.pri)
 
 DEFINES+=THIS_IS_CA_MASTER
 DESTDIR=$${_PRO_FILE_PWD_}/../build
-
+system("mkdir -p $${DESTDIR}")
-unix {
+system("cp ../include/interfaces.h $${DESTDIR}")
-    system("mkdir -p $${DESTDIR}")
-    system("cp ../include/interfaces.h $${DESTDIR}")
-}

lib_ca_slave/lib_ca_slave.pro

@@ -6,8 +6,5 @@ include(../DCLibraries.pri)
 
 DEFINES+=THIS_IS_CA_SLAVE
 DESTDIR=$${_PRO_FILE_PWD_}/../build
-
+system("mkdir -p $${DESTDIR}")
-unix {
+system("cp ../include/interfaces.h $${DESTDIR}")
-    system("mkdir -p $${DESTDIR}")
-    system("cp ../include/interfaces.h $${DESTDIR}")
-}

src/main.cpp

@@ -1,25 +1,9 @@
+#include <QCoreApplication>
+#include "tslib.h"
 
-#ifndef WIN32
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
 
-#undef _FORTIFY_SOURCE
+    return a.exec();
-
-#include <unistd.h> // _exit(0)
-#include <stdio.h>
-
-// Must define the interpreter to be the dynamic linker
-#ifdef __LP64__
-#error "__LP64__ not defined for PTU5"
-#else
-const char service_interp[] __attribute__((section(".interp"))) = "/lib/ld-linux-armhf.so.3";
-#endif
-
-
-int main(int argc, char *argv[]) {
-    (void)argc;
-    (void)argv;
-
-    printf("%s %s %s\n", APP_EXTENDED_VERSION, APP_BUILD_DATE, APP_BUILD_TIME);
-    _exit(0);
 }
-
-#endif