Skip to content
Browse files

Fix 32 bits compilation on mac and Quartz playback

  • Loading branch information...
1 parent 7a2fc43 commit ecd76efe28b413a91bd909a1f8b4d9abf85157c9 @jyavenard jyavenard committed Jun 4, 2012
Showing with 8 additions and 7 deletions.
  1. +6 −1 mythtv/filters/filters.pro
  2. +2 −6 mythtv/libs/libmythtv/libmythtv.pro
View
7 mythtv/filters/filters.pro
@@ -5,9 +5,14 @@ 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
View
8 mythtv/libs/libmythtv/libmythtv.pro
@@ -52,13 +52,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 {

0 comments on commit ecd76ef

Please sign in to comment.
Something went wrong with that request. Please try again.