diff options
| author | Oystein Eftevaag | 2006-03-15 07:43:44 +0000 |
|---|---|---|
| committer | Oystein Eftevaag | 2006-03-15 07:43:44 +0000 |
| commit | 58eed3830bfbea9a05b903c94a4331597fc90dc6 (patch) | |
| tree | b7e672c89b537b7f1637081323d822a8f741d47e /graphics/scaler.cpp | |
| parent | 34b89a3258cd73087ad5b0a41ba82e7171094fd1 (diff) | |
| download | scummvm-rg350-58eed3830bfbea9a05b903c94a4331597fc90dc6.tar.gz scummvm-rg350-58eed3830bfbea9a05b903c94a4331597fc90dc6.tar.bz2 scummvm-rg350-58eed3830bfbea9a05b903c94a4331597fc90dc6.zip | |
* 'make bundle' now copies the default theme files into the bundle.
* Common::File will now look inside the application bundle on MacOS X for a file if
it can't find it anywhere else (so it'll find default-theme.ini and .zip)
* Cleaned up some #ifs.
svn-id: r21308
Diffstat (limited to 'graphics/scaler.cpp')
| -rw-r--r-- | graphics/scaler.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp index 025fe0bd62..d6a8abc63f 100644 --- a/graphics/scaler.cpp +++ b/graphics/scaler.cpp @@ -36,12 +36,10 @@ extern "C" { // NOTE: if your compiler uses different mangled names, add another // condition here -#ifndef _WIN32 -#ifndef MACOSX +#if !defined(_WIN32) && !defined(MACOSX) #define RGBtoYUV _RGBtoYUV #define LUT16to32 _LUT16to32 #endif -#endif #endif |