From 43501a5b2ed3fd7ae8fb2502b1153af7a8192e76 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Sun, 10 Jun 2007 09:29:22 +0000 Subject: Tweaks to build with Unicode support on Mac OS. Unfortunately none of the widely-used Mac terminal emulators has a clue on how to handle Unicode block characters (Terminal.app, iTerm, Terminator,...; they all suck), so Mac Unicode lovers will probably need to run X and urxvt or something along those lines. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1567 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/libunix.cc | 1 + crawl-ref/source/makefile.unix | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc index b26397113a..9dbf1db8e0 100644 --- a/crawl-ref/source/libunix.cc +++ b/crawl-ref/source/libunix.cc @@ -63,6 +63,7 @@ static struct termios game_term; // Its best if curses comes at the end (name conflicts with Solaris). -- bwr #ifndef CURSES_INCLUDE_FILE + #define _XOPEN_SOURCE_EXTENDED #include #else #include CURSES_INCLUDE_FILE diff --git a/crawl-ref/source/makefile.unix b/crawl-ref/source/makefile.unix index 199bc302b3..298e249f6a 100644 --- a/crawl-ref/source/makefile.unix +++ b/crawl-ref/source/makefile.unix @@ -48,8 +48,17 @@ YACC := bison -y ifeq ($(UNICODE_GLYPHS),y) # Include path for (n)curses with Unicode support. INCLUDES = -I/usr/include/ncursesw + +# Your ncurses library may include Unicode support, and you may not have a +# separate libncursesw; in that case, change this line accordingly. LIBCURS = ncursesw EXTRA_FLAGS += -DUNICODE_GLYPHS + +# The standard ncurses library also supports Unicode on Mac OS/Darwin. +ifeq ($(shell uname),Darwin) +LIBCURS = ncurses +endif + else # Include path for curses or ncurses (non-Unicode). INCLUDES = -I/usr/include/ncurses -- cgit v1.2.3-54-g00ecf