diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-07 16:16:53 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-07 16:16:53 +0000 |
| commit | b13a963a72807e98426643a9cde533cab12704ae (patch) | |
| tree | 230868a50fce9ce61ac9c9d5f7d1e3684dcb420b /crawl-ref/source/makefile.unix | |
| parent | 31a05064c33c78579f5e0c1af3302350f06046c2 (diff) | |
| download | crawl-ref-b13a963a72807e98426643a9cde533cab12704ae.tar.gz crawl-ref-b13a963a72807e98426643a9cde533cab12704ae.zip | |
Unicode makefile tweak for trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2367 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makefile.unix')
| -rw-r--r-- | crawl-ref/source/makefile.unix | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/crawl-ref/source/makefile.unix b/crawl-ref/source/makefile.unix index 88ad4ed4eb..94e0b9d4f0 100644 --- a/crawl-ref/source/makefile.unix +++ b/crawl-ref/source/makefile.unix @@ -50,30 +50,6 @@ INSTALLDIR := /usr/games/crawl LEX := flex 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 - -ifneq ($(UNICODE_LOCALE),) -EXTRA_FLAGS += -DUNICODE_LOCALE=\"$(UNICODE_LOCALE)\" -endif - -# 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 -LIBCURS = ncurses -endif - LUASRC := util/lua/src LUALIB = lua LUALIBA = l$(LUALIB).a @@ -126,6 +102,30 @@ ifneq ($(DATADIR),) CFOTHERS += '-DDATA_DIR_PATH="$(DATADIR)"' endif +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 +CFOTHERS += -DUNICODE_GLYPHS + +ifneq ($(UNICODE_LOCALE),) +CFOTHERS += -DUNICODE_LOCALE=\"$(UNICODE_LOCALE)\" +endif + +# 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 +LIBCURS = ncurses +endif + CFOTHERS += $(SELDBM) CFLAGS := $(INCLUDES) $(CFWARN) $(CFOTHERS) |