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 eba627c..30596ee 100644 Binary files a/myis11/project/is3/cmake-build-release-visual-studio/.ninja_deps and b/myis11/project/is3/cmake-build-release-visual-studio/.ninja_deps differ 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 7c60a0e..321867c 100644 Binary files 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 and 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 differ 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 9310b5b..71d01c4 100644 Binary files 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 and 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 differ 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/SensorIS3.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/SensorIS3.cpp.obj index 0fd6c07..4cf46b9 100644 Binary files a/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp.obj and b/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/iris_is3lib.dir/D_/06Learn/rust/tarui/myfirst_tauri/myis11/src/IRIS_IS3/SensorIS3.cpp.obj differ diff --git a/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/is3test.dir/testmain.cpp.obj b/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/is3test.dir/testmain.cpp.obj index a5bdb13..b164772 100644 Binary files a/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/is3test.dir/testmain.cpp.obj and b/myis11/project/is3/cmake-build-release-visual-studio/CMakeFiles/is3test.dir/testmain.cpp.obj differ diff --git a/myis11/project/is3/cmake-build-release-visual-studio/iris_is3lib.dll b/myis11/project/is3/cmake-build-release-visual-studio/iris_is3lib.dll index e070ea1..39ae5a9 100644 Binary files a/myis11/project/is3/cmake-build-release-visual-studio/iris_is3lib.dll and b/myis11/project/is3/cmake-build-release-visual-studio/iris_is3lib.dll differ 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 db3923c..e961b37 100644 Binary files a/myis11/project/is3/cmake-build-release-visual-studio/is3test.exe and b/myis11/project/is3/cmake-build-release-visual-studio/is3test.exe differ 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;