diff options
| author | nlanza <nlanza@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-07 05:35:31 +0000 |
|---|---|---|
| committer | nlanza <nlanza@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-11-07 05:35:31 +0000 |
| commit | af81923ffd1b5612df9bd30224b5d50b17c108f2 (patch) | |
| tree | ee6717f30e5cdd867aadbd7d0e7b11b3c18b9708 | |
| parent | c9619cb90c306ed1f36d8081a133b28c8d2eba86 (diff) | |
| download | crawl-ref-af81923ffd1b5612df9bd30224b5d50b17c108f2.tar.gz crawl-ref-af81923ffd1b5612df9bd30224b5d50b17c108f2.zip | |
Continue to generic-ify the build; very little in the source is *actually*
Linux-specific, so stop having separate LINUX/UNIX #defines.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@350 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/AppHdr.h | 21 | ||||
| -rw-r--r-- | crawl-ref/source/Crawl.xcodeproj/project.pbxproj | 3 | ||||
| -rw-r--r-- | crawl-ref/source/libutil.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/makefile.lnx | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h index 2e5945b742..c7be3002e4 100644 --- a/crawl-ref/source/AppHdr.h +++ b/crawl-ref/source/AppHdr.h @@ -60,25 +60,24 @@ // // #define CLUA_BINDINGS -// ========================================================================= -// System Defines -// ========================================================================= -// Define plain_term for Unix and dos_term for DOS. - -#if defined(LINUX) - #define UNIX - #define USE_UNIX_SIGNALS -#elif defined(OSX) +// OS X's Terminal.app has color handling problems; dark grey is +// especially bad, so we'll want to remap that. OS X is otherwise +// Unix-ish, so we shouldn't need other special handling. +#if defined(OSX) #define UNIX - #define USE_UNIX_SIGNALS - // Darkgrey is a particular problem in Terminal.app. #define USE_8_COLOUR_TERM_MAP #define COL_TO_REPLACE_DARKGREY BLUE #endif +// ========================================================================= +// System Defines +// ========================================================================= +// Define plain_term for Unix and dos_term for DOS. + #ifdef UNIX #define PLAIN_TERM #define MULTIUSER + #define USE_UNIX_SIGNALS #define CHARACTER_SET 0 #define USE_ASCII_CHARACTERS diff --git a/crawl-ref/source/Crawl.xcodeproj/project.pbxproj b/crawl-ref/source/Crawl.xcodeproj/project.pbxproj index 78b435bd28..1be239507b 100644 --- a/crawl-ref/source/Crawl.xcodeproj/project.pbxproj +++ b/crawl-ref/source/Crawl.xcodeproj/project.pbxproj @@ -158,7 +158,7 @@ isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; proxyType = 1; - remoteGlobalIDString = 7B352E8B0B00172000CABB32 /* levcomp */; + remoteGlobalIDString = 7B352E8B0B00172000CABB32; remoteInfo = levcomp; }; /* End PBXContainerItemProxy section */ @@ -921,6 +921,7 @@ GCC_OPTIMIZATION_LEVEL = 1; GCC_PREPROCESSOR_DEFINITIONS = ( OSX, + UNIX, WIZARD, DEBUG, DEBUG_ITEM_SCAN, diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc index d4bacf44c2..62d0c86754 100644 --- a/crawl-ref/source/libutil.cc +++ b/crawl-ref/source/libutil.cc @@ -150,7 +150,7 @@ static int getch_ck() { // Hacky wrapper around getch() that returns CK_ codes for keys // we want to use in cancelable_get_line() and menus. int c_getch() { -#if defined(DOS) || defined(LINUX) || defined(WIN32CONSOLE) +#if defined(DOS) || defined(UNIX) || defined(WIN32CONSOLE) return getch_ck(); #else return getch(); diff --git a/crawl-ref/source/makefile.lnx b/crawl-ref/source/makefile.lnx index df2cba085f..75abff9d5b 100644 --- a/crawl-ref/source/makefile.lnx +++ b/crawl-ref/source/makefile.lnx @@ -15,7 +15,7 @@ OBJECTS += libunix.o CXX = g++ DELETE = rm -f COPY = cp -OS_TYPE = LINUX +OS_TYPE = UNIX CFLAGS = -Wall -Wwrite-strings -fsigned-char \ -Wshadow -pedantic \ |