| 1 | diff -u -r ../glulxe/Makefile ./Makefile |
| 2 | --- ../glulxe/Makefile 2013-03-11 03:09:38.000000000 +0100 |
| 3 | +++ ./Makefile 2014-02-15 13:42:39.000000000 +0100 |
| 4 | @@ -7,9 +7,9 @@ |
| 5 | # sets of values appear below; uncomment one of them and change the |
| 6 | # directories appropriately. |
| 7 | |
| 8 | -GLKINCLUDEDIR = ../cheapglk |
| 9 | -GLKLIBDIR = ../cheapglk |
| 10 | -GLKMAKEFILE = Make.cheapglk |
| 11 | +GLKINCLUDEDIR = glkterm |
| 12 | +GLKLIBDIR = glkterm |
| 13 | +GLKMAKEFILE = Make.glktermw |
| 14 | |
| 15 | #GLKINCLUDEDIR = ../glkterm |
| 16 | #GLKLIBDIR = ../glkterm |
| 17 | @@ -25,9 +25,8 @@ |
| 18 | |
| 19 | # Pick a C compiler. |
| 20 | #CC = cc |
| 21 | -CC = gcc |
| 22 | |
| 23 | -OPTIONS = -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-unused -DOS_UNIX |
| 24 | +OPTIONS := $(CFLAGS) -DOS_UNIX |
| 25 | |
| 26 | include $(GLKINCLUDEDIR)/$(GLKMAKEFILE) |
| 27 | |