o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

devdraw: drop pre-metal macOS support

Browse source 
We didn't start using Metal until macOS 10.14,
but it was available on 10.13, which is currently
the oldest Apple-supported version of macOS.
Simplify by deleting the old code.
This commit is contained in:
Russ Cox 2020-01-08 19:49:33 -05:00
parent cc3d97d52a
commit f177c0ba18
3 changed files with 5 additions and 1688 deletions
Download patch file Download diff file Expand all files Collapse all files

1674
src/cmd/devdraw/cocoa-screen.m
View file

File diff suppressed because it is too large Load diff

3
src/cmd/devdraw/macargv.m
View file

@ -12,9 +12,6 @@ AUTOFRAMEWORK(Cocoa)
void void
main(void) main(void)
{ {
if(OSX_VERSION < 100700)
[NSAutoreleasePool new];
[NSApplication sharedApplication]; [NSApplication sharedApplication];
NSObject<NSApplicationDelegate> *delegate = [appdelegate new]; NSObject<NSApplicationDelegate> *delegate = [appdelegate new];
[NSApp setDelegate:delegate]; [NSApp setDelegate:delegate];

16
src/cmd/devdraw/mkwsysrules.sh
View file

@ -22,13 +22,11 @@ fi
if [ "x$WSYSTYPE" = "x" ]; then if [ "x$WSYSTYPE" = "x" ]; then
if [ "x`uname`" = "xDarwin" ]; then if [ "x`uname`" = "xDarwin" ]; then
if sw_vers | grep 'ProductVersion: 10\.[0-5]\.' >/dev/null; then if sw_vers | egrep 'ProductVersion: (10\.[0-9]\.|10\.1[012])$' >/dev/null; then
echo 1>&2 'OS X 10.5 and older are not supported' echo 1>&2 'OS X 10.12 and older are not supported'
exit 1 exit 1
else
#echo 1>&2 'WARNING: OS X Lion is not working. Copy binaries from a Snow Leopard system.'
WSYSTYPE=osx-cocoa
fi fi
WSYSTYPE=osx-cocoa
elif [ -d "$X11" ]; then elif [ -d "$X11" ]; then
WSYSTYPE=x11 WSYSTYPE=x11
else else
@ -54,12 +52,8 @@ if [ $WSYSTYPE = x11 ]; then
XO=`ls x11-*.c 2>/dev/null | sed 's/\.c$/.o/'` XO=`ls x11-*.c 2>/dev/null | sed 's/\.c$/.o/'`
echo 'WSYSOFILES=$WSYSOFILES '$XO echo 'WSYSOFILES=$WSYSOFILES '$XO
elif [ $WSYSTYPE = osx-cocoa ]; then elif [ $WSYSTYPE = osx-cocoa ]; then
if sw_vers|awk '/ProductVersion/{split($2,a,".");exit(a[2]<14)}' >/dev/null; then # 0 is true in sh. echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc'
echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc' echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-metal-objc.o cocoa-srv.o cocoa-thread.o'
echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-metal-objc.o cocoa-srv.o cocoa-thread.o'
else
echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-objc.o cocoa-srv.o cocoa-thread.o'
fi
echo 'MACARGV=macargv-objc.o' echo 'MACARGV=macargv-objc.o'
elif [ $WSYSTYPE = nowsys ]; then elif [ $WSYSTYPE = nowsys ]; then
echo 'WSYSOFILES=nowsys.o' echo 'WSYSOFILES=nowsys.o'