diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-08-26 20:06:18 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-08-26 20:06:18 +0000 |
commit | 5c6698c8bd9ec6dbd60d36295c0cf2e19430137e (patch) | |
tree | dbcb2b0611bb09a12644791edafe3107fe349326 /app/xterm/Imakefile | |
parent | f3dc14d6ff296b48660a7519667da617fdccbad5 (diff) |
Update to xterm 296. Sixel graphics disabled for now.
Diffstat (limited to 'app/xterm/Imakefile')
-rw-r--r-- | app/xterm/Imakefile | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/app/xterm/Imakefile b/app/xterm/Imakefile index 3b365ad0c..81b6ce86d 100644 --- a/app/xterm/Imakefile +++ b/app/xterm/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XTermId: Imakefile,v 1.107 2013/01/01 12:16:40 tom Exp $ +XCOMM $XTermId: Imakefile,v 1.109 2013/06/23 22:32:37 tom Exp $ XCOMM XCOMM Attention xterm porters XCOMM @@ -165,6 +165,9 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR #if !HasPutenv PUTENVDEF = -DNOPUTENV #endif +#ifdef SixelXTerm + SIXELDEF = -DOPT_SIXEL_GRAPHICS=1 +#endif #ifdef TraceXTerm TRACEDEF = -DOPT_TRACE=1 #endif @@ -174,11 +177,15 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */ XKB_DEFINES = XkbClientDefines PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT) - DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF) + DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(SIXELDEF) $(TRACEDEF) INCLUDES = -I. $(XRFINCLUDES) MAINSRC = main.c MAINOBJ = main.o +#ifdef SixelXTerm + SIXELSRC = graphics.c + SIXELOBJ = graphics.o +#endif #ifdef TraceXTerm TRACESRC = trace.c TRACEOBJ = trace.o @@ -188,13 +195,13 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR linedata.c menu.c misc.c print.c ptydata.c scrollback.c \ screen.c scrollbar.c tabs.c util.c version.c xstrings.c \ xtermcap.c TekPrsTbl.c Tekproc.c VTPrsTbl.c \ - $(MAINSRC) $(EXTRASRC) $(UTF8SRC) $(TRACESRC) + $(MAINSRC) $(EXTRASRC) $(UTF8SRC) $(SIXELSRC) $(TRACESRC) OBJS1 = button.o cachedGCs.o charproc.o charsets.o cursor.o \ data.o doublechr.o fontutils.o input.o \ linedata.o menu.o misc.o print.o ptydata.o scrollback.o \ screen.o scrollbar.o tabs.o util.o version.o xstrings.o \ xtermcap.o TekPrsTbl.o Tekproc.o VTPrsTbl.o \ - $(MAINOBJ) $(EXTRAOBJ) $(UTF8OBJ) $(TRACEOBJ) + $(MAINOBJ) $(EXTRAOBJ) $(UTF8OBJ) $(SIXELOBJ) $(TRACEOBJ) SRCS2 = resize.c version.c xstrings.c OBJS2 = resize.o version.o xstrings.o SRCS = $(SRCS1) $(SRCS2) |