Commit 823b1be0 authored by Felix Paul Kühne's avatar Felix Paul Kühne

VLCKit: fixed compilation with Xcode4

To support Xcode4, we require the 10.6 SDK now, which can be easily reverted when using Xcode3.2 an appropriate SDK.

Note that this project file format now requires Xcode 3.2 or later
parent be84287b
......@@ -28,7 +28,7 @@ args="--disable-macosx-defaults $args"
args="--disable-macosx $args" # Disable old gui/macosx
args="--disable-macosx-vlc-app $args" # Don't build old vlc.app
args="--with-macosx-version-min=10.5 $args"
args="--with-macosx-version-min=10.6 $args"
# optional modules
args="--enable-faad $args"
......@@ -90,6 +90,7 @@ for arch in $ARCHS; do
export CXXFLAGS="-m64 -arch x86_64"
export OBJCFLAGS="-m64 -arch x86_64"
export CPPFLAGS="-m64 -arch x86_64"
this_args="--with-contrib=${VLC_SRC_DIR}/extras/contrib/hosts/x86_64-apple-darwin10 $this_args"
$top_srcdir/configure --build=x86_64-apple-darwin10 $this_args
fi
if test $arch = "i386"; then
......@@ -97,6 +98,7 @@ for arch in $ARCHS; do
export CXXFLAGS="-m32 -arch i686"
export OBJCFLAGS="-m32 -arch i686"
export CPPFLAGS="-m32 -arch i686"
this_args="--with-contrib=${VLC_SRC_DIR}/extras/contrib/hosts/i386-apple-darwin10 $this_args"
$top_srcdir/configure --build=i686-apple-darwin10 $this_args
fi
if test $arch = "ppc"; then
......@@ -104,6 +106,7 @@ for arch in $ARCHS; do
export CXXFLAGS="-m32 -arch ppc"
export OBJCFLAGS="-m32 -arch ppc"
export CPPFLAGS="-m32 -arch ppc"
this_args="--with-contrib=${VLC_SRC_DIR}/extras/contrib/hosts/powerpc-apple-darwin9 $this_args"
$top_srcdir/configure --build=powerpc-apple-darwin9 $this_args
fi
cd ..
......
......@@ -237,22 +237,6 @@ for module in `find ${main_build_dir}/modules -path "*dylib.dSYM*" -prune -o -na
fi
done
##########################
# Install the module cache
if test "$use_archs" = "no"; then
cache=`ls ${main_build_dir}/modules/plugins-*.dat | sed -e s:${main_build_dir}/::`
vlc_install `dirname ${cache}` `basename ${cache}` ${target_plugins} "data"
else
for arch in $ARCHS; do
build="${VLC_BUILD_DIR}/${arch}"
cache=`ls ${build}/modules/plugins-*.dat | sed -e s:${build}/::`
# The cache is arch dependant. Use vlc_install_object directly.
vlc_install_object "${cache}" "${target_plugins}" "data"
done;
fi
##########################
# Build the lib folder
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>Quartz</string>
<key>CFBundleIdentifier</key>
<string>org.videolan.vlckitframework</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>VLC</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.1</string>
<key>CFBundleVersion</key>
<string>0.1</string>
</dict>
</plist>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment