Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update windows build toolchain to vs2013 #278

Merged
merged 1 commit into from
Nov 20, 2020
Merged

Update windows build toolchain to vs2013 #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion installers/windows/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ this project, you need to provide the following parameters:
```$xslt
bootjdk_dir # Path of bootstrap JDK. To build Corretto8, JDK7 or JDK8 is required.

vcruntime_dir # Path of the latest vcruntime100.dll
vcruntime_dir # Path of the latest msvcr120.dll

msvcp_dir # Path of the latest msvcp120.dll

freetype_dir # Path of freetype
```
Expand All @@ -20,6 +22,7 @@ The zip archives of Corretto8 JDK and JRE are located at `/installers/windows/zi
➜ ./gradlew :installers:windows:zip:build \
-Pbootjdk_dir=... \
-Pvcruntime_dir=... \
-Pmsvcp_dir=... \
-Pfreetype_dir=...
```

Expand Down
6 changes: 4 additions & 2 deletions installers/windows/zip/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ task configureBuild(type: Exec) {
// Platform specific flags
def command = ['bash', 'configure',
"--with-boot-jdk=${project.getProperty('bootjdk_dir')}",
"--with-msvcr-dll=${project.getProperty('vcruntime_dir')}/msvcr100.dll",
"--with-freetype=${project.getProperty('freetype_dir')}"]
"--with-msvcr-dll=${project.getProperty('vcruntime_dir')}/msvcr120.dll",
"--with-msvcp-dll=${project.getProperty('msvcp_dir')}/msvcp120.dll",
"--with-freetype=${project.getProperty('freetype_dir')}",
"--with-toolchain-version=2013"]
// Common flags
command += project.correttoCommonFlags
commandLine command.flatten()
Expand Down