diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-10 04:36:42 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-10 22:18:48 -0700 |
| commit | 66c59ae9c97694a8ab33eddd266dd6f73d72fde7 (patch) | |
| tree | bd27426778e720fa895635b26b6a0909300d21af /crawl-ref/source/initfile.cc | |
| parent | 6eb4f8d4954d7ba008de2eb921d42e02993b9db5 (diff) | |
| download | crawl-ref-66c59ae9c97694a8ab33eddd266dd6f73d72fde7.tar.gz crawl-ref-66c59ae9c97694a8ab33eddd266dd6f73d72fde7.zip | |
project-wide: implement use of platform.h detection macros
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/initfile.cc')
| -rw-r--r-- | crawl-ref/source/initfile.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 42ea9f3a90..ae9f7ca281 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -655,17 +655,17 @@ void game_options::reset_options() #if defined(SAVE_DIR_PATH) save_dir = SAVE_DIR_PATH "/saves/"; morgue_dir = SAVE_DIR_PATH "/morgue/"; -#elif defined(OSX) +#elif defined(TARGET_OS_MACOSX) std::string tmp_path_base = std::string(getenv("HOME")) + "/Library/Application Support/" CRAWL; save_dir = tmp_path_base + "/saves/"; morgue_dir = tmp_path_base + "/morgue/"; -#elif !defined(DOS) +#elif !defined(TARGET_OS_DOS) save_dir = "saves/"; #else save_dir.clear(); #endif -#if !defined(SHORT_FILE_NAMES) && !defined(SAVE_DIR_PATH) && !defined(OSX) +#if !defined(SHORT_FILE_NAMES) && !defined(SAVE_DIR_PATH) && !defined(TARGET_OS_MACOSX) morgue_dir = "morgue/"; #endif @@ -813,7 +813,7 @@ void game_options::reset_options() #endif easy_exit_menu = true; -#ifdef DOS +#ifdef TARGET_OS_DOS dos_use_background_intensity = false; #else dos_use_background_intensity = true; @@ -3248,7 +3248,7 @@ std::string game_options::resolve_include( // favoured file separator. parent_file = canonicalise_file_separator(parent_file); included_file = canonicalise_file_separator(included_file); -#if defined(DOS) +#if defined(TARGET_OS_DOS) get_dos_compatible_file_name(&included_file); #endif |