[mythtv] Mac OS X patch 10

[Nigel Pearson]

>> Only define MMX if configure thinks we are building on one.
>> Only compile for a PPro if we are building on an X86.
>> On Mac OS X, compile -O2 (not -O3), and set a define for Darwin.
>
> I'm a bit hesitant about this, because the last time I tried to use
> contains() in settings.pro, it broke for some people (probably due to 
> qmake
> bugs).  Is there any other way to do it?

	Sure:

diff -u -r1.57 settings.pro
--- settings.pro        4 Jun 2004 05:37:55 -0000       1.57
+++ settings.pro        5 Jun 2004 12:04:02 -0000
@@ -13,9 +13,14 @@
  DEFINES += PREFIX=\"$${PREFIX}\"

  release {
          DEFINES += MMX
          QMAKE_CXXFLAGS_RELEASE = -O3 -march=pentiumpro 
-fomit-frame-pointer
+    macx {
+        DEFINES -= MMX
+        # Don't use -O3, it causes some Qt moc methods to go missing
+        QMAKE_CXXFLAGS_RELEASE = -O2
+    }
          QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE}
  }

  EXTRA_LIBS = -lfreetype -lmp3lame
@@ -85,6 +93,14 @@
  #CONFIG += win32
  #DEFINES += _WIN32

+# Mac OS X support
+macx {
+    # For source that uses Qt, Q_OS_MACX is defined.
+    # For source that uses config.h, CONFIG_DARWIN is defined.
+    # For other source (e.g. libmythtv), we define this
+    DEFINES += CONFIG_DARWIN
+}
+
  # DirectX support
  #CONFIG += using_directx
  #DEFINES += USING_DIRECTX

--
Nigel Pearson, nigel at ind.tansu.com.au | "People say I'm strange, does it
Telstra BI&D, Sydney, Australia       |        make me a stranger?
Office: 8255 4222    Fax:  8255 3153  |  My best friend was born
Mobile: 0408 664435  Home: 9792 6998  |         in a manger"    -DC Talk