Also use macos in extensions.json

This commit is contained in:
Kovid Goyal 2020-09-09 19:28:07 +05:30
parent 7f6dce5218
commit 9642eeea83
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 5 deletions

View File

@ -119,7 +119,7 @@ def parse_extension(ext):
if iswindows: if iswindows:
ans = ext.pop('windows_' + k, ans) ans = ext.pop('windows_' + k, ans)
elif ismacos: elif ismacos:
ans = ext.pop('osx_' + k, ans) ans = ext.pop('macos_' + k, ans)
elif isbsd: elif isbsd:
ans = ext.pop('bsd_' + k, ans) ans = ext.pop('bsd_' + k, ans)
elif isfreebsd: elif isfreebsd:

View File

@ -159,19 +159,19 @@
}, },
{ {
"name": "usbobserver", "name": "usbobserver",
"only": "osx", "only": "macos",
"sources": "calibre/devices/usbobserver/usbobserver.c", "sources": "calibre/devices/usbobserver/usbobserver.c",
"ldflags": "-framework CoreServices -framework IOKit" "ldflags": "-framework CoreServices -framework IOKit"
}, },
{ {
"name": "cocoa", "name": "cocoa",
"only": "osx", "only": "macos",
"sources": "calibre/utils/cocoa.m calibre/utils/cocoa_wrapper.c", "sources": "calibre/utils/cocoa.m calibre/utils/cocoa_wrapper.c",
"ldflags": "-framework Cocoa" "ldflags": "-framework Cocoa"
}, },
{ {
"name": "libusb", "name": "libusb",
"only": "osx linux haiku", "only": "macos linux haiku",
"sources": "calibre/devices/libusb/libusb.c", "sources": "calibre/devices/libusb/libusb.c",
"libraries": "usb-1.0" "libraries": "usb-1.0"
}, },
@ -183,7 +183,7 @@
}, },
{ {
"name": "libmtp", "name": "libmtp",
"only": "freebsd osx linux haiku", "only": "freebsd macos linux haiku",
"sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c", "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c",
"headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h", "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h",
"libraries": "mtp" "libraries": "mtp"