Turn NDOF back on for Windows x64

and don't rebuild NDOF on non x86-64 Linux when it's already installed.

2 files changed, 32 insertions, 29 deletions

diff --git a/README.md b/README.md
index 6a490e841e..e49e445824 100644
--- a/README.md
+++ b/README.md
@@ -189,7 +189,7 @@ $ export LL_BUILD="/MD /O2 /Ob2 /std:c++20 /Zc:wchar_t- /Zi /GR /DLL_RELEASE=1 /
 $ export PATH="$VCPKG_ROOT/downloads/tools/cmake-3.30.1-windows/cmake-3.30.1-windows-i386/bin:$VCPKG_ROOT/downloads/tools/msys2/2db36fb050d01f45/usr/bin:$VCPKG_ROOT/installed/x64-windows/tools/libxml2:/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin:$PATH"
 $ export PKG_CONFIG_LIBDIR="$VCPKG_ROOT/installed/x64-windows/lib/pkgconfig"
 $ export PYTHON="$VCPKG_ROOT/installed/x64-windows/tools/python3/python.exe"
-$ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:STRING=64 -DUSE_OPENAL:BOOL=ON -DUSE_FMODSTUDIO:BOOL=OFF -DENABLE_MEDIA_PLUGINS:BOOL=ON -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=OFF -DROOT_PROJECT_NAME:STRING=Megapahit -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=Megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=ON -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVS_DISABLE_FATAL_WARNINGS:BOOL=ON ../indra
+$ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:STRING=64 -DUSE_OPENAL:BOOL=ON -DUSE_FMODSTUDIO:BOOL=OFF -DENABLE_MEDIA_PLUGINS:BOOL=ON -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=ON -DROOT_PROJECT_NAME:STRING=Megapahit -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=Megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=ON -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVS_DISABLE_FATAL_WARNINGS:BOOL=ON ../indra
 $ MSBuild.exe Megapahit.sln -p:Configuration=Release
 $ cpack -G NSIS
 $ start Megapahit-`cat newview/viewer_version.txt`-win64.exe
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index 4d8ca9fce5..9f33c6e220 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -7,9 +7,10 @@ include_guard()
 add_library( ll::ndof INTERFACE IMPORTED )
 
 if (NDOF)
-  if (WINDOWS OR DARWIN)
-    #use_prebuilt_binary(libndofdev)
-    if (DARWIN AND (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/libndofdev_installed OR NOT ${libndofdev_installed} EQUAL 0))
+  if (WINDOWS)
+    use_prebuilt_binary(libndofdev)
+  elseif (DARWIN)
+    if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/libndofdev_installed OR NOT ${libndofdev_installed} EQUAL 0)
       file(DOWNLOAD
         https://github.com/secondlife/3p-libndofdev/archive/refs/tags/v0.1.8e9edc7.tar.gz
         ${CMAKE_BINARY_DIR}/3p-libndofdev-0.1.8e9edc7.tar.gz
@@ -46,32 +47,34 @@ if (NDOF)
     if (CMAKE_SYSTEM_PROCESSOR MATCHES x86_64)
     use_prebuilt_binary(open-libndofdev)
     else ()
-      file(DOWNLOAD
-        https://github.com/janoc/libndofdev/archive/refs/tags/v0.14.tar.gz
-        ${CMAKE_BINARY_DIR}/libndofdev-0.14.tar.gz
-        )
-      file(ARCHIVE_EXTRACT
-        INPUT ${CMAKE_BINARY_DIR}/libndofdev-0.14.tar.gz
-        DESTINATION ${CMAKE_BINARY_DIR}
-        )
-      set(ENV{USE_SDL2} 1)
-      execute_process(
-        COMMAND make -j${MAKE_JOBS}
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libndofdev-0.14
-        RESULT_VARIABLE libndofdev_installed
-        )
-      unset(ENV{USE_SDL2})
-      file(
-        COPY ${CMAKE_BINARY_DIR}/libndofdev-0.14/ndofdev_external.h
-        DESTINATION ${LIBS_PREBUILT_DIR}/include
-        )
-      file(
-        COPY ${CMAKE_BINARY_DIR}/libndofdev-0.14/libndofdev.a
-        DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
-        )
-      file(WRITE ${PREBUILD_TRACKING_DIR}/libndofdev_installed "${libndofdev_installed}")
+      if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/libndofdev_installed OR NOT ${libndofdev_installed} EQUAL 0)
+        file(DOWNLOAD
+          https://github.com/janoc/libndofdev/archive/refs/tags/v0.14.tar.gz
+          ${CMAKE_BINARY_DIR}/libndofdev-0.14.tar.gz
+          )
+        file(ARCHIVE_EXTRACT
+          INPUT ${CMAKE_BINARY_DIR}/libndofdev-0.14.tar.gz
+          DESTINATION ${CMAKE_BINARY_DIR}
+          )
+        set(ENV{USE_SDL2} 1)
+        execute_process(
+          COMMAND make -j${MAKE_JOBS}
+          WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libndofdev-0.14
+          RESULT_VARIABLE libndofdev_installed
+          )
+        unset(ENV{USE_SDL2})
+        file(
+          COPY ${CMAKE_BINARY_DIR}/libndofdev-0.14/ndofdev_external.h
+          DESTINATION ${LIBS_PREBUILT_DIR}/include
+          )
+        file(
+          COPY ${CMAKE_BINARY_DIR}/libndofdev-0.14/libndofdev.a
+          DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
+          )
+        file(WRITE ${PREBUILD_TRACKING_DIR}/libndofdev_installed "${libndofdev_installed}")
+      endif ()
     endif ()
-  endif (WINDOWS OR DARWIN)
+  endif ()
 
   if (WINDOWS)
     target_link_libraries( ll::ndof INTERFACE libndofdev)