CANAL View v1.0.8

rusoku · Jun 5, 2023 · f1c9d3c · f1c9d3c
1 parent aea68b2
commit f1c9d3c
Show file tree

Hide file tree

Showing 21 changed files with 1,456 additions and 906 deletions.
diff --git a/AnalyzerFrameTable.h b/AnalyzerFrameTable.h
@@ -5,7 +5,6 @@
 #include <QTimer>
 #include <QVector>
 #include "canal.h"
-#include "canal_a.h"
 #include "messagetypes.h"
 
 

diff --git a/Libraries/canal.lib b/Libraries/canal.lib
diff --git a/Libraries/canald.lib b/Libraries/canald.lib
diff --git a/StreamFrameTable.h b/StreamFrameTable.h
@@ -5,7 +5,6 @@
 #include <QTimer>
 #include <QVector>
 #include "canal.h"
-#include "canal_a.h"
 #include "messagetypes.h"
 
 

diff --git a/can_usb.pro b/can_usb.pro
@@ -13,7 +13,7 @@ TEMPLATE = app
 
 RC_ICONS = icon.ico
 
-VERSION = 1.0.7
+VERSION = 1.0.8
 QMAKE_TARGET_COMPANY = RUSOKU Technologies
 QMAKE_TARGET_PRODUCT = CANAL View
 QMAKE_TARGET_DESCRIPTION = Demo software for CANAL library
@@ -57,7 +57,6 @@ HEADERS += \
     messagetypes.h \
     rxworkerthread.h \
     portablesleep.h \
-    canal_a.h \
     txworkerthread.h \
     dialogabout.h \
     dialoginitstring.h
@@ -71,21 +70,21 @@ FORMS += \
 #           QT_NO_CAST_TO_ASCII
 
 #INCLUDEPATH += "$$PWD/ucrt"
-#LIBS += -L"$$PWD/Libraries"
+LIBS += -L"$$PWD/Libraries"
 
 # Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
-
-contains(QT_ARCH, i386) {
-    CONFIG(release, debug|release): LIBS += -L$$PWD/Libraries -lcanal32
-    CONFIG(debug, debug|release): LIBS += -L$$PWD/Libraries -lcanal32d
-
-} else {
-    CONFIG(release, debug|release): LIBS += -L$$PWD/Libraries -lcanal64
-    CONFIG(debug, debug|release): LIBS += -L$$PWD/Libraries -lcanal64d
-}
+#qnx: target.path = /tmp/$${TARGET}/bin
+#else: unix:!android: target.path = /opt/$${TARGET}/bin
+#!isEmpty(target.path): INSTALLS += target
+
+#contains(QT_ARCH, i386) {
+    CONFIG(release, debug|release): LIBS += -L$$PWD/Libraries -lcanal
+    CONFIG(debug, debug|release): LIBS += -L$$PWD/Libraries -lcanald
+
+#} else {
+#    CONFIG(release, debug|release): LIBS += -L$$PWD/Libraries -lcanal
+#    CONFIG(debug, debug|release): LIBS += -L$$PWD/Libraries -lcanal
+#}
 
 RESOURCES += \
     resource.qrc

diff --git a/can_usb.pro.user b/can_usb.pro.user
diff --git a/can_usb.pro.user.a8408b7 b/can_usb.pro.user.a8408b7