Permalink
Browse files

Fix compilation on OS X

As mark-kendal mentioned in #a40749d, it doesn't feel right at all ...
  • Loading branch information...
1 parent 424184f commit 74f30910fd0571a5cfd3df7f4766bbed28e71cba @jyavenard jyavenard committed Jun 23, 2011
@@ -72,3 +72,5 @@ EXTRA_LIBS += $$CONFIG_XVMC_LIBS
EXTRA_LIBS += $$CONFIG_OPENGL_VSYNC_LIBS
LIRC_LIBS = $$CONFIG_LIRC_LIBS
+
+macx:using_firewire:using_backend:EXTRA_LIBS += -F$${CONFIG_MAC_AVC} -framework AVCVideoServices
@@ -3,7 +3,9 @@ include(../settings.pro)
LIBS += -L../../external/FFmpeg/libavcodec -lmythavcodec
LIBS += -L../../external/FFmpeg/libavutil -lmythavutil
+LIBS += -L../../external/FFmpeg/libavformat -lmythavformat
# Rebuild (link) this filter if the lib changes
POST_TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil)
POST_TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
+POST_TARGETDEPS += ../../external/FFmpeg/libavformat/$$avLibName(avformat)
@@ -13,3 +13,5 @@ INCLUDEPATH += ../../libs/libmythtv ../../libs/libmythbase
INCLUDEPATH += ../../external/FFmpeg
DEPENDPATH += ../../libs/libmythtv ../../libs/libmythbase
DEPENDPATH += ../../external/FFmpeg
+
+macx:LIBS += $$EXTRA_LIBS
@@ -5,6 +5,7 @@ LIBS += -lmyth-$${LIBVERSION} -L../../libs/libmyth
LIBS += -lmythbase-$${LIBVERSION} -L../../libs/libmythbase
macx:LIBS += -lmythui-$${LIBVERSION} -L../../libs/libmythui
macx:LIBS += -lmythupnp-$${LIBVERSION} -L../../libs/libmythupnp
+macx:LIBS += -lmythservicecontracts-$${LIBVERSION} -L../../libs/libmythservicecontracts
mingw:LIBS += $$EXTRA_LIBS
# Input
@@ -88,6 +88,7 @@ LIBS += -L../libmythbase -lmythbase-$${LIBVERSION}
LIBS += -L../libmythui -lmythui-$${LIBVERSION}
LIBS += -L../libmythupnp -lmythupnp-$${LIBVERSION}
LIBS += -L../libmythfreesurround -lmythfreesurround-$${LIBVERSION}
+LIBS += -L../libmythservicecontracts -lmythservicecontracts-$${LIBVERSION}
LIBS += -L../../external/FFmpeg/libavcodec -lmythavcodec
LIBS += -L../../external/FFmpeg/libavutil -lmythavutil
LIBS += -L../../external/FFmpeg/libavformat -lmythavformat
@@ -29,12 +29,18 @@ INCLUDEPATH += ../libmythbase ../libmyth ../libmythtv ../libmythui
INCLUDEPATH += ../../external/FFmpeg ../.. ../ ./
DEPENDPATH += ../ ../libmythbase ../libmythtv ../libmyth ../libmythui
+DEPENDPATH += ../libmythupnp ../libmythservicecontracts
LIBS += -L../libmythbase -L../libmyth -L../libmythtv -L../libmythui
-LIBS += -L../../external/FFmpeg/libavutil
+LIBS += -L../libmythupnp -L../libmythservicecontracts -L../libmythfreemheg
+LIBS += -L../libmythlivemedia -L../libmythhdhomerun
+LIBS += -L../../external/FFmpeg/libavutil -L../../external/FFmpeg/libavcodec
+LIBS += -L../../external/FFmpeg/libavformat -L../../external/FFmpeg/libswscale
LIBS += -lmythbase-$$LIBVERSION -lmyth-$$LIBVERSION -lmythui-$$LIBVERSION
-LIBS += -lmythtv-$$LIBVERSION
-LIBS += -lmythavutil
+LIBS += -lmythtv-$$LIBVERSION -lmythupnp-$$LIBVERSION
+LIBS += -lmythservicecontracts-$$LIBVERSION -lmythfreemheg-$$LIBVERSION
+LIBS += -lmythlivemedia-$$LIBVERSION -lmythhdhomerun-$$LIBVERSION
+LIBS += -lmythavutil -lmythavcodec -lmythavformat -lmythswscale
LIBS += $$EXTRA_LIBS $$LATE_LIBS $$QMAKE_LIBS_DYNLOAD
inc.path = $${PREFIX}/include/mythtv/protoserver
@@ -62,7 +62,6 @@ incDatacontracts.files += datacontracts/timeZoneInfo.h
INSTALLS += inc incServices incDatacontracts
macx {
-
QMAKE_LFLAGS_SHLIB += -flat_namespace
}
@@ -50,6 +50,7 @@ LIBS += -L../libmythui -L../libmythupnp
LIBS += -L../libmythdvdnav
LIBS += -L../libmythbluray
LIBS += -L../libmythbase
+LIBS += -L../libmythservicecontracts
LIBS += -lmyth-$$LIBVERSION
LIBS += -lmythswscale
LIBS += -lmythavformat
@@ -58,6 +59,7 @@ LIBS += -lmythavutil
LIBS += -lmythui-$$LIBVERSION -lmythupnp-$$LIBVERSION
LIBS += -lmythdvdnav-$$LIBVERSION
LIBS += -lmythbluray-$$LIBVERSION -lmythbase-$$LIBVERSION
+LIBS += -lmythservicecontracts-$$LIBVERSION
using_mheg: LIBS += -L../libmythfreemheg -lmythfreemheg-$$LIBVERSION
using_live: LIBS += -L../libmythlivemedia -lmythlivemedia-$$LIBVERSION
using_hdhomerun: LIBS += -L../libmythhdhomerun -lmythhdhomerun-$$LIBVERSION
@@ -98,10 +100,6 @@ macx {
using_firewire:using_backend {
QMAKE_CXXFLAGS += -F$${CONFIG_MAC_AVC}
- LIBS += -F$${CONFIG_MAC_AVC} -framework AVCVideoServices
- # Recent versions of this framework use /usr/lib/libstdc++.6.dylib
- # which may clash with symbols in /usr/lib/gcc/darwin/3.3/libstdc++.a
- # In that case, rebuild the framework with your (old) Xcode version
}
}
@@ -84,7 +84,6 @@ using_x11 {
DEFINES += USING_X11
HEADERS += screensaver-x11.h
SOURCES += screensaver-x11.cpp
- LIBS += $$EXTRA_LIBS
}
macx {
@@ -153,7 +152,6 @@ using_opengl {
inc.files += mythpainter_ogl.h
QT += opengl
- using_x11:LIBS += $$EXTRA_LIBS
mingw:LIBS += -lopengl32
}
@@ -167,4 +165,4 @@ use_hidesyms {
include ( ../libs-targetfix.pro )
-LIBS += $$LATE_LIBS
+LIBS += $$EXTRA_LIBS $$LATE_LIBS
View
@@ -151,3 +151,5 @@ EXTRA_LIBS += $$CONFIG_FIREWIRE_LIBS
EXTRA_LIBS += $$LOCAL_LIBDIR_OGL
EXTRA_LIBS += $$LOCAL_LIBDIR_X11
EXTRA_LIBS += $$CONFIG_OPENGL_LIBS
+
+macx:using_firewire:using_backend:EXTRA_LIBS += -F$${CONFIG_MAC_AVC} -framework AVCVideoServices

3 comments on commit 74f3091

@NigelPearson
Member

doesn't feel right at all ...

Doubly so because I have been getting clean builds from osx-packager.pl for a while without this.

Were you using that, or mythbuild.sh?

@jyavenard
Member
@jyavenard
Member
Please sign in to comment.