diff options
| author | Oystein Eftevaag | 2006-03-14 12:18:04 +0000 |
|---|---|---|
| committer | Oystein Eftevaag | 2006-03-14 12:18:04 +0000 |
| commit | c3d8674a26b55ca656f1d7922b799d5907c4beda (patch) | |
| tree | 17392c6d617254419d58d72e02f29e2251763b43 /graphics/scaler | |
| parent | c822f496762f083e6d31b3f902af31019887ea26 (diff) | |
| download | scummvm-rg350-c3d8674a26b55ca656f1d7922b799d5907c4beda.tar.gz scummvm-rg350-c3d8674a26b55ca656f1d7922b799d5907c4beda.tar.bz2 scummvm-rg350-c3d8674a26b55ca656f1d7922b799d5907c4beda.zip | |
Adds support for building on Intel Macs, using a modified
version of patch 1448395 by Aubin and some of my
own changes.
Notably:
* Two elements of a struct in backends/midi/quicktime.cpp
needed to be forced to BE.
* NASM set to build Mach-O binaries
* configure now checks for Altivec support on Darwin hosts,
instead of assuming it. Altivec support can also be disabled (not 100% sure if t
his is actually needed, but might be handy for crosscompiling).
* The aliasing of the symbols contained in the .asm files
done on Windows were also needed on MacOS.
Note that while the asm code is properly compiled and linked
in, HQ2/3x support will still not work properly on Intel macs
if NASM is enabled.
svn-id: r21280
Diffstat (limited to 'graphics/scaler')
| -rw-r--r-- | graphics/scaler/hq2x.cpp | 2 | ||||
| -rw-r--r-- | graphics/scaler/hq3x.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/graphics/scaler/hq2x.cpp b/graphics/scaler/hq2x.cpp index ba89b4f9cf..f8863c0781 100644 --- a/graphics/scaler/hq2x.cpp +++ b/graphics/scaler/hq2x.cpp @@ -29,8 +29,10 @@ extern "C" { #ifndef _WIN32 +#ifndef 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 0c33c23ab2..7960dd3b74 100644 --- a/graphics/scaler/hq3x.cpp +++ b/graphics/scaler/hq3x.cpp @@ -29,8 +29,10 @@ extern "C" { #ifndef _WIN32 +#ifndef MACOSX #define hq3x_16 _hq3x_16 #endif +#endif void hq3x_16(const byte *, byte *, uint32, uint32, uint32, uint32); |