diff options
| author | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
| commit | 224c71e483e09931ba386555ff3b436b9defe63d (patch) | |
| tree | 8e6178331a7bbd3ee1be318d3fc7a7c7f478468f /backends/base-backend.cpp | |
| parent | d4c92983920cfe3b25a22d91e12c750e591b917e (diff) | |
| parent | 547fd1bdcabcba0e741eb31100ba99ff73399d24 (diff) | |
| download | scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.gz scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.bz2 scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'backends/base-backend.cpp')
| -rw-r--r-- | backends/base-backend.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp index 68ec5efe62..40e702495a 100644 --- a/backends/base-backend.cpp +++ b/backends/base-backend.cpp @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + * $URL$ + * $Id$ + * */ #include "backends/base-backend.h" @@ -57,15 +60,11 @@ void BaseBackend::fillScreen(uint32 col) { */ -#if defined(UNIX) -#if defined(SAMSUNGTV) -#define DEFAULT_CONFIG_FILE "/dtv/usb/sda1/.scummvmrc" -#else +#if defined(POSIX) #define DEFAULT_CONFIG_FILE ".scummvmrc" #endif -#endif -#if !defined(UNIX) +#if !defined(POSIX) #define DEFAULT_CONFIG_FILE "scummvm.ini" #endif |