Merge pull request #5 from RyeMutt/main

Update to R560 submodule

.github/workflows/build.yaml

@@ -1,14 +1,18 @@
 name: Build
-on: [push]
+on:
+  pull_request:
+  push:
+    branches: [main]
+    tags: [v*]
 jobs:
   build:
     strategy:
       matrix:
         os: [windows-2022]
         addrsize: ["64"]
-        include:
-          - os: windows-2022
-            addrsize: "32"
+        # include:
+        #   - os: windows-2022
+        #     addrsize: "32"
     continue-on-error: false
     runs-on: ${{ matrix.os }}
     steps:

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "nvapi"]
+	path = nvapi
+	url = https://github.com/NVIDIA/nvapi.git

autobuild.xml

@@ -6,13 +6,13 @@
       <key>canonical_repo</key>
       <string>https://github.com/secondlife/3p-nvapi</string>
       <key>copyright</key>
-      <string>Copyright © 2012 NVIDIA Corporation.  All rights reserved.</string>
+      <string>Copyright (c) 2024 NVIDIA CORPORATION and AFFILIATES. All rights reserved.</string>
       <key>description</key>
       <string>NVAPI provides an interface to NVIDIA devices.</string>
       <key>license</key>
-      <string>NVIDIA Corporation Software License Agreement – NVAPI SDK</string>
+      <string>MIT</string>
       <key>license_file</key>
-      <string>LICENSES/NVAPI_SDK_License_Agreement.pdf</string>
+      <string>LICENSES/nvapi.txt</string>
       <key>name</key>
       <string>nvapi</string>
       <key>platforms</key>
@@ -67,8 +67,8 @@
           <string>windows</string>
         </map>
       </map>
-      <key>version_file</key>
-      <string>VERSION.txt</string>
+      <key>use_scm_version</key>
+      <boolean>true</boolean>
     </map>
     <key>type</key>
     <string>autobuild</string>

build-cmd.sh

@@ -28,44 +28,25 @@ set -x
 #set_build_variables convenience Release
 
 NVAPI_ROOT_NAME="nvapi"
-NVAPI_VERSION="352"
 
 top="$(pwd)"
 stage="$(pwd)/stage"
 mkdir -p "$stage"
 
-build=${AUTOBUILD_BUILD_ID:=0}
-echo "${NVAPI_VERSION}.${build}" > "${stage}/VERSION.txt"
-
-pushd "$NVAPI_ROOT_NAME$NVAPI_VERSION"
-
+pushd "$NVAPI_ROOT_NAME"
     mkdir -p "$stage/include/nvapi"
     mkdir -p "$stage/LICENSES"
     mkdir -p "$stage/lib/release"
 
     case "$AUTOBUILD_PLATFORM" in
 
         windows*)
-            if [ "$AUTOBUILD_ADDRSIZE" = 32 ]
-                then cp "lib/release/nvapi.lib" "$stage/lib/release/nvapi.lib"
-                else cp "lib/release/nvapi64.lib" "$stage/lib/release/nvapi.lib"
-            fi
-\
-            cp "include/nvapi/nvapi.h" "$stage/include/nvapi/"
-            cp "include/nvapi/NvApiDriverSettings.c" "$stage/include/nvapi/"
-            cp "include/nvapi/NvApiDriverSettings.h" "$stage/include/nvapi/"
-            cp "include/nvapi/nvapi_lite_common.h" "$stage/include/nvapi/"
-            cp "include/nvapi/nvapi_lite_d3dext.h" "$stage/include/nvapi/"
-            cp "include/nvapi/nvapi_lite_salend.h" "$stage/include/nvapi/"
-            cp "include/nvapi/nvapi_lite_salstart.h" "$stage/include/nvapi/"
-            cp "include/nvapi/nvapi_lite_sli.h" "$stage/include/nvapi/"
-            cp "include/nvapi/nvapi_lite_stereo.h" "$stage/include/nvapi/"
-            cp "include/nvapi/nvapi_lite_surround.h" "$stage/include/nvapi/"
-            cp "include/nvapi/nvHLSLExtns.h" "$stage/include/nvapi/"
-            cp "include/nvapi/nvHLSLExtnsInternal.h" "$stage/include/nvapi/"
-            cp "include/nvapi/nvShaderExtnEnums.h" "$stage/include/nvapi/"
+            cp "amd64/nvapi64.lib" "$stage/lib/release/nvapi.lib"
+
+            cp *.h "$stage/include/nvapi/"
+            cp *.c "$stage/include/nvapi/"
 
-            cp "LICENSES/NVAPI_SDK_License_Agreement.pdf" "$stage/LICENSES/NVAPI_SDK_License_Agreement.pdf"
+            cp "License.txt" "$stage/LICENSES/nvapi.txt"
         ;;
     esac
 popd