search

stardot / MatrixBrandy

Matrix Brandy BASIC VI for Linux, Windows, MacOSX
http://brandy.matrixnetwork.co.uk/
44 stars 8 forks source link

Merge back to master #60

Closed jgharston closed 5 years ago

jgharston commented 5 years ago

Removed code from keyboard.c previously commented out in previous update. And some minor comment changes.

soruk42 commented 5 years ago

I see you commented out my defaulting to NEWKBD at the top of keyboard.c. Yes, it's set by default in target.h but your switch on pulling in kbd-old.c in keyboard.c is before the inclusion of target.h - which is why I copied the defaulting to NEWKBD into keyboard.c before this inclusion.

As a result, unless you specifically use -DNEWKBD in the compile flags it no longer compiles.

jgharston commented 5 years ago

Michael McConnell wrote:

As a result, unless you specifically use -DNEWKBD in the compile flags it no longer compiles.

D'oh! I'd tested with -DOLDKBD and -DNEWKBD, but not with no -D at all.

-- J.G.Harston - jgh@mdfs.net - mdfs.net/jgh

soruk42 commented 5 years ago

Merged, and reinstated that block at the top of keyboard.c