Skip to content

Commit

Permalink
Switch to 32 bit build.
Browse files Browse the repository at this point in the history
  • Loading branch information
bakpakin committed Aug 8, 2019
1 parent 7713674 commit 4ba912c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: build-{build}
clone_folder: c:\projects\janet
image:
- Visual Studio 2017
- Visual Studio 2019
configuration:
- Release
- Debug
Expand All @@ -15,7 +15,7 @@ matrix:

# skip unsupported combinations
init:
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"

install:
- choco install nsis -y -pre
Expand All @@ -25,7 +25,7 @@ install:
- build_win all
- refreshenv
# We need to reload vcvars after refreshing
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
- build_win test-install
build: off

Expand Down
6 changes: 4 additions & 2 deletions janet-installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ VIFileVersion "${PRODUCT_VERSION}"
!define MULTIUSER_EXECUTIONLEVEL Highest
!define MULTIUSER_MUI
!define MULTIUSER_INSTALLMODE_COMMANDLINE
!define MULTIUSER_USE_PROGRAMFILES64
!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "Software\Janet\${VERSION}"
!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME ""
!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\Janet\${VERSION}"
!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME ""
!define MULTIUSER_INSTALLMODE_INSTDIR "Janet-${VERSION}"

# For now, use 32 bit folder as build is 32 bit
# !define MULTIUSER_USE_PROGRAMFILES64

# Includes
!include "MultiUser.nsh"
!include "MUI2.nsh"
Expand Down Expand Up @@ -189,4 +191,4 @@ section "uninstall"
# Remove uninstaller information from the registry
DeleteRegKey SHCTX "${UNINST_KEY}"

sectionEnd
sectionEnd

0 comments on commit 4ba912c

Please sign in to comment.