diff options
| author | David Pinedo <david@lunarg.com> | 2016-01-29 12:20:49 -0700 |
|---|---|---|
| committer | David Pinedo <david@lunarg.com> | 2016-01-29 12:23:59 -0700 |
| commit | f331d6dfe4c9cc696e0cfbbf1cba6dcfa2c179d2 (patch) | |
| tree | 0124d44152156623c7055f4f78f1acd578c136c0 | |
| parent | 7b69f0ebefd1f256f7c67b814169057f0134849a (diff) | |
| download | usermoji-f331d6dfe4c9cc696e0cfbbf1cba6dcfa2c179d2.tar.xz | |
windowsrtinstaller: change licensing and change logo displayed in UI
| -rw-r--r-- | windowsRuntimeInstaller/InstallerRT.nsi | 11 | ||||
| -rw-r--r-- | windowsRuntimeInstaller/LICENSE.rtf | bin | 1700 -> 0 bytes | |||
| -rw-r--r-- | windowsRuntimeInstaller/VULKANRT_LICENSE.rtf | bin | 0 -> 2276 bytes | |||
| -rw-r--r-- | windowsRuntimeInstaller/VulkanLogo.bmp | bin | 16950 -> 27626 bytes |
4 files changed, 8 insertions, 3 deletions
diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi index 80cb6274..6c711388 100644 --- a/windowsRuntimeInstaller/InstallerRT.nsi +++ b/windowsRuntimeInstaller/InstallerRT.nsi @@ -180,7 +180,9 @@ RequestExecutionLevel admin AddBrandingImage left 150 Caption "${PRODUCTNAME} ${PRODUCTVERSION} Setup" Name "${PRODUCTNAME} ${PRODUCTVERSION}" +LIcenseData "VULKANRT_LICENSE.rtf" Page custom brandimage "" ": Brand Image" +Page license Page directory Page instfiles UninstallCaption "\${PRODUCTNAME} ${PRODUCTVERSION} Uninstall" @@ -232,7 +234,8 @@ Section SetOutPath "$INSTDIR" File ${ICOFILE} - File LICENSE.rtf + FILE VULKANRT_LICENSE.RTF + File ..\LICENSE.txt File ConfigLayersAndVulkanDLL.ps1 # Run the ConfigLayersAndVulkanDLL.ps1 script to copy the most recent version of @@ -263,7 +266,8 @@ Section SetOutPath "$INSTDIR" File ${ICOFILE} - File LICENSE.rtf + File VULKANRT_LICENSE.rtf + File ..\LICENSE.txt File ConfigLayersAndVulkanDLL.ps1 # Run the ConfigLayersAndVulkanDLL.ps1 script to copy the most recent version of @@ -402,7 +406,8 @@ Section "uninstall" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCTNAME}${PRODUCTVERSION}" # Remove files in install dir - Delete /REBOOTOK "$INSTDIR\LICENSE.rtf" + Delete /REBOOTOK "$INSTDIR\VULKANRT_LICENSE.rtf" + Delete /REBOOTOK "$INSTDIR\LICENSE.txt" Delete /REBOOTOK "$INSTDIR\UninstallVulkanRT.exe" Delete /REBOOTOK "$INSTDIR\Vulkan.ico" Delete /REBOOTOK "$INSTDIR\ConfigLayersAndVulkanDLL.ps1" diff --git a/windowsRuntimeInstaller/LICENSE.rtf b/windowsRuntimeInstaller/LICENSE.rtf Binary files differdeleted file mode 100644 index 6a179698..00000000 --- a/windowsRuntimeInstaller/LICENSE.rtf +++ /dev/null diff --git a/windowsRuntimeInstaller/VULKANRT_LICENSE.rtf b/windowsRuntimeInstaller/VULKANRT_LICENSE.rtf Binary files differnew file mode 100644 index 00000000..2b8840c3 --- /dev/null +++ b/windowsRuntimeInstaller/VULKANRT_LICENSE.rtf diff --git a/windowsRuntimeInstaller/VulkanLogo.bmp b/windowsRuntimeInstaller/VulkanLogo.bmp Binary files differindex 37894027..07e792ba 100644 --- a/windowsRuntimeInstaller/VulkanLogo.bmp +++ b/windowsRuntimeInstaller/VulkanLogo.bmp |
