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 | |
| 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')
| -rw-r--r-- | graphics/scaler/hq2x.cpp | 4 | ||||
| -rw-r--r-- | graphics/scaler/hq3x.cpp | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/graphics/scaler/hq2x.cpp b/graphics/scaler/hq2x.cpp index f8863c0781..567a2fcf53 100644 --- a/graphics/scaler/hq2x.cpp +++ b/graphics/scaler/hq2x.cpp @@ -28,11 +28,9 @@ extern "C" { -#ifndef _WIN32 -#ifndef MACOSX +#if !defined(_WIN32) && !defined(MACOSX) #define hq2x_16 _hq2x_16 #endif -#endif void hq2x_16(const byte *, byte *, uint32, uint32, uint32, uint32); diff --git a/graphics/scaler/hq3x.cpp b/graphics/scaler/hq3x.cpp index 7960dd3b74..64bd17834d 100644 --- a/graphics/scaler/hq3x.cpp +++ b/graphics/scaler/hq3x.cpp @@ -28,11 +28,10 @@ extern "C" { -#ifndef _WIN32 -#ifndef MACOSX +#if !defined(_WIN32) && !defined(MACOSX) #define hq3x_16 _hq3x_16 #endif -#endif + void hq3x_16(const byte *, byte *, uint32, uint32, uint32, uint32); |