From c3d8674a26b55ca656f1d7922b799d5907c4beda Mon Sep 17 00:00:00 2001
From: Oystein Eftevaag
Date: Tue, 14 Mar 2006 12:18:04 +0000
Subject: 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
---
 graphics/scaler.cpp      | 2 ++
 graphics/scaler/hq2x.cpp | 2 ++
 graphics/scaler/hq3x.cpp | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'graphics')

diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp
index 5364e39a2f..025fe0bd62 100644
--- a/graphics/scaler.cpp
+++ b/graphics/scaler.cpp
@@ -37,9 +37,11 @@ extern "C" {
 //       condition here
 
 #ifndef _WIN32
+#ifndef MACOSX
 #define RGBtoYUV _RGBtoYUV
 #define LUT16to32 _LUT16to32
 #endif
+#endif
 
 #endif
 
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);
 
-- 
cgit v1.2.3