From f177c0ba18193fb89ad1b5d84eac2906e8c3b4f1 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 8 Jan 2020 19:49:33 -0500 Subject: devdraw: drop pre-metal macOS support 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. --- src/cmd/devdraw/mkwsysrules.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src/cmd/devdraw/mkwsysrules.sh') diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh index e94afbd3..a1dc56d3 100644 --- a/src/cmd/devdraw/mkwsysrules.sh +++ b/src/cmd/devdraw/mkwsysrules.sh @@ -22,13 +22,11 @@ fi if [ "x$WSYSTYPE" = "x" ]; then if [ "x`uname`" = "xDarwin" ]; then - if sw_vers | grep 'ProductVersion: 10\.[0-5]\.' >/dev/null; then - echo 1>&2 'OS X 10.5 and older are not supported' + if sw_vers | egrep 'ProductVersion: (10\.[0-9]\.|10\.1[012])$' >/dev/null; then + echo 1>&2 'OS X 10.12 and older are not supported' exit 1 - else - #echo 1>&2 'WARNING: OS X Lion is not working. Copy binaries from a Snow Leopard system.' - WSYSTYPE=osx-cocoa fi + WSYSTYPE=osx-cocoa elif [ -d "$X11" ]; then WSYSTYPE=x11 else @@ -54,12 +52,8 @@ if [ $WSYSTYPE = x11 ]; then XO=`ls x11-*.c 2>/dev/null | sed 's/\.c$/.o/'` echo 'WSYSOFILES=$WSYSOFILES '$XO 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 '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 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc' + echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-metal-objc.o cocoa-srv.o cocoa-thread.o' echo 'MACARGV=macargv-objc.o' elif [ $WSYSTYPE = nowsys ]; then echo 'WSYSOFILES=nowsys.o' -- cgit v1.2.3 From db20f89c3286f277945ac4307f789a9980d31bf6 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 8 Jan 2020 19:54:43 -0500 Subject: devdraw: simplify mac file names Now that we only have Metal, we can drop the -metal. Also now that Carbon is gone we can drop the macargv.c, and then the -objc from object file names. --- src/cmd/devdraw/mkwsysrules.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cmd/devdraw/mkwsysrules.sh') diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh index a1dc56d3..8ab67f76 100644 --- a/src/cmd/devdraw/mkwsysrules.sh +++ b/src/cmd/devdraw/mkwsysrules.sh @@ -53,8 +53,8 @@ if [ $WSYSTYPE = x11 ]; then echo 'WSYSOFILES=$WSYSOFILES '$XO elif [ $WSYSTYPE = osx-cocoa ]; then echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc' - echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-metal-objc.o cocoa-srv.o cocoa-thread.o' - echo 'MACARGV=macargv-objc.o' + echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen.o cocoa-srv.o cocoa-thread.o' + echo 'MACARGV=macargv.o' elif [ $WSYSTYPE = nowsys ]; then echo 'WSYSOFILES=nowsys.o' fi -- cgit v1.2.3 From ce27d7babdf2ee09ff6d1f8d4a166c2208995774 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 8 Jan 2020 20:03:31 -0500 Subject: devdraw: can use libthread directly now on macOS --- src/cmd/devdraw/mkwsysrules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/cmd/devdraw/mkwsysrules.sh') diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh index 8ab67f76..839ebab3 100644 --- a/src/cmd/devdraw/mkwsysrules.sh +++ b/src/cmd/devdraw/mkwsysrules.sh @@ -53,7 +53,7 @@ if [ $WSYSTYPE = x11 ]; then echo 'WSYSOFILES=$WSYSOFILES '$XO elif [ $WSYSTYPE = osx-cocoa ]; then echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc' - echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen.o cocoa-srv.o cocoa-thread.o' + echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen.o cocoa-srv.o' echo 'MACARGV=macargv.o' elif [ $WSYSTYPE = nowsys ]; then echo 'WSYSOFILES=nowsys.o' -- cgit v1.2.3 From 933b98054f40bb224acda134d7bb77a023bcc57f Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 8 Jan 2020 20:07:15 -0500 Subject: devdraw: use consistent mac-* prefix on macOS files We were using osx- and cocoa- but it's not even OS X anymore. --- src/cmd/devdraw/mkwsysrules.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/cmd/devdraw/mkwsysrules.sh') diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh index 839ebab3..8e9c3010 100644 --- a/src/cmd/devdraw/mkwsysrules.sh +++ b/src/cmd/devdraw/mkwsysrules.sh @@ -26,7 +26,7 @@ if [ "x$WSYSTYPE" = "x" ]; then echo 1>&2 'OS X 10.12 and older are not supported' exit 1 fi - WSYSTYPE=osx-cocoa + WSYSTYPE=mac elif [ -d "$X11" ]; then WSYSTYPE=x11 else @@ -51,9 +51,9 @@ if [ $WSYSTYPE = x11 ]; then echo 'HFILES=$HFILES $XHFILES' XO=`ls x11-*.c 2>/dev/null | sed 's/\.c$/.o/'` echo 'WSYSOFILES=$WSYSOFILES '$XO -elif [ $WSYSTYPE = osx-cocoa ]; then +elif [ $WSYSTYPE = mac ]; then echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc' - echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen.o cocoa-srv.o' + echo 'WSYSOFILES=$WSYSOFILES mac-draw.o mac-screen.o mac-srv.o' echo 'MACARGV=macargv.o' elif [ $WSYSTYPE = nowsys ]; then echo 'WSYSOFILES=nowsys.o' -- cgit v1.2.3 From 88ed92aa40ab5aa0f563624c488ba2a120990329 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 8 Jan 2020 20:28:17 -0500 Subject: devdraw: move Client into devdraw.h and move global state in --- src/cmd/devdraw/mkwsysrules.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/cmd/devdraw/mkwsysrules.sh') diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh index 8e9c3010..ec660bd1 100644 --- a/src/cmd/devdraw/mkwsysrules.sh +++ b/src/cmd/devdraw/mkwsysrules.sh @@ -51,9 +51,11 @@ if [ $WSYSTYPE = x11 ]; then echo 'HFILES=$HFILES $XHFILES' XO=`ls x11-*.c 2>/dev/null | sed 's/\.c$/.o/'` echo 'WSYSOFILES=$WSYSOFILES '$XO + echo 'WSYSHFILES=x11-inc.h x11-keysym2ucs.h x11-memdraw.h' elif [ $WSYSTYPE = mac ]; then echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc' echo 'WSYSOFILES=$WSYSOFILES mac-draw.o mac-screen.o mac-srv.o' + echo 'WSYSHFILES=mac-screen.h' echo 'MACARGV=macargv.o' elif [ $WSYSTYPE = nowsys ]; then echo 'WSYSOFILES=nowsys.o' -- cgit v1.2.3 From 843e5af1986a2e8f1c4f6177dc4509501711a22c Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 9 Jan 2020 00:40:32 -0500 Subject: devdraw: move per-window globals in mac-screen.m into Client --- src/cmd/devdraw/mkwsysrules.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'src/cmd/devdraw/mkwsysrules.sh') diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh index ec660bd1..cd72120f 100644 --- a/src/cmd/devdraw/mkwsysrules.sh +++ b/src/cmd/devdraw/mkwsysrules.sh @@ -53,7 +53,6 @@ if [ $WSYSTYPE = x11 ]; then echo 'WSYSOFILES=$WSYSOFILES '$XO echo 'WSYSHFILES=x11-inc.h x11-keysym2ucs.h x11-memdraw.h' elif [ $WSYSTYPE = mac ]; then - echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc' echo 'WSYSOFILES=$WSYSOFILES mac-draw.o mac-screen.o mac-srv.o' echo 'WSYSHFILES=mac-screen.h' echo 'MACARGV=macargv.o' -- cgit v1.2.3 From b1a086dee9bf5846b31323ba2c438f8853a9c87f Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 9 Jan 2020 21:47:14 -0500 Subject: devdraw: refactor, clean up mac screen Also turn mac-srv.c into a generic srv.c, so we can remove the duplication with x11-srv.c. --- src/cmd/devdraw/mkwsysrules.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cmd/devdraw/mkwsysrules.sh') diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh index cd72120f..122e9123 100644 --- a/src/cmd/devdraw/mkwsysrules.sh +++ b/src/cmd/devdraw/mkwsysrules.sh @@ -53,8 +53,8 @@ if [ $WSYSTYPE = x11 ]; then echo 'WSYSOFILES=$WSYSOFILES '$XO echo 'WSYSHFILES=x11-inc.h x11-keysym2ucs.h x11-memdraw.h' elif [ $WSYSTYPE = mac ]; then - echo 'WSYSOFILES=$WSYSOFILES mac-draw.o mac-screen.o mac-srv.o' - echo 'WSYSHFILES=mac-screen.h' + echo 'WSYSOFILES=$WSYSOFILES mac-draw.o mac-screen.o' + echo 'WSYSHFILES=' echo 'MACARGV=macargv.o' elif [ $WSYSTYPE = nowsys ]; then echo 'WSYSOFILES=nowsys.o' -- cgit v1.2.3