diff options
| author | culler <culler> | 2021-04-07 16:04:18 (GMT) |
|---|---|---|
| committer | culler <culler> | 2021-04-07 16:04:18 (GMT) |
| commit | a8e3d2a05ad6310f0da1dc08fde580cc9b31d8c6 (patch) | |
| tree | e9ded953c0b3b3476ce282fff312f6fe80fe8b7e | |
| parent | b93670f51c759848d8400b6934dbd0aee1f22cd6 (diff) | |
| download | tk-a8e3d2a05ad6310f0da1dc08fde580cc9b31d8c6.zip tk-a8e3d2a05ad6310f0da1dc08fde580cc9b31d8c6.tar.gz tk-a8e3d2a05ad6310f0da1dc08fde580cc9b31d8c6.tar.bz2 | |
Adjustment to the subframework build; deal with systems that report the OS version as 10.16 even though 10.16 was never released.
| -rw-r--r-- | macosx/GNUmakefile | 10 | ||||
| -rw-r--r-- | macosx/tkMacOSXColor.c | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile index ff028b5..dd4c025 100644 --- a/macosx/GNUmakefile +++ b/macosx/GNUmakefile @@ -46,12 +46,6 @@ TK_X11 ?= # Checks and overrides for subframework builds ifeq (${SUBFRAMEWORK}_${TK_X11},1_) -ifeq (${DYLIB_INSTALL_DIR},) - @echo "Cannot install subframework with empty DYLIB_INSTALL_DIR !" && false -endif -ifeq (${DESTDIR},) - @echo "Cannot install subframework with empty DESTDIR !" && false -endif override BUILD_DIR = ${DESTDIR}/build override INSTALL_PATH = /Frameworks endif @@ -145,9 +139,9 @@ wish := ${wish}-X11 override EMBEDDED_BUILD := endif -INSTALL_TARGETS = install-binaries install-libraries +INSTALL_TARGETS = install-binaries install-libraries install-headers ifeq (${EMBEDDED_BUILD},) -INSTALL_TARGETS += install-private-headers install-headers install-demos +INSTALL_TARGETS += install-private-headers install-demos endif ifeq (${INSTALL_BUILD}_${EMBEDDED_BUILD}_${BUILD_STYLE},1__Deployment) INSTALL_TARGETS += html-tk diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c index edcd5d3..f82305e 100644 --- a/macosx/tkMacOSXColor.c +++ b/macosx/tkMacOSXColor.c @@ -326,7 +326,7 @@ GetRGBA( #endif } else if (entry->index == selectedTabTextIndex) { int OSVersion = [NSApp macOSVersion]; - if (OSVersion > 100600 && OSVersion < 110000) { + if (OSVersion > 100600 && OSVersion < 101600) { color = [[NSColor whiteColor] colorUsingColorSpace:sRGB]; } else { color = [[NSColor textColor] colorUsingColorSpace:sRGB]; |