mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-07-01 09:33:15 +00:00
Code Issues 1 Releases Wiki Activity

Switch to 32 bit build.

Browse Source
This commit is contained in:
Calvin Rose 2019-08-07 22:51:16 -04:00
parent 7713674ff6
commit 4ba912cd57
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
appveyor.yml
View File

@ -1,7 +1,7 @@
version: build-{build} version: build-{build}
clone_folder: c:\projects\janet clone_folder: c:\projects\janet
image: image:
- Visual Studio 2017 - Visual Studio 2019
configuration: configuration:
- Release - Release
- Debug - Debug
@ -15,7 +15,7 @@ matrix:
# skip unsupported combinations # skip unsupported combinations
init: 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: install:
- choco install nsis -y -pre - choco install nsis -y -pre
@ -25,7 +25,7 @@ install:
- build_win all - build_win all
- refreshenv - refreshenv
# We need to reload vcvars after refreshing # 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_win test-install
build: off build: off

4
janet-installer.nsi
View File

@ -8,13 +8,15 @@ VIFileVersion "${PRODUCT_VERSION}"
!define MULTIUSER_EXECUTIONLEVEL Highest !define MULTIUSER_EXECUTIONLEVEL Highest
!define MULTIUSER_MUI !define MULTIUSER_MUI
!define MULTIUSER_INSTALLMODE_COMMANDLINE !define MULTIUSER_INSTALLMODE_COMMANDLINE
!define MULTIUSER_USE_PROGRAMFILES64
!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "Software\Janet\${VERSION}" !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "Software\Janet\${VERSION}"
!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME "" !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME ""
!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\Janet\${VERSION}" !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\Janet\${VERSION}"
!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME "" !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME ""
!define MULTIUSER_INSTALLMODE_INSTDIR "Janet-${VERSION}" !define MULTIUSER_INSTALLMODE_INSTDIR "Janet-${VERSION}"
# For now, use 32 bit folder as build is 32 bit
# !define MULTIUSER_USE_PROGRAMFILES64
# Includes # Includes
!include "MultiUser.nsh" !include "MultiUser.nsh"
!include "MUI2.nsh" !include "MUI2.nsh"