diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-22 13:36:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-22 13:36:14 (GMT) |
| commit | ce71e454a4e1b7239f2e765f09373d1fb9779f86 (patch) | |
| tree | 502e2d74c364613a101ed8baa08fb7e98761cd00 /.travis.yml | |
| parent | 548dc002dda31d26cee170eb6c13cc96d134e52f (diff) | |
| parent | 94ce35fac8fa42a081fb209997608c957ba8c9d7 (diff) | |
| download | tk-ce71e454a4e1b7239f2e765f09373d1fb9779f86.zip tk-ce71e454a4e1b7239f2e765f09373d1fb9779f86.tar.gz tk-ce71e454a4e1b7239f2e765f09373d1fb9779f86.tar.bz2 | |
Merge 8.5
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 2e9ec93..a3bc25d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -114,49 +114,49 @@ matrix: - BUILD_DIR=unix - CFGOPT="--enable-symbols" # Testing on Mac, various styles - - name: "macOS/Xcode 11.4/Shared" + - name: "macOS/Xcode 11.5/Shared" os: osx - osx_image: xcode11.4 + osx_image: xcode11.5 env: - BUILD_DIR=unix - - CFGOPT="--prefix=/usr/local/opt/tcl-tk --with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CC=clang CFLAGS=-I/usr/local/opt/tcl-tk/include" - - name: "macOS/Xcode 11.4/Static" + - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include" + - name: "macOS/Xcode 11.5/Static" os: osx - osx_image: xcode11.4 + osx_image: xcode11.5 env: - BUILD_DIR=unix - - CFGOPT="--prefix=/usr/local/opt/tcl-tk --with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CC=clang CFLAGS=-I/usr/local/opt/tcl-tk/include" - - name: "macOS/Xcode 11.4/Debug" + - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CFLAGS=-I/usr/local/opt/tcl-tk/include" + - name: "macOS/Xcode 11.5/Debug" os: osx - osx_image: xcode11.4 + osx_image: xcode11.5 env: - BUILD_DIR=unix - - CFGOPT="--prefix=/usr/local/opt/tcl-tk --with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CC=clang CFLAGS=-I/usr/local/opt/tcl-tk/include" - - name: "macOS/Xcode 11.4/Shared/XQuartz" + - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CFLAGS=-I/usr/local/opt/tcl-tk/include" + - name: "macOS/Xcode 11.5/Shared/XQuartz" os: osx - osx_image: xcode11.4 + osx_image: xcode11.5 env: - BUILD_DIR=unix - - CFGOPT="--prefix=/usr/local/opt/tcl-tk --with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CC=clang CFLAGS=-I/usr/local/opt/tcl-tk/include" + - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include" # Older MacOS versions - name: "macOS/Xcode 11/Shared" os: osx osx_image: xcode11 env: - BUILD_DIR=unix - - CFGOPT="--prefix=/usr/local/opt/tcl-tk --with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CC=clang CFLAGS=-I/usr/local/opt/tcl-tk/include" + - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include" - name: "macOS/Xcode 10/Shared" os: osx osx_image: xcode10.3 env: - BUILD_DIR=unix - - CFGOPT="--prefix=/usr/local/opt/tcl-tk --with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CC=clang CFLAGS=-I/usr/local/opt/tcl-tk/include" + - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include" - name: "macOS/Xcode 9/Shared" os: osx osx_image: xcode9.4 env: - BUILD_DIR=unix - - CFGOPT="--prefix=/usr/local/opt/tcl-tk --with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CC=clang CFLAGS=-I/usr/local/opt/tcl-tk/include" + - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include" # Test on Windows with MSVC native # - name: "Windows/MSVC/Shared" # os: windows |