From dff3fdbfd7d0b29b51d4d6b7ecfd84177e114eb8 Mon Sep 17 00:00:00 2001 From: Signal Linden Date: Sun, 11 Aug 2024 16:44:39 -0700 Subject: Adopt NSIS 3.0 (#2248) --- .github/workflows/build.yaml | 4 ---- indra/newview/installers/windows/installer_template.nsi | 1 + 2 files changed, 1 insertion(+), 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 -- cgit v1.2.3