Tk Source Code

Artifact [04a80427]
Login

Artifact 04a80427cfb3548c2de6c4a289441ac0a1e5bfbdf0a339a2ea160681ba32a2a9:

Attachment "ci-cppflags-tk-8.6.diff" to ticket [ac07794b] added by chrstphrchvz 2023-11-17 02:00:14.
diff --git .travis.yml .travis.yml
index 77a8d274c0..59a658338d 100644
--- .travis.yml
+++ .travis.yml
@@ -137,32 +137,32 @@ jobs:
       osx_image: xcode12
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CPPFLAGS=-I/usr/local/opt/tcl-tk/include"
     - name: "macOS/Xcode 12/Static"
       os: osx
       osx_image: xcode12
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CFLAGS=-I/usr/local/opt/tcl-tk/include"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CPPFLAGS=-I/usr/local/opt/tcl-tk/include"
     - name: "macOS/Xcode 12/Debug"
       os: osx
       osx_image: xcode12
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CFLAGS=-I/usr/local/opt/tcl-tk/include"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CPPFLAGS=-I/usr/local/opt/tcl-tk/include"
 #   - name: "macOS/Xcode 12/Shared/XQuartz"
 #     os: osx
 #     osx_image: xcode12
 #     env:
 #       - BUILD_DIR=unix
-#       - 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"
+#       - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CPPFLAGS=-I/usr/local/opt/tcl-tk/include"
 # Older MacOS versions
     - name: "macOS/Xcode 11/Shared"
       os: osx
       osx_image: xcode11.7
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CPPFLAGS=-Wp,-I/usr/local/opt/tcl-tk/include,-mmacosx-version-min=10.14"
     - name: "macOS/Xcode 10/Shared"
       os: osx
       osx_image: xcode10.3
@@ -173,7 +173,7 @@ jobs:
           update: true
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CPPFLAGS=-Wp,-I/usr/local/opt/tcl-tk/include,-mmacosx-version-min=10.14"
     - name: "macOS/Xcode 9/Shared"
       os: osx
       osx_image: xcode9.4
@@ -184,7 +184,7 @@ jobs:
           update: true
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CPPFLAGS=-Wp,-I/usr/local/opt/tcl-tk/include,-mmacosx-version-min=10.13"
 # Test on Windows with MSVC native
 #   - name: "Windows/MSVC/Shared"
 #     os: windows