Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Use new-style dependencies on OSX.

  • Loading branch information...
commit 9f5b63bab99c463e5d1d0e02dff91753f26d39e7 1 parent 6da00a7
Tobias Hieta tru authored
5 .gitignore
@@ -1234,8 +1234,13 @@ xbmc/visualizations/EGLHelpers/Makefile
1234 1234
1235 1235 /pvr-addons
1236 1236
  1237 +# plex
1237 1238 CmakeLists*.user*
  1239 +plex/Dependencies/xbmc-depends
1238 1240 plex/Dependencies/laika-depends
  1241 +plex/Dependencies/ffmpeg-depends
  1242 +plex/Dependencies/macosx*
  1243 +plex/Dependencies/iphoneos*
1239 1244 plex/Dependencies/*darwin-i686
1240 1245 plex/build
1241 1246 plex/build_xc
1  CMakeLists.txt
@@ -63,6 +63,7 @@ include_directories(
63 63 ${dependdir}/include/freetype2
64 64 ${dependdir}/include/python2.6
65 65 ${dependdir}/include/python2.7
  66 + ${ffmpegdir}/include
66 67 ${root}/xbmc
67 68 )
68 69
3  lib/cximage-6.0/CMakeLists.txt
@@ -28,6 +28,7 @@ add_subdirectory(CxImage)
28 28 add_subdirectory(jbig)
29 29 add_subdirectory(raw)
30 30 add_subdirectory(jasper)
  31 +add_subdirectory(zlib)
31 32
32 33 set(OBJECTS
33 34 cximage
@@ -40,7 +41,7 @@ set(SRC CxImage/DllInterface.cpp)
40 41 if(NOT TARGET_WIN32)
41 42 list(APPEND OBJECTS wrapper)
42 43 add_library(ImageLib-${ARCH} MODULE ${SRC})
43   - target_link_libraries(ImageLib-${ARCH} ${PLEX_LINK_WHOLEARCHIVE} ${OBJECTS} ${PLEX_LINK_NOWHOLEARCHIVE} ${CONFIG_LIBRARY_Z} ${CONFIG_LIBRARY_PNG} ${CONFIG_LIBRARY_JPEG} ${CONFIG_LIBRARY_TIFF})
  44 + target_link_libraries(ImageLib-${ARCH} cx_zlib ${PLEX_LINK_WHOLEARCHIVE} ${OBJECTS} ${PLEX_LINK_NOWHOLEARCHIVE} ${CONFIG_LIBRARY_PNG} ${CONFIG_LIBRARY_JPEG} ${CONFIG_LIBRARY_TIFF})
44 45 else(NOT TARGET_WIN32)
45 46 add_subdirectory(zlib)
46 47 add_subdirectory(jpeg)
18 plex/CMakeModules/PlatformConfigOSX.cmake
... ... @@ -1,6 +1,7 @@
1 1 # vim: setlocal syntax=cmake:
2 2
3 3 set(dependdir ${root}/plex/Dependencies/laika-depends)
  4 +set(ffmpegdir ${root}/plex/Dependencies/ffmpeg-depends)
4 5
5 6 # MUST BE ADDED FIRST :)
6 7 # This will download our dependency tree
@@ -41,6 +42,8 @@ set(osx_frameworks
41 42 QuartzCore
42 43 SystemConfiguration
43 44 IOSurface
  45 + bz2
  46 + z
44 47 )
45 48
46 49 set(external_libs
@@ -59,13 +62,15 @@ set(external_libs
59 62 crypto
60 63 SDL
61 64 SDL_mixer
62   - SDL_image
63 65 tinyxml
64 66 boost_thread
65 67 boost_system
66   - z
67 68 GLEW
68   -
  69 + vorbis
  70 + vorbisenc
  71 +)
  72 +
  73 +set(ffmpeg_libs
69 74 # ffmpeg libraries
70 75 avcodec
71 76 avutil
@@ -108,6 +113,11 @@ foreach(lib ${external_libs})
108 113 plex_find_library(${lib} 0 1 ${dependdir}/lib 1)
109 114 endforeach()
110 115
  116 +# find ffmpeg libs
  117 +foreach(lib ${ffmpeg_libs})
  118 + plex_find_library(${lib} 0 1 ${ffmpegdir}/lib 1)
  119 +endforeach()
  120 +
111 121 foreach(lib ${non_link_libs})
112 122 plex_find_library(${lib} 0 1 ${dependdir}/lib 0)
113 123 endforeach()
@@ -129,7 +139,7 @@ set(ARCH "x86-osx")
129 139 set(LIBPATH "${EXECUTABLE_NAME}.app/Contents/Frameworks")
130 140 set(BINPATH "${EXECUTABLE_NAME}.app/Contents/MacOSX")
131 141 set(RESOURCEPATH "${EXECUTABLE_NAME}.app/Contents/Resources/XBMC")
132   -set(FFMPEG_INCLUDE_DIRS ${dependdir}/include)
  142 +set(FFMPEG_INCLUDE_DIRS ${ffmpegdir}/include)
133 143
134 144 set(PLEX_LINK_WRAPPED "-arch i386 -undefined dynamic_lookup -read_only_relocs suppress -Wl,-alias_list ${root}/xbmc/cores/DllLoader/exports/wrapper_mach_alias")
135 145
4 plex/scripts/fetch-depends.sh
@@ -57,12 +57,12 @@ if [ ! -d plex/Dependencies/$outputdir-xbmc-$DEPEND_HASH -o ! -d plex/Dependenci
57 57 echo "-- Unpacking $outputdir-xbmc-$DEPEND_HASH.tar.xz"
58 58 gtar -xaf /tmp/$outputdir-xbmc-$DEPEND_HASH.tar.xz -C plex/Dependencies
59 59 mv plex/Dependencies/$outputdir plex/Dependencies/$outputdir-xbmc-$DEPEND_HASH
60   - plex/scripts/fix_install_names.py $ROOT/plex/Dependencies/$outputdir-xbmc-$DEPEND_HASH
  60 + plex/scripts/fix_install_names.py $ROOT/plex/Dependencies/$outputdir-xbmc-$DEPEND_HASH/lib
61 61
62 62 echo "-- Unpacking $outputdir-ffmpeg-$FFMPEG_HASH.tar.xz"
63 63 gtar -xaf /tmp/$outputdir-ffmpeg-$FFMPEG_HASH.tar.xz -C plex/Dependencies
64 64 mv plex/Dependencies/ffmpeg-$outputdir plex/Dependencies/$outputdir-ffmpeg-$FFMPEG_HASH
65   - plex/scripts/fix_install_names.py $ROOT/plex/Dependencies/$outputdir-ffmpeg-$FFMPEG_HASH
  65 + plex/scripts/fix_install_names.py $ROOT/plex/Dependencies/$outputdir-ffmpeg-$FFMPEG_HASH/lib
66 66 fi
67 67
68 68 if [ -e plex/Dependencies/laika-depends ]; then

0 comments on commit 9f5b63b

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