mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Since tmux doesn't actually need ncurses, use -lcurses/curses.h
instead. Pointed out by millert a while ago.
This commit is contained in:
		
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							@@ -38,7 +38,7 @@ CDIAGFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
 | 
				
			|||||||
CDIAGFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
 | 
					CDIAGFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
 | 
				
			||||||
CDIAGFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align
 | 
					CDIAGFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align
 | 
				
			||||||
 | 
					
 | 
				
			||||||
LDADD=  -lutil -lncurses
 | 
					LDADD=  -lutil -lcurses
 | 
				
			||||||
DPADD=  ${LIBUTIL}
 | 
					DPADD=  ${LIBUTIL}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.include <bsd.prog.mk>
 | 
					.include <bsd.prog.mk>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <sys/types.h>
 | 
					#include <sys/types.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <ncurses.h>
 | 
					#include <curses.h>
 | 
				
			||||||
#include <string.h>
 | 
					#include <string.h>
 | 
				
			||||||
#include <term.h>
 | 
					#include <term.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -183,7 +183,7 @@ tty_term_find(char *name, int fd, char **cause)
 | 
				
			|||||||
	term->flags = 0;
 | 
						term->flags = 0;
 | 
				
			||||||
	SLIST_INSERT_HEAD(&tty_terms, term, entry);
 | 
						SLIST_INSERT_HEAD(&tty_terms, term, entry);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* Set up ncurses terminal. */
 | 
						/* Set up curses terminal. */
 | 
				
			||||||
	if (setupterm(name, fd, &error) != OK) {
 | 
						if (setupterm(name, fd, &error) != OK) {
 | 
				
			||||||
		switch (error) {
 | 
							switch (error) {
 | 
				
			||||||
		case 0:
 | 
							case 0:
 | 
				
			||||||
@@ -237,7 +237,7 @@ tty_term_find(char *name, int fd, char **cause)
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	tty_term_quirks(term);
 | 
						tty_term_quirks(term);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* Delete ncurses data. */
 | 
						/* Delete curses data. */
 | 
				
			||||||
	del_curterm(cur_term);
 | 
						del_curterm(cur_term);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* These are always required. */
 | 
						/* These are always required. */
 | 
				
			||||||
@@ -358,7 +358,7 @@ tty_term_string(struct tty_term *term, enum tty_code_code code)
 | 
				
			|||||||
	return (term->codes[code].value.string);
 | 
						return (term->codes[code].value.string);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* No vtparm. Fucking ncurses. */
 | 
					/* No vtparm. Fucking curses. */
 | 
				
			||||||
const char *
 | 
					const char *
 | 
				
			||||||
tty_term_string1(struct tty_term *term, enum tty_code_code code, int a)
 | 
					tty_term_string1(struct tty_term *term, enum tty_code_code code, int a)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user