diff options
| author | marc_culler <marc.culler@gmail.com> | 2022-09-20 04:43:34 (GMT) |
|---|---|---|
| committer | marc_culler <marc.culler@gmail.com> | 2022-09-20 04:43:34 (GMT) |
| commit | 5326a1ee1e1fbada3ed3232ffcf8830428a1f7a3 (patch) | |
| tree | b74b6f3bfd6a1bb9a8366c8f263becd702f734fa /unix | |
| parent | 71e2b0832bc887e3a6a761757e581b412345cb40 (diff) | |
| parent | 2563fb89e2263bd34cc5d23ad7e7ba45916cc898 (diff) | |
| download | tk-5326a1ee1e1fbada3ed3232ffcf8830428a1f7a3.zip tk-5326a1ee1e1fbada3ed3232ffcf8830428a1f7a3.tar.gz tk-5326a1ee1e1fbada3ed3232ffcf8830428a1f7a3.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 25 | ||||
| -rwxr-xr-x | unix/configure | 3 | ||||
| -rw-r--r-- | unix/configure.ac | 3 |
3 files changed, 19 insertions, 12 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index ba8dd29..9969c54 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -399,16 +399,14 @@ X11_OBJS = tkUnix.o tkUnix3d.o tkUnixButton.o tkUnixColor.o tkUnixConfig.o \ AQUA_OBJS = tkMacOSXBitmap.o tkMacOSXButton.o tkMacOSXClipboard.o \ tkMacOSXColor.o tkMacOSXConfig.o tkMacOSXCursor.o tkMacOSXDebug.o \ tkMacOSXDialog.o tkMacOSXDraw.o tkMacOSXEmbed.o tkMacOSXEntry.o \ - tkMacOSXEvent.o tkMacOSXFont.o tkMacOSXHLEvents.o tkMacOSXImage.o \ - tkMacOSXInit.o tkMacOSXKeyboard.o tkMacOSXKeyEvent.o \ - tkMacOSXMenu.o \ - tkMacOSXMenubutton.o tkMacOSXMenus.o tkMacOSXMouseEvent.o \ - tkMacOSXNotify.o tkMacOSXPrint.o tkMacOSXRegion.o \ - tkMacOSXScrlbr.o tkMacOSXSend.o \ - tkMacOSXServices.o tkMacOSXSubwindows.o tkMacOSXWindowEvent.o \ - tkMacOSXWm.o tkMacOSXXStubs.o tkMacOSXSysTray.o\ - tkFileFilter.o tkMacWinMenu.o tkPointer.o tkUnix3d.o tkUnixScale.o \ - xcolors.o xdraw.o xgc.o ximage.o xutil.o \ + tkMacOSXEvent.o tkMacOSXFileTypes.o tkMacOSXFont.o tkMacOSXHLEvents.o \ + tkMacOSXImage.o tkMacOSXInit.o tkMacOSXKeyboard.o tkMacOSXKeyEvent.o \ + tkMacOSXMenu.o tkMacOSXMenubutton.o tkMacOSXMenus.o \ + tkMacOSXMouseEvent.o tkMacOSXNotify.o tkMacOSXPrint.o tkMacOSXRegion.o \ + tkMacOSXScrlbr.o tkMacOSXSend.o tkMacOSXServices.o \ + tkMacOSXSubwindows.o tkMacOSXSysTray.o tkMacOSXWindowEvent.o tkMacOSXWm.o \ + tkMacOSXXStubs.o tkFileFilter.o tkMacWinMenu.o tkPointer.o tkUnix3d.o \ + tkUnixScale.o xcolors.o xdraw.o xgc.o ximage.o xutil.o \ ttkMacOSXTheme.o AQUA_TKTEST_OBJS = tkMacOSXTest.o @@ -527,8 +525,8 @@ AQUA_SRCS = \ $(MAC_OSX_DIR)/tkMacOSXDebug.c $(MAC_OSX_DIR)/tkMacOSXDialog.c \ $(MAC_OSX_DIR)/tkMacOSXDraw.c $(MAC_OSX_DIR)/tkMacOSXEmbed.c \ $(MAC_OSX_DIR)/tkMacOSXEntry.c $(MAC_OSX_DIR)/tkMacOSXEvent.c \ - $(MAC_OSX_DIR)/tkMacOSXFont.c $(MAC_OSX_DIR)/tkMacOSXHLEvents.c \ - $(MAC_OSX_DIR)/tkMacOSXImage.c \ + $(MAC_OSX_DIR)/tkMacOSXFont.c $(MAC_OSX_DIR)/tkMacOSXFileTypes.c\ + $(MAC_OSX_DIR)/tkMacOSXHLEvents.c $(MAC_OSX_DIR)/tkMacOSXImage.c \ $(MAC_OSX_DIR)/tkMacOSXInit.c $(MAC_OSX_DIR)/tkMacOSXKeyboard.c \ $(MAC_OSX_DIR)/tkMacOSXKeyEvent.c \ $(MAC_OSX_DIR)/tkMacOSXMenu.c \ @@ -1397,6 +1395,9 @@ tkMacOSXEntry.o: $(MAC_OSX_DIR)/tkMacOSXEntry.c tkMacOSXEvent.o: $(MAC_OSX_DIR)/tkMacOSXEvent.c $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXEvent.c +tkMacOSXFileTypes.o: $(MAC_OSX_DIR)/tkMacOSXFileTypes.c + $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXFileTypes.c + tkMacOSXFont.o: $(MAC_OSX_DIR)/tkMacOSXFont.c $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXFont.c diff --git a/unix/configure b/unix/configure index 6b96ef4..7eeeaa7 100755 --- a/unix/configure +++ b/unix/configure @@ -7640,6 +7640,9 @@ printf "%s\n" "#define MAC_OSX_TK 1" >>confdefs.h if test -d /System/Library/Frameworks/UserNotifications.framework; then LIBS="$LIBS -framework UserNotifications" fi + if test -d "/System/Library/Frameworks/UniformTypeIdentifiers.framework"; then + LIBS="$LIBS -framework UniformTypeIdentifiers" + fi EXTRA_CC_SWITCHES='-x objective-c' TK_WINDOWINGSYSTEM=AQUA if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then diff --git a/unix/configure.ac b/unix/configure.ac index cce5c29..93b3226 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -288,6 +288,9 @@ if test $tk_aqua = yes; then if test -d /System/Library/Frameworks/UserNotifications.framework; then LIBS="$LIBS -framework UserNotifications" fi + if test -d "/System/Library/Frameworks/UniformTypeIdentifiers.framework"; then + LIBS="$LIBS -framework UniformTypeIdentifiers" + fi EXTRA_CC_SWITCHES='-x objective-c' TK_WINDOWINGSYSTEM=AQUA if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then |