From 7efa0e210bdda40bbbe8165874c9b2c61e0eb4c7 Mon Sep 17 00:00:00 2001 From: xin Date: Mon, 30 Jun 2025 17:04:27 +0800 Subject: [PATCH] =?UTF-8?q?rust=20=E9=80=82=E9=85=8Dlinux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clion-Debug-Visual Studio-log.txt | 4 +- .../codemodel-v2-99730e62ec2ed81c9bac.json | 69 ------- ...s_is3lib-Release-809ada2de128dea0b7c9.json | 189 ------------------ ...-is3test-Release-03808b43dfa2721e6d2c.json | 184 ----------------- .../.ninja_deps | Bin 1452 -> 1816 bytes .../.ninja_log | 31 ++- .../clion-Release-Visual Studio-log.txt | 4 +- .../myis11/src/IRIS_IS3/IS3Comon.cpp.obj | Bin 12294 -> 12294 bytes .../myis11/src/IRIS_IS3/IS3_INST.cpp.obj | Bin 42899 -> 44301 bytes .../myis11/src/IRIS_IS3/SensorIS3.cpp.obj | Bin 175119 -> 175119 bytes .../CMakeFiles/is3test.dir/testmain.cpp.obj | Bin 44135 -> 44135 bytes .../iris_is3lib.dll | Bin 35328 -> 35328 bytes .../is3test.exe | Bin 16384 -> 16384 bytes .../spectralbase/IS11_sensor/mod.rs | 5 +- .../spectralbase/IS3_sensor/mod.rs | 10 +- src-tauri/src/jianzhiis11/is11base.rs | 4 +- 16 files changed, 45 insertions(+), 455 deletions(-) delete mode 100644 myis11/project/is3/cmake-build-release-visual-studio/.cmake/api/v1/reply/codemodel-v2-99730e62ec2ed81c9bac.json delete mode 100644 myis11/project/is3/cmake-build-release-visual-studio/.cmake/api/v1/reply/target-iris_is3lib-Release-809ada2de128dea0b7c9.json delete mode 100644 myis11/project/is3/cmake-build-release-visual-studio/.cmake/api/v1/reply/target-is3test-Release-03808b43dfa2721e6d2c.json diff --git a/myis11/project/is3/cmake-build-debug-visual-studio/CMakeFiles/clion-Debug-Visual Studio-log.txt b/myis11/project/is3/cmake-build-debug-visual-studio/CMakeFiles/clion-Debug-Visual Studio-log.txt index 5b7e909..be3c131 100644 --- a/myis11/project/is3/cmake-build-debug-visual-studio/CMakeFiles/clion-Debug-Visual Studio-log.txt +++ b/myis11/project/is3/cmake-build-debug-visual-studio/CMakeFiles/clion-Debug-Visual Studio-log.txt @@ -2,6 +2,6 @@ C:\Users\xin\AppData\Local\Programs\CLion\bin\cmake\win\x64\bin\cmake.exe -DCMAK -- FOUND CSerialPort, E:/01MyCode/vcpkg/vcpkgclion/installed/x64-windows/debug/lib/libcserialport.lib -- CSerialPort_INCLUDE_DIR: E:/01MyCode/vcpkg/vcpkgclion/installed/x64-windows/include -- CSerialPort_LIBRARY: E:/01MyCode/vcpkg/vcpkgclion/installed/x64-windows/debug/lib/libcserialport.lib --- Configuring done (0.5s) --- Generating done (0.1s) +-- Configuring done (0.1s) +-- Generating done (0.0s) -- Build files have been written to: D:/06Learn/rust/tarui/myfirst_tauri/myis11/project/is3/cmake-build-debug-visual-studio diff --git a/myis11/project/is3/cmake-build-release-visual-studio/.cmake/api/v1/reply/codemodel-v2-99730e62ec2ed81c9bac.json b/myis11/project/is3/cmake-build-release-visual-studio/.cmake/api/v1/reply/codemodel-v2-99730e62ec2ed81c9bac.json deleted file mode 100644 index e83ea92..0000000 --- a/myis11/project/is3/cmake-build-release-visual-studio/.cmake/api/v1/reply/codemodel-v2-99730e62ec2ed81c9bac.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "configurations" : - [ - { - "directories" : - [ - { - "build" : ".", - "jsonFile" : "directory-.-Release-d0094a50bb2071803777.json", - "minimumCMakeVersion" : - { - "string" : "3.5" - }, - "projectIndex" : 0, - "source" : ".", - "targetIndexes" : - [ - 0, - 1 - ] - } - ], - "name" : "Release", - "projects" : - [ - { - "directoryIndexes" : - [ - 0 - ], - "name" : "is11lib", - "targetIndexes" : - [ - 0, - 1 - ] - } - ], - "targets" : - [ - { - "directoryIndex" : 0, - "id" : "iris_is3lib::@6890427a1f51a3e7e1df", - "jsonFile" : "target-iris_is3lib-Release-809ada2de128dea0b7c9.json", - "name" : "iris_is3lib", - "projectIndex" : 0 - }, - { - "directoryIndex" : 0, - "id" : "is3test::@6890427a1f51a3e7e1df", - "jsonFile" : "target-is3test-Release-03808b43dfa2721e6d2c.json", - "name" : "is3test", - "projectIndex" : 0 - } - ] - } - ], - "kind" : "codemodel", - "paths" : - { - "build" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/project/is3/cmake-build-release-visual-studio", - "source" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/project/is3" - }, - "version" : - { - "major" : 2, - "minor" : 7 - } -} diff --git a/myis11/project/is3/cmake-build-release-visual-studio/.cmake/api/v1/reply/target-iris_is3lib-Release-809ada2de128dea0b7c9.json b/myis11/project/is3/cmake-build-release-visual-studio/.cmake/api/v1/reply/target-iris_is3lib-Release-809ada2de128dea0b7c9.json deleted file mode 100644 index eb352ee..0000000 --- a/myis11/project/is3/cmake-build-release-visual-studio/.cmake/api/v1/reply/target-iris_is3lib-Release-809ada2de128dea0b7c9.json +++ /dev/null @@ -1,189 +0,0 @@ -{ - "artifacts" : - [ - { - "path" : "iris_is3lib.dll" - }, - { - "path" : "iris_is3lib.lib" - }, - { - "path" : "iris_is3lib.pdb" - } - ], - "backtrace" : 2, - "backtraceGraph" : - { - "commands" : - [ - "_add_library", - "add_library", - "include_directories" - ], - "files" : - [ - "E:/01MyCode/vcpkg/vcpkgclion/scripts/buildsystems/vcpkg.cmake", - "CMakeLists.txt" - ], - "nodes" : - [ - { - "file" : 1 - }, - { - "command" : 1, - "file" : 1, - "line" : 21, - "parent" : 0 - }, - { - "command" : 0, - "file" : 0, - "line" : 639, - "parent" : 1 - }, - { - "command" : 2, - "file" : 1, - "line" : 15, - "parent" : 0 - }, - { - "command" : 2, - "file" : 1, - "line" : 17, - "parent" : 0 - }, - { - "command" : 2, - "file" : 1, - "line" : 18, - "parent" : 0 - }, - { - "command" : 2, - "file" : 1, - "line" : 19, - "parent" : 0 - }, - { - "command" : 2, - "file" : 1, - "line" : 20, - "parent" : 0 - } - ] - }, - "compileGroups" : - [ - { - "compileCommandFragments" : - [ - { - "fragment" : "/MT /MD /O2 /Ob2 /DNDEBUG" - } - ], - "defines" : - [ - { - "define" : "iris_is3lib_EXPORTS" - } - ], - "includes" : - [ - { - "backtrace" : 3, - "path" : "E:/01MyCode/vcpkg/vcpkgclion/installed/x64-windows/include" - }, - { - "backtrace" : 4, - "path" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/project/is3/../../src/test" - }, - { - "backtrace" : 5, - "path" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/project/is3/../../src/IRIS_IS3" - }, - { - "backtrace" : 6, - "path" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/project/is3/../../src/comman" - }, - { - "backtrace" : 7, - "path" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/project/is3/../../src/thirdpart/iris_proto_tool/src" - } - ], - "language" : "CXX", - "sourceIndexes" : - [ - 0, - 1, - 2, - 3 - ] - } - ], - "id" : "iris_is3lib::@6890427a1f51a3e7e1df", - "link" : - { - "commandFragments" : - [ - { - "fragment" : "/machine:x64 /INCREMENTAL:NO", - "role" : "flags" - }, - { - "fragment" : "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib", - "role" : "libraries" - } - ], - "language" : "CXX" - }, - "name" : "iris_is3lib", - "nameOnDisk" : "iris_is3lib.dll", - "paths" : - { - "build" : ".", - "source" : "." - }, - "sourceGroups" : - [ - { - "name" : "Source Files", - "sourceIndexes" : - [ - 0, - 1, - 2, - 3 - ] - } - ], - "sources" : - [ - { - "backtrace" : 2, - "compileGroupIndex" : 0, - "path" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/src/thirdpart/iris_proto_tool/src/IRIS_Method.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 2, - "compileGroupIndex" : 0, - "path" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 2, - "compileGroupIndex" : 0, - "path" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3_INST.cpp", - "sourceGroupIndex" : 0 - }, - { - "backtrace" : 2, - "compileGroupIndex" : 0, - "path" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp", - "sourceGroupIndex" : 0 - } - ], - "type" : "SHARED_LIBRARY" -} diff --git a/myis11/project/is3/cmake-build-release-visual-studio/.cmake/api/v1/reply/target-is3test-Release-03808b43dfa2721e6d2c.json b/myis11/project/is3/cmake-build-release-visual-studio/.cmake/api/v1/reply/target-is3test-Release-03808b43dfa2721e6d2c.json deleted file mode 100644 index 77e91bc..0000000 --- a/myis11/project/is3/cmake-build-release-visual-studio/.cmake/api/v1/reply/target-is3test-Release-03808b43dfa2721e6d2c.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "artifacts" : - [ - { - "path" : "is3test.exe" - }, - { - "path" : "is3test.pdb" - } - ], - "backtrace" : 2, - "backtraceGraph" : - { - "commands" : - [ - "_add_executable", - "add_executable", - "target_link_libraries", - "include_directories" - ], - "files" : - [ - "E:/01MyCode/vcpkg/vcpkgclion/scripts/buildsystems/vcpkg.cmake", - "CMakeLists.txt" - ], - "nodes" : - [ - { - "file" : 1 - }, - { - "command" : 1, - "file" : 1, - "line" : 32, - "parent" : 0 - }, - { - "command" : 0, - "file" : 0, - "line" : 598, - "parent" : 1 - }, - { - "command" : 2, - "file" : 1, - "line" : 36, - "parent" : 0 - }, - { - "command" : 3, - "file" : 1, - "line" : 15, - "parent" : 0 - }, - { - "command" : 3, - "file" : 1, - "line" : 17, - "parent" : 0 - }, - { - "command" : 3, - "file" : 1, - "line" : 18, - "parent" : 0 - }, - { - "command" : 3, - "file" : 1, - "line" : 19, - "parent" : 0 - }, - { - "command" : 3, - "file" : 1, - "line" : 20, - "parent" : 0 - } - ] - }, - "compileGroups" : - [ - { - "compileCommandFragments" : - [ - { - "fragment" : "/MT /MD /O2 /Ob2 /DNDEBUG" - } - ], - "includes" : - [ - { - "backtrace" : 4, - "path" : "E:/01MyCode/vcpkg/vcpkgclion/installed/x64-windows/include" - }, - { - "backtrace" : 5, - "path" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/project/is3/../../src/test" - }, - { - "backtrace" : 6, - "path" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/project/is3/../../src/IRIS_IS3" - }, - { - "backtrace" : 7, - "path" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/project/is3/../../src/comman" - }, - { - "backtrace" : 8, - "path" : "D:/06Learn/rust/tarui/myfirst_tauri/myis11/project/is3/../../src/thirdpart/iris_proto_tool/src" - } - ], - "language" : "CXX", - "sourceIndexes" : - [ - 0 - ] - } - ], - "dependencies" : - [ - { - "backtrace" : 3, - "id" : "iris_is3lib::@6890427a1f51a3e7e1df" - } - ], - "id" : "is3test::@6890427a1f51a3e7e1df", - "link" : - { - "commandFragments" : - [ - { - "fragment" : "/MT /MD /O2 /Ob2 /DNDEBUG", - "role" : "flags" - }, - { - "fragment" : "/machine:x64 /INCREMENTAL:NO /subsystem:console", - "role" : "flags" - }, - { - "backtrace" : 3, - "fragment" : "iris_is3lib.lib", - "role" : "libraries" - }, - { - "backtrace" : 3, - "fragment" : "E:\\01MyCode\\vcpkg\\vcpkgclion\\installed\\x64-windows\\lib\\libcserialport.lib", - "role" : "libraries" - }, - { - "fragment" : "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib", - "role" : "libraries" - } - ], - "language" : "CXX" - }, - "name" : "is3test", - "nameOnDisk" : "is3test.exe", - "paths" : - { - "build" : ".", - "source" : "." - }, - "sourceGroups" : - [ - { - "name" : "Source Files", - "sourceIndexes" : - [ - 0 - ] - } - ], - "sources" : - [ - { - "backtrace" : 2, - "compileGroupIndex" : 0, - "path" : "testmain.cpp", - "sourceGroupIndex" : 0 - } - ], - "type" : "EXECUTABLE" -} diff --git a/myis11/project/is3/cmake-build-release-visual-studio/.ninja_deps b/myis11/project/is3/cmake-build-release-visual-studio/.ninja_deps index eba627c0359cadd5bb0e9b201c9fa56cbe1e9fcf..30596eeda236f130842ca598a2111f5db2d03f76 100644 GIT binary patch delta 252 zcmZ3(J%ew<8dg3P28ISM1_lP6be2;}Ws|d5q~JndtE7KJg#2WHs@Q?5wDOm|QZAEb z-~h52ftVABnSdB3FV&fopn^pnWD8IkgHjSmezF{slpairxV}LZJ}qnBf#gA2zzzeM m!WFswvMN}}5N67R6FY!Hm=03_TFeL35`X3yM1FE1i!cB?gepe> delta 7 OcmbQiw}yMe8dd-ccmlrw diff --git a/myis11/project/is3/cmake-build-release-visual-studio/.ninja_log b/myis11/project/is3/cmake-build-release-visual-studio/.ninja_log index 0e7ba25..fe577e1 100644 --- a/myis11/project/is3/cmake-build-release-visual-studio/.ninja_log +++ b/myis11/project/is3/cmake-build-release-visual-studio/.ninja_log @@ -1,12 +1,37 @@ # ninja log v6 -6 51 7628587486153392 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/thirdpart/iris_proto_tool/src/IRIS_Method.c.obj a4c0fbb7022be8d5 21 907 7659725145667238 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3_INST.cpp.obj 3c5858a3264438b4 +6 51 7628587486153392 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/thirdpart/iris_proto_tool/src/IRIS_Method.c.obj a4c0fbb7022be8d5 33 941 7659725145778173 CMakeFiles/is3test.dir/testmain.cpp.obj 905a72b1ea8bf22c 2 616 7669134105668608 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp.obj 96f167c4e5f0d851 -14 286 7729712717306048 build.ninja 7106bca1f4b570da 27 1400 7659725145725854 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj 4364cfe7f408eeb7 +1 83 7729716156610815 build.ninja 7106bca1f4b570da 4 94 7630155613477022 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/thirdpart/iris_proto_tool/src/IRIS_Method.cpp.obj 366a7a8636d2dadc 617 1030 7669134111816719 iris_is3lib.dll c7564dfa3e9c17a2 617 1030 7669134111816719 iris_is3lib.lib c7564dfa3e9c17a2 2206 3648 7659725167509900 is3test.exe 81439074008edbcf -1 83 7729712717306048 build.ninja 7106bca1f4b570da +1 109 7729716156610815 build.ninja 7106bca1f4b570da +2 469 7729716156842298 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp.obj 96f167c4e5f0d851 +469 896 7729716161509267 iris_is3lib.dll c7564dfa3e9c17a2 +469 896 7729716161509267 iris_is3lib.lib c7564dfa3e9c17a2 +2 428 7729716980838271 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp.obj 96f167c4e5f0d851 +429 784 7729716985108552 iris_is3lib.dll c7564dfa3e9c17a2 +429 784 7729716985108552 iris_is3lib.lib c7564dfa3e9c17a2 +2 308 7729721000885301 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3_INST.cpp.obj 3c5858a3264438b4 +309 620 7729721003956416 iris_is3lib.dll c7564dfa3e9c17a2 +309 620 7729721003956416 iris_is3lib.lib c7564dfa3e9c17a2 +2 394 7729722975953725 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3_INST.cpp.obj 3c5858a3264438b4 +6 406 7729722975999109 CMakeFiles/is3test.dir/testmain.cpp.obj 905a72b1ea8bf22c +394 722 7729722979883164 iris_is3lib.dll c7564dfa3e9c17a2 +394 722 7729722979883164 iris_is3lib.lib c7564dfa3e9c17a2 +722 1087 7729722983158946 is3test.exe 81439074008edbcf +2 328 7729723408891496 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3_INST.cpp.obj 3c5858a3264438b4 +6 339 7729723408921403 CMakeFiles/is3test.dir/testmain.cpp.obj 905a72b1ea8bf22c +328 642 7729723412147355 iris_is3lib.dll c7564dfa3e9c17a2 +328 642 7729723412147355 iris_is3lib.lib c7564dfa3e9c17a2 +643 991 7729723415294754 is3test.exe 81439074008edbcf +7 452 7729729204706797 CMakeFiles/is3test.dir/testmain.cpp.obj 905a72b1ea8bf22c +2 460 7729729204646827 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3_INST.cpp.obj 3c5858a3264438b4 +5 763 7729729204676907 CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj 4364cfe7f408eeb7 +763 1161 7729729212253657 iris_is3lib.dll c7564dfa3e9c17a2 +763 1161 7729729212253657 iris_is3lib.lib c7564dfa3e9c17a2 +1161 1575 7729729216241594 is3test.exe 81439074008edbcf diff --git a/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/clion-Release-Visual Studio-log.txt b/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/clion-Release-Visual Studio-log.txt index 1b66e7a..7c495c4 100644 --- a/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/clion-Release-Visual Studio-log.txt +++ b/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/clion-Release-Visual Studio-log.txt @@ -2,6 +2,6 @@ C:\Users\xin\AppData\Local\Programs\CLion\bin\cmake\win\x64\bin\cmake.exe -DCMAK -- FOUND CSerialPort, E:/01MyCode/vcpkg/vcpkgclion/installed/x64-windows/lib/libcserialport.lib -- CSerialPort_INCLUDE_DIR: E:/01MyCode/vcpkg/vcpkgclion/installed/x64-windows/include -- CSerialPort_LIBRARY: E:/01MyCode/vcpkg/vcpkgclion/installed/x64-windows/lib/libcserialport.lib --- Configuring done (0.5s) --- Generating done (0.1s) +-- Configuring done (0.1s) +-- Generating done (0.0s) -- Build files have been written to: D:/06Learn/rust/tarui/myfirst_tauri/myis11/project/is3/cmake-build-release-visual-studio diff --git a/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj b/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3Comon.cpp.obj index 7c60a0e198f206e4615902fc1bb6caf2c3d1ac4e..321867c01f3a30494ef86be2a75aaee1a7344f81 100644 GIT binary patch delta 17 YcmZomXiMNoX)|GnbWFj5}066akssI20 diff --git a/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3_INST.cpp.obj b/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/IS3_INST.cpp.obj index 9310b5b133dcc1ae8cea84b683d182adcacb0174..71d01c41ee009e0dc1db8e82dee8cc4f4e571ac4 100644 GIT binary patch delta 11702 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 delta 10461 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 diff --git a/myis11/project/is3/cmake-build-release-visual-studio/is3test.exe b/myis11/project/is3/cmake-build-release-visual-studio/is3test.exe index db3923c57a291f1d2b94e2bfcf2de007becd3b47..e961b37596c2fc7009875d2f720b3e34e36b0d5b 100644 GIT binary patch delta 29 gcmZo@U~Fh$+#tZn66u(fu~~%CK@q}=P+B1i0D(dXuK)l5 delta 29 gcmZo@U~Fh$+#tZn!cy=(eX|IogCc|#p|nC40E(UoivR!s diff --git a/src-tauri/src/iris_spectral/spectralbase/IS11_sensor/mod.rs b/src-tauri/src/iris_spectral/spectralbase/IS11_sensor/mod.rs index ce2ef7c..601ec07 100644 --- a/src-tauri/src/iris_spectral/spectralbase/IS11_sensor/mod.rs +++ b/src-tauri/src/iris_spectral/spectralbase/IS11_sensor/mod.rs @@ -6,7 +6,10 @@ use super::STRSensorInfo; type SerialWrite = Option size_t>; -#[link(name = "../myis11/project/is11/cmake-build-release-visual-studio-2022/is11lib",kind = "dylib")] +#[cfg_attr(target_os = "windows", link(name = "..\\myis11\\project\\is11\\cmake-build-release-visual-studio-2022/is11lib", kind = "dylib"))] +#[cfg_attr(target_os = "linux", link(name = "is11lib", kind = "dylib"))] +// #[link(name = "../myis11/project/is11/cmake-build-release-visual-studio-2022/is11lib",kind = "dylib")] + extern "C" { pub fn Set_Serial_FUN(writefunc:SerialWrite,readfunc:SerialWrite); pub fn abs1(input: i32) -> i32; diff --git a/src-tauri/src/iris_spectral/spectralbase/IS3_sensor/mod.rs b/src-tauri/src/iris_spectral/spectralbase/IS3_sensor/mod.rs index 57d5d8a..a336b3e 100644 --- a/src-tauri/src/iris_spectral/spectralbase/IS3_sensor/mod.rs +++ b/src-tauri/src/iris_spectral/spectralbase/IS3_sensor/mod.rs @@ -6,10 +6,12 @@ use super::STRSensorInfo; //void IS3SetShutterOpen(int isopen); type SerialWrite = Option size_t>; -#[link( - name = "..\\myis11\\project\\is3\\cmake-build-debug-visual-studio/iris_is3lib", - kind = "dylib" -)] +#[cfg_attr(target_os = "windows", link(name = "..\\myis11\\project\\is3\\cmake-build-debug-visual-studio/iris_is3lib", kind = "dylib"))] +#[cfg_attr(target_os = "linux", link(name = "iris_is3lib", kind = "dylib"))] +// #[link( +// name = "..\\myis11\\project\\is3\\cmake-build-debug-visual-studio/iris_is3lib", +// kind = "dylib" +// )] extern "C" { pub fn IS3Set_Serial_FUN(writefunc:SerialWrite,readfunc:SerialWrite); pub fn IS3SensorInit() -> i32; diff --git a/src-tauri/src/jianzhiis11/is11base.rs b/src-tauri/src/jianzhiis11/is11base.rs index 87fbbd2..1e2ed7f 100644 --- a/src-tauri/src/jianzhiis11/is11base.rs +++ b/src-tauri/src/jianzhiis11/is11base.rs @@ -35,7 +35,9 @@ impl Default for STRSensorInfo { type SerialWrite = Option size_t>; -#[link(name = "../myis11/project/is11/cmake-build-release-visual-studio-2022/is11lib",kind = "dylib")] +#[cfg_attr(target_os = "windows", link(name = "..\\myis11\\project\\is11\\cmake-build-release-visual-studio-2022/is11lib", kind = "dylib"))] +#[cfg_attr(target_os = "linux", link(name = "is11lib", kind = "dylib"))] +//#[link(name = "../myis11/project/is11/cmake-build-release-visual-studio-2022/is11lib",kind = "dylib")] extern "C" { fn Set_Serial_FUN(writefunc:SerialWrite,readfunc:SerialWrite); fn abs1(input: i32) -> i32;