Skip to content

Commit

Permalink
Update to R560 submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
RyeMutt committed Aug 14, 2024
1 parent 2568cae commit 3179578
Show file tree
Hide file tree
Showing 22 changed files with 18 additions and 17,338 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ jobs:
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:
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "nvapi"]
path = nvapi
url = https://github.com/NVIDIA/nvapi.git
11 changes: 0 additions & 11 deletions BuildParams

This file was deleted.

10 changes: 5 additions & 5 deletions autobuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
31 changes: 6 additions & 25 deletions build-cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions nvapi
Submodule nvapi added at 4ba338
Binary file removed nvapi352/LICENSES/NVAPI_SDK_License_Agreement.pdf
Binary file not shown.
Loading

0 comments on commit 3179578

Please sign in to comment.