Skip to content

Commit

Permalink
lol windows
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaamo committed Jul 31, 2024
1 parent 17f4d0b commit fa37415
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
6 changes: 6 additions & 0 deletions OpenVR Display Devices/OpenVR Display Devices.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>OpenVR-Display-Devices</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>OpenVR-Display-Devices</TargetName>
</PropertyGroup>
<PropertyGroup Label="Vcpkg">
<VcpkgEnableManifest>true</VcpkgEnableManifest>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion OpenVR Display Devices/manifest.vrmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"applications": [{
"app_key": "ottpossum.OvrDisplayDevices",
"launch_type": "binary",
"binary_path_windows": "OpenVR Display Devices.exe",
"binary_path_windows": "OpenVR-Display-Devices.exe",
"is_dashboard_overlay": true,

"strings": {
Expand Down
14 changes: 7 additions & 7 deletions installer/installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ Section "Install" SecInstall
SetOutPath "$INSTDIR"

File "..\LICENSE"
File "..\x64\Release\OpenVR Display Devices.exe"
File "..\x64\Release\OpenVR-Display-Devices.exe"
File "..\3rdparty\openvr\bin\win64\openvr_api.dll"
File "..\OpenVR Display Devices\manifest.vrmanifest"
File "..\OpenVR-Display-Devices\manifest.vrmanifest"

ExecWait '"$INSTDIR\vcredist_x64.exe" /install /quiet'

Var /GLOBAL vrRuntimePath
nsExec::ExecToStack '"$INSTDIR\OpenVR Display Devices.exe" -openvrpath'
nsExec::ExecToStack '"$INSTDIR\OpenVR-Display-Devices.exe" -openvrpath'
Pop $0
Pop $vrRuntimePath
DetailPrint "VR runtime path: $vrRuntimePath"
Expand All @@ -112,10 +112,10 @@ Section "Install" SecInstall
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenVRDisplayDevices" "DisplayName" "OpenVR-DisplayDevices"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenVRDisplayDevices" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""

CreateShortCut "$SMPROGRAMS\OpenVR-DisplayDevices.lnk" "$INSTDIR\OpenVR Display Devices.exe"
CreateShortCut "$SMPROGRAMS\OpenVR-DisplayDevices.lnk" "$INSTDIR\OpenVR-Display-Devices.exe"

SetOutPath "$INSTDIR"
nsExec::ExecToLog '"$INSTDIR\OpenVR Display Devices.exe" -installmanifest'
nsExec::ExecToLog '"$INSTDIR\OpenVR-Display-Devices.exe" -installmanifest'

SectionEnd

Expand All @@ -131,10 +131,10 @@ Section "Uninstall"
Abort

SetOutPath "$INSTDIR"
nsExec::ExecToLog '"$INSTDIR\OpenVR Display Devices.exe" -removemanifest'
nsExec::ExecToLog '"$INSTDIR\OpenVR-Display-Devices.exe" -removemanifest'

Delete "$INSTDIR\LICENSE"
Delete "$INSTDIR\OpenVR Display Devices.exe"
Delete "$INSTDIR\OpenVR-Display-Devices.exe"
Delete "$INSTDIR\openvr_api.dll"
Delete "$INSTDIR\manifest.vrmanifest"

Expand Down

0 comments on commit fa37415

Please sign in to comment.