Skip to content

Commit

Permalink
Merge pull request #2792 from vsebe/win_vs2017
Browse files Browse the repository at this point in the history
Add MSVS 2017 support for JDK11 and next to Windows platform
  • Loading branch information
pshipton authored Sep 14, 2018
2 parents 03219bd + e41b9c1 commit 61324bc
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions buildenv/jenkins/variables/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,8 @@ win_x86-64_cmprssptrs:
8: '--with-freetype-include=/cygdrive/c/openjdk/freetype-2.5.3/include --with-freetype-lib=/cygdrive/c/openjdk/freetype-2.5.3/lib64 --disable-ccache'
9: '--with-freetype-src=/cygdrive/c/openjdk/freetype-2.5.3 --with-toolchain-version=2013 --disable-ccache'
10: '--with-freetype-src=/cygdrive/c/openjdk/freetype-2.5.3 --with-toolchain-version=2013 --disable-ccache'
11: '--with-toolchain-version=2013 --disable-ccache'
next: '--with-toolchain-version=2013 --disable-ccache'
11: '--with-toolchain-version=2017 --disable-ccache'
next: '--with-toolchain-version=2017 --disable-ccache'
node_labels:
build:
8: 'hw.arch.x86 && sw.os.windows'
Expand All @@ -321,6 +321,10 @@ win_x86-64_cmprssptrs:
10: 'hw.arch.x86 && sw.os.windows'
11: 'hw.arch.x86 && sw.os.windows'
next: 'hw.arch.x86 && sw.os.windows'
build_env:
vars:
11: 'PATH+MINGW=/cygdrive/c/mingw-w64/x86_64-8.1.0-win32-seh-rt_v6-rev0/mingw64/bin/'
next: 'PATH+MINGW=/cygdrive/c/mingw-w64/x86_64-8.1.0-win32-seh-rt_v6-rev0/mingw64/bin/'
#========================================#
# Windows x86 32bits
#========================================#
Expand Down

0 comments on commit 61324bc

Please sign in to comment.