diff options
| author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
|---|---|---|
| committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
| commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
| tree | f053238978479e408a2b83571443e132f30586ab /src/cmd/devdraw/mkwsysrules.sh | |
| parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
| parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
| download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/devdraw/mkwsysrules.sh')
| -rw-r--r-- | src/cmd/devdraw/mkwsysrules.sh | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh index e94afbd3..122e9123 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=mac elif [ -d "$X11" ]; then WSYSTYPE=x11 else @@ -53,14 +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 -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 'MACARGV=macargv-objc.o' + echo 'WSYSHFILES=x11-inc.h x11-keysym2ucs.h x11-memdraw.h' +elif [ $WSYSTYPE = mac ]; then + echo 'WSYSOFILES=$WSYSOFILES mac-draw.o mac-screen.o' + echo 'WSYSHFILES=' + echo 'MACARGV=macargv.o' elif [ $WSYSTYPE = nowsys ]; then echo 'WSYSOFILES=nowsys.o' fi |