diff options
| author | Signal Linden <signal@lindenlab.com> | 2024-08-11 16:44:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-11 16:44:39 -0700 |
| commit | dff3fdbfd7d0b29b51d4d6b7ecfd84177e114eb8 (patch) | |
| tree | 6166a4ba053bc16137039cb04d25b0c68f2c5952 | |
| parent | 501e92250ef61abcbbdb26f2e6f882d864113ac4 (diff) | |
Adopt NSIS 3.0 (#2248)
| -rw-r--r-- | .github/workflows/build.yaml | 4 | ||||
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 00b9ccd2c9..53bfbc2c0a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -120,10 +120,6 @@ jobs: ${{ runner.os }}-64-${{ matrix.configuration }}- ${{ runner.os }}-64- - - name: Install windows dependencies - if: runner.os == 'Windows' - run: choco install nsis-unicode - - name: Determine source branch id: which-branch uses: secondlife/viewer-build-util/which-branch@v2 diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index d1dab94a76..77f24ac6a6 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -32,6 +32,7 @@ SetCompressor /solid lzma # Compress whole installer as one block SetDatablockOptimize off # Only saves us 0.1%, not worth it
XPStyle on # Add an XP manifest to the installer
RequestExecutionLevel admin # For when we write to Program Files
+Unicode true # Enable unicode support
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Project flags
|