Merge remote-tracking branch 'origin/main' into optional-tkinter

bjia56 · Aug 7, 2024 · 80b167a · 80b167a
2 parents da0f1a0 + cc966aa
commit 80b167a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/scripts/build_cosmo.sh b/scripts/build_cosmo.sh
@@ -219,11 +219,11 @@ cmake \
   -DLZMA_LIBRARY:FILEPATH=${DEPSDIR}/lib/liblzma.a \
   -DBZIP2_INCLUDE_DIR:PATH=${DEPSDIR}/include \
   -DBZIP2_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libbz2.a \
-  -DREADLINE_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/readline/readline.h \
+  -DREADLINE_INCLUDE_PATH:PATH=${DEPSDIR}/include \
   -DREADLINE_LIBRARY:FILEPATH=${DEPSDIR}/lib/libreadline.a \
   -DCURSES_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libncurses.a \
   -DPANEL_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libpanel.a \
-  -DGDBM_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/gdbm.h \
+  -DGDBM_INCLUDE_PATH:PATH=${DEPSDIR}/include \
   -DGDBM_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm.a \
   -DGDBM_COMPAT_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm_compat.a \
   -DNDBM_TAG=NDBM \

diff --git a/scripts/build_freebsd.sh b/scripts/build_freebsd.sh
@@ -359,9 +359,9 @@ cd ${BUILDDIR}
 additionalparams=()
 if [[ "${DISTRIBUTION}" == "tkinter" ]]; then
   additionalparams+=(
-    -DTK_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/tk.h \
+    -DTK_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include \
     -DTK_LIBRARY:FILEPATH=${DEPSDIR}/lib/libtk8.6.so \
-    -DTCL_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/tcl.h \
+    -DTCL_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include \
     -DTCL_LIBRARY:FILEPATH=${DEPSDIR}/lib/libtcl8.6.so \
     -DX11_INCLUDE_DIR:PATH=${DEPSDIR}/include/X11 \
     -DX11_LIBRARIES="${DEPSDIR}/lib/libXau.so;${DEPSDIR}/lib/libXdmcp.so;${DEPSDIR}/lib/libX11.so;${DEPSDIR}/lib/libXext.so;${DEPSDIR}/lib/libICE.so;${DEPSDIR}/lib/libSM.so;${DEPSDIR}/lib/libXrender.so;${DEPSDIR}/lib/libXft.so;${DEPSDIR}/lib/libXss.so;${DEPSDIR}/lib/libxcb.so"
@@ -402,11 +402,11 @@ cmake \
   -DBZIP2_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libbz2.a \
   -DLibFFI_INCLUDE_DIR:PATH=${DEPSDIR}/include \
   -DLibFFI_LIBRARY:FILEPATH=${DEPSDIR}/lib/libffi.so \
-  -DREADLINE_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/readline/readline.h \
+  -DREADLINE_INCLUDE_PATH:PATH=${DEPSDIR}/include \
   -DREADLINE_LIBRARY:FILEPATH=${DEPSDIR}/lib/libreadline.so \
   -DCURSES_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libncurses.so \
   -DPANEL_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libpanel.so \
-  -DGDBM_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/gdbm.h \
+  -DGDBM_INCLUDE_PATH:PATH=${DEPSDIR}/include \
   -DGDBM_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm.so \
   -DGDBM_COMPAT_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm_compat.so \
   -DNDBM_TAG=NDBM \

diff --git a/scripts/build_linux_zig.sh b/scripts/build_linux_zig.sh
@@ -499,9 +499,9 @@ fi
 
 if [[ "${DISTRIBUTION}" == "tkinter" ]]; then
   additionalparams+=(
-    -DTK_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/tk.h \
+    -DTK_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include \
     -DTK_LIBRARY:FILEPATH=${DEPSDIR}/lib/libtk8.6.a \
-    -DTCL_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/tcl.h \
+    -DTCL_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include \
     -DTCL_LIBRARY:FILEPATH=${DEPSDIR}/lib/libtcl8.6.a \
     -DX11_INCLUDE_DIR:PATH=${DEPSDIR}/include/X11 \
     -DX11_LIBRARIES="${DEPSDIR}/lib/libXau.a;${DEPSDIR}/lib/libXdmcp.a;${DEPSDIR}/lib/libX11.a;${DEPSDIR}/lib/libXext.a;${DEPSDIR}/lib/libICE.a;${DEPSDIR}/lib/libSM.a;${DEPSDIR}/lib/libXrender.a;${DEPSDIR}/lib/libXft.a;${DEPSDIR}/lib/libXss.a;${DEPSDIR}/lib/libxcb.a"
@@ -543,12 +543,12 @@ LDFLAGS="${LDFLAGS} -lfontconfig -lfreetype" cmake \
   -DBZIP2_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libbz2.a \
   -DLibFFI_INCLUDE_DIR:PATH=${DEPSDIR}/include \
   -DLibFFI_LIBRARY:FILEPATH=${DEPSDIR}/lib/libffi.a \
-  -DREADLINE_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/readline/readline.h \
+  -DREADLINE_INCLUDE_PATH:PATH=${DEPSDIR}/include \
   -DREADLINE_LIBRARY:FILEPATH=${DEPSDIR}/lib/libreadline.a \
   -DUUID_LIBRARY:FILEPATH=${DEPSDIR}/lib/libuuid.a \
   -DCURSES_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libncurses.a \
   -DPANEL_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libpanel.a \
-  -DGDBM_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/gdbm.h \
+  -DGDBM_INCLUDE_PATH:PATH=${DEPSDIR}/include \
   -DGDBM_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm.a \
   -DGDBM_COMPAT_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm_compat.a \
   -DNDBM_TAG=NDBM \

diff --git a/scripts/build_macos.sh b/scripts/build_macos.sh
@@ -271,9 +271,9 @@ cd ${BUILDDIR}
 additionalparams=()
 if [[ "${DISTRIBUTION}" == "tkinter" ]]; then
   additionalparams+=(
-    -DTK_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/tk.h \
+    -DTK_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include \
     -DTK_LIBRARY:FILEPATH=${DEPSDIR}/lib/libtk8.6.a \
-    -DTCL_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/tcl.h \
+    -DTCL_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include \
     -DTCL_LIBRARY:FILEPATH=${DEPSDIR}/lib/libtcl8.6.a
   )
 fi
@@ -311,12 +311,12 @@ cmake \
   -DBZIP2_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libbz2.a \
   -DLibFFI_INCLUDE_DIR:PATH=${DEPSDIR}/include \
   -DLibFFI_LIBRARY:FILEPATH=${DEPSDIR}/lib/libffi.a \
-  -DREADLINE_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/readline/readline.h \
+  -DREADLINE_INCLUDE_PATH:PATH=${DEPSDIR}/include \
   -DREADLINE_LIBRARY:FILEPATH=${DEPSDIR}/lib/libreadline.a \
   -DUUID_LIBRARY:FILEPATH=${DEPSDIR}/lib/libuuid.a \
   -DCURSES_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libncurses.a \
   -DPANEL_LIBRARIES:FILEPATH=${DEPSDIR}/lib/libpanel.a \
-  -DGDBM_INCLUDE_PATH:FILEPATH=${DEPSDIR}/include/gdbm.h \
+  -DGDBM_INCLUDE_PATH:PATH=${DEPSDIR}/include \
   -DGDBM_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm.a \
   -DGDBM_COMPAT_LIBRARY:FILEPATH=${DEPSDIR}/lib/libgdbm_compat.a \
   -DNDBM_TAG=NDBM \