创建M1 测试工具分支，初步可以编译通过

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644 (file)
index 0000000..c271e66
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,64 @@
+{\r
+    "configurations": [\r
+        {\r
+            "name": "Win32",\r
+            "includePath": [\r
+                "${workspaceFolder}/**",\r
+                "${workspaceFolder}/lib",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include/QtCore",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include/QtGui",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include/QtWidgets",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include/QtSql",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include/QtSerialPort",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include/QtANGLE",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include/QtCore/5.14.2",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include/QtCore/5.14.2/QtCore",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include/QtGui/5.14.2",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include/QtGui/5.14.2/QtGui",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include/QtWidgets/5.14.2",\r
+                "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include/QtWidgets/5.14.2/QtWidgets",\r
+                "C:/Program Files (x86)/Windows Kits/10/Include/*/um",\r
+                "C:/Program Files (x86)/Windows Kits/10/Include/*/shared",\r
+                "C:/Program Files (x86)/Windows Kits/10/Include/*/winrt"\r
+            ],\r
+            "defines": [\r
+                "_DEBUG",\r
+                "UNICODE",\r
+                "_UNICODE",\r
+                "WIN32",\r
+                "MINGW_HAS_SECURE_API=1",\r
+                "QT_WIDGETS_LIB",\r
+                "QT_GUI_LIB",\r
+                "QT_SQL_LIB",\r
+                "QT_SERIALPORT_LIB",\r
+                "QT_CORE_LIB",\r
+                "QT_NEEDS_QMAIN"\r
+            ],\r
+            "windowsSdkVersion": "10.0.19041.0",\r
+            "compilerPath": "d:/Qt/Qt5.14.2/Tools/mingw730_32/bin/g++.exe",\r
+            "cStandard": "c11",\r
+            "cppStandard": "c++11",\r
+            "intelliSenseMode": "gcc-x64",\r
+            "compilerArgs": [\r
+                "-fno-keep-inline-dllexport",\r
+                "-g",\r
+                "-std=gnu++11",\r
+                "-Wall",\r
+                "-Wextra",\r
+                "-fexceptions",\r
+                "-mthreads"\r
+            ],\r
+            "browse": {\r
+                "path": [\r
+                    "${workspaceFolder}",\r
+                    "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include"\r
+                ],\r
+                "limitSymbolsToIncludedHeaders": true\r
+            }\r
+        }\r
+    ],\r
+    "version": 4\r
+}\r
+\r
+\r

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644 (file)
index 0000000..7df067f
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,12 @@
+{\r
+    "recommendations": [\r
+        "ms-vscode.cpptools",\r
+        "ms-vscode.cpptools-extension-pack",\r
+        "twxs.cmake",\r
+        "ms-vscode.cmake-tools",\r
+        "formulahendry.code-runner",\r
+        "ms-vscode.cpptools-theme"\r
+    ]\r
+}\r
+\r
+\r

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644 (file)
index 0000000..8b331a9
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,89 @@
+{\r
+    "version": "0.2.0",\r
+    "configurations": [\r
+        {\r
+            "name": "Debug (GDB)",\r
+            "type": "cppdbg",\r
+            "request": "launch",\r
+            "program": "${workspaceFolder}/debug/HiBTMacWriteTool.exe",\r
+            "args": [],\r
+            "stopAtEntry": false,\r
+            "cwd": "${workspaceFolder}",\r
+            "environment": [\r
+                {\r
+                    "name": "PATH",\r
+                    "value": "${env:PATH};d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\bin"\r
+                }\r
+            ],\r
+            "externalConsole": false,\r
+            "MIMode": "gdb",\r
+            "miDebuggerPath": "d:\\Qt\\Qt5.14.2\\Tools\\mingw730_32\\bin\\gdb.exe",\r
+            "setupCommands": [\r
+                {\r
+                    "description": "Enable pretty-printing for gdb",\r
+                    "text": "-enable-pretty-printing",\r
+                    "ignoreFailures": true\r
+                },\r
+                {\r
+                    "description": "Set Disassembly Flavor to Intel",\r
+                    "text": "-gdb-set disassembly-flavor intel",\r
+                    "ignoreFailures": true\r
+                }\r
+            ],\r
+            "preLaunchTask": "build: Debug"\r
+        },\r
+        {\r
+            "name": "Release (GDB)",\r
+            "type": "cppdbg",\r
+            "request": "launch",\r
+            "program": "${workspaceFolder}/release/HiBTMacWriteTool.exe",\r
+            "args": [],\r
+            "stopAtEntry": false,\r
+            "cwd": "${workspaceFolder}",\r
+            "environment": [\r
+                {\r
+                    "name": "PATH",\r
+                    "value": "${env:PATH};d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\bin"\r
+                }\r
+            ],\r
+            "externalConsole": false,\r
+            "MIMode": "gdb",\r
+            "miDebuggerPath": "d:\\Qt\\Qt5.14.2\\Tools\\mingw730_32\\bin\\gdb.exe",\r
+            "setupCommands": [\r
+                {\r
+                    "description": "Enable pretty-printing for gdb",\r
+                    "text": "-enable-pretty-printing",\r
+                    "ignoreFailures": true\r
+                }\r
+            ],\r
+            "preLaunchTask": "build: Release"\r
+        },\r
+        {\r
+            "name": "Debug (No Build)",\r
+            "type": "cppdbg",\r
+            "request": "launch",\r
+            "program": "${workspaceFolder}/debug/HiBTMacWriteTool.exe",\r
+            "args": [],\r
+            "stopAtEntry": false,\r
+            "cwd": "${workspaceFolder}",\r
+            "environment": [\r
+                {\r
+                    "name": "PATH",\r
+                    "value": "${env:PATH};d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\bin"\r
+                }\r
+            ],\r
+            "externalConsole": false,\r
+            "MIMode": "gdb",\r
+            "miDebuggerPath": "d:\\Qt\\Qt5.14.2\\Tools\\mingw730_32\\bin\\gdb.exe",\r
+            "setupCommands": [\r
+                {\r
+                    "description": "Enable pretty-printing for gdb",\r
+                    "text": "-enable-pretty-printing",\r
+                    "ignoreFailures": true\r
+                }\r
+            ]\r
+        }\r
+    ]\r
+}\r
+\r
+\r

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644 (file)
index 0000000..67b3e2f
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,55 @@
+{\r
+    "files.associations": {\r
+        "*.h": "cpp",\r
+        "*.cpp": "cpp",\r
+        "*.ui": "xml",\r
+        "*.qrc": "xml",\r
+        "*.pro": "makefile",\r
+        "*.pri": "makefile"\r
+    },\r
+    "C_Cpp.default.includePath": [\r
+        "${workspaceFolder}/**",\r
+        "${workspaceFolder}/lib",\r
+        "d:/Qt/Qt5.14.2/5.14.2/mingw73_32/include"\r
+    ],\r
+    "C_Cpp.default.defines": [\r
+        "UNICODE",\r
+        "_UNICODE",\r
+        "WIN32",\r
+        "MINGW_HAS_SECURE_API=1",\r
+        "QT_WIDGETS_LIB",\r
+        "QT_GUI_LIB",\r
+        "QT_SQL_LIB",\r
+        "QT_SERIALPORT_LIB",\r
+        "QT_CORE_LIB"\r
+    ],\r
+    "C_Cpp.default.compilerPath": "d:/Qt/Qt5.14.2/Tools/mingw730_32/bin/g++.exe",\r
+    "C_Cpp.default.cStandard": "c11",\r
+    "C_Cpp.default.cppStandard": "c++11",\r
+    "C_Cpp.default.intelliSenseMode": "gcc-x64",\r
+    "files.exclude": {\r
+        "**/.git": true,\r
+        "**/.svn": true,\r
+        "**/.hg": true,\r
+        "**/CVS": true,\r
+        "**/.DS_Store": true,\r
+        "**/Thumbs.db": true\r
+    },\r
+    "search.exclude": {\r
+        "**/node_modules": true,\r
+        "**/bower_components": true,\r
+        "**/*.code-search": true,\r
+        "**/debug": true,\r
+        "**/release": true,\r
+        "**/.qmake.stash": true\r
+    },\r
+    "files.watcherExclude": {\r
+        "**/.git/objects/**": true,\r
+        "**/.git/subtree-cache/**": true,\r
+        "**/node_modules/**": true,\r
+        "**/debug/**": true,\r
+        "**/release/**": true\r
+    }\r
+}\r
+\r
+\r

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644 (file)
index 0000000..f01276a
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,152 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "qmake: Configure Project",
+            "type": "shell",
+            "command": "qmake",
+            "args": [
+                "HiBTMacWriteTool.pro"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}",
+                "env": {
+                    "QTDIR": "d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32",
+                    "PATH": "${env:PATH};d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\bin"
+                }
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": false
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "fix: Link Order",
+            "type": "shell",
+            "command": "powershell",
+            "args": [
+                "-ExecutionPolicy",
+                "Bypass",
+                "-File",
+                "${workspaceFolder}/fix_link_order.ps1"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "group": "build",
+            "problemMatcher": []
+        },
+        {
+            "label": "rebuild: Clean and Build",
+            "type": "shell",
+            "command": "powershell",
+            "args": [
+                "-ExecutionPolicy",
+                "Bypass",
+                "-File",
+                "${workspaceFolder}/rebuild_fixed.ps1"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "group": "build",
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "presentation": {
+                "reveal": "always",
+                "panel": "dedicated"
+            }
+        },
+        {
+            "label": "build: Debug",
+            "dependsOn": [
+                "fix: Link Order",
+                "clean: Build Files"
+            ],
+            "type": "shell",
+            "command": "mingw32-make",
+            "args": [],
+            "options": {
+                "cwd": "${workspaceFolder}/../build-HiBTMacWriteTool-Desktop_Qt_5_14_2_MinGW_32_bit-Debug",
+                "env": {
+                    "QTDIR": "d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32",
+                    "PATH": "${env:PATH};d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\bin"
+                }
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "presentation": {
+                "reveal": "always",
+                "panel": "dedicated"
+            }
+        },
+        {
+            "label": "build: Release",
+            "dependsOn": [
+                "fix: Link Order"
+            ],
+            "type": "shell",
+            "command": "mingw32-make",
+            "args": [
+                "release"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}/../build-HiBTMacWriteTool-Desktop_Qt_5_14_2_MinGW_32_bit-Debug",
+                "env": {
+                    "QTDIR": "d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32",
+                    "PATH": "${env:PATH};d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\bin"
+                }
+            },
+            "group": "build",
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "presentation": {
+                "reveal": "always",
+                "panel": "dedicated"
+            }
+        },
+        {
+            "label": "clean: Build Files",
+            "type": "shell",
+            "command": "mingw32-make",
+            "args": [
+                "clean"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}/../build-HiBTMacWriteTool-Desktop_Qt_5_14_2_MinGW_32_bit-Debug",
+                "env": {
+                    "QTDIR": "d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32",
+                    "PATH": "${env:PATH};d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\bin"
+                }
+            },
+            "group": "build",
+            "problemMatcher": []
+        },
+        {
+            "label": "qmake: Reconfigure",
+            "type": "shell",
+            "command": "qmake",
+            "args": [
+                "HiBTMacWriteTool.pro"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}",
+                "env": {
+                    "QTDIR": "d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32",
+                    "PATH": "${env:PATH};d:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\bin"
+                }
+            },
+            "group": "build",
+            "problemMatcher": []
+        }
+    ]
+}
+

diff --git a/HiBTMacWriteTool.pro b/HiBTMacWriteTool.pro
index 02f9591..6ac13f3 100644 (file)
--- a/HiBTMacWriteTool.pro
+++ b/HiBTMacWriteTool.pro
@@ -48,7 +48,8 @@ DEPENDPATH += $$PWD/.
 LIBS += -L$$PWD/lib/
 
 
-LIBS += -lAdvapi32
+#LIBS += -lAdvapi32
+win32:LIBS += -lshell32 D:\Qt\Qt5.14.2\Tools\mingw730_32\i686-w64-mingw32\lib\libadvapi32.a
 
 
 INCLUDEPATH += $$PWD/lib