cleanup

Author: stuqdog

BUILDING.md

@@ -260,11 +260,11 @@ have a different version of `protoc` available in your `PATH`, it will
 silently fail and later cause compilation failures due to protobuf
 version mismatches.
 
-## Building for Windows
+## Building for ARM Windows
 
 The C++ SDK works well on windows for both client and module code 
 provided there is internet connectivity. However, some manual work is
-required to build for client code.
+required to build for client code on ARM64 architecture.
 
 1. (client code only) clone [rust-utils](https://github.com/viamrobotics/rust-utils) >= v0.3.0 and
 build locally with `cargo build --release`. Copy `target\release\viam_rust_utils.lib`
@@ -277,9 +277,6 @@ cmake . --preset conan-default <cmake args>
 cmake --build --preset=conan-release -j
 ```
 
-NOTE: There is no current support for offline mode as a client, though
-this is being worked on.
-
 ## Options to Configure or Customize the Build
 
 ### Options for Package Search

CMakeLists.txt

@@ -293,7 +293,7 @@ else()
     message(WARNING "Currently running on Windows with no rust-utils file. Module code should work as expected, but client code may fail unexpectedly.")
 endif()
 
-if (NOT WIN32 OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64") # build `SHARED` on unix-based systems
+if (NOT WIN32 OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64") 
   add_library(viam_rust_utils STATIC IMPORTED)
   target_link_directories(viam_rust_utils
     INTERFACE

src/viam/examples/mlmodel/example_audio_classification_client.cpp

@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifdef _WIN32
-#define NOMINMAX
-#endif
-
 #include <chrono>
 #include <cstdlib>
 #include <fstream>

src/viam/sdk/CMakeLists.txt

@@ -276,10 +276,10 @@ target_link_libraries(viamsdk
   PRIVATE Threads::Threads
 )
 
-# TODO(RSDK-10637): Currently, rust_utils for windows doesn't link correctly when built in CI,
-# so don't link to it unless the user has provided a file for it.  Instead, link a stub implementation
-# that just calls `abort`.
-if (NOT WIN32 OR num_viam_rust_utils_files GREATER 0)
+# rust-utils doesn't build in CI on windows other than x86_64, so confirm that we're either not
+# windows, or if we are windows that we're AMD64, or else that the user has provided their own
+# build of rust_utils.
+if (NOT WIN32 OR num_viam_rust_utils_files GREATER 0 OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
   target_link_libraries(viamsdk
     PRIVATE viam_rust_utils
   )