Fix 32 bits compilation on mac and Quartz playback

[cherry-picked from ecd76ef]
MythTV · Jun 3, 2012 · 1dcc4c7 · 1dcc4c7
1 parent 0ec7ef2
commit 1dcc4c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/mythtv/filters/filters.pro b/mythtv/filters/filters.pro
@@ -5,10 +5,15 @@ TEMPLATE = subdirs
 
 # Directories
 SUBDIRS += invert linearblend denoise3d quickdnr kerneldeint crop force
-SUBDIRS += adjust onefield bobdeint ivtc greedyhdeint yadif fieldorder
+SUBDIRS += adjust onefield bobdeint ivtc yadif fieldorder
 
 contains(CONFIG_POSTPROC, yes): SUBDIRS += postprocess
 
+# greeydy doesn't compile on 32 bits
+contains( QMAKE_CXXFLAGS, "x86_64" ) {
+    SUBDIRS += greedyhdeint
+}
+
 # This filter is currently broken.
 # SUBDIRS += convert
 

diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
@@ -90,13 +90,9 @@ macx {
         FWKS += CoreVideo
     }
 
-    using_firewire:using_backend: FWKS += IOKit
+    FC = $$join(FWKS,",")
 
-    # The following trick shortens the command line, but depends on
-    # the shell expanding Csh-style braces. Luckily, Bash and Zsh do.
-    FC = $$join(FWKS,",","{","}")
-
-    QMAKE_CXXFLAGS += -F/System/Library/Frameworks/$${FC}.framework/Frameworks
+    QMAKE_CXXFLAGS += -F$${FC}
     LIBS           += -framework $$join(FWKS," -framework ")
 
     using_firewire:using_backend {