Commit 8f6c017f authored by Ludovic Fauvet's avatar Ludovic Fauvet

Fix build for Tizen SDK 2.4.0-rev1

Note: you'll have to change the line in $TIZEN_SDK/sdk.version from
    TIZEN_SDK_VERSION=2.4.0 Rev1
to
    TIZEN_SDK_VERSION=2.4.0-Rev1
parent 26ea6e36
......@@ -5,8 +5,13 @@ export BUILDCOMMONDONE=1
# DEFINES #
#############
GCCVER=4.8
GCCVERFULL=4.8.3
if [ ${TIZEN_SDK_VERSION} = "2.3.1" ];then
GCCVER=4.8
GCCVERFULL=4.8.3
else
GCCVER=4.9
GCCVERFULL=4.9.2
fi
#############
# FUNCTIONS #
......@@ -159,12 +164,12 @@ TIZEN_INCLUDES="${TIZEN_CORE}/usr/include"
TIZEN_LIBS="${TIZEN_CORE}/usr/lib"
EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${SYSROOT}/include/c++/${GCCVERFULL}"
EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${SYSROOT}/include/c++/${GCCVERFULL}/${TARGET_TUPLE}"
EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${TIZEN_INCLUDES} -I${TIZEN_INCLUDES}/media"
EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${TIZEN_INCLUDES} -I${TIZEN_INCLUDES}/media -I${TIZEN_INCLUDES}/efl-1 -I${TIZEN_INCLUDES}/eo-1"
EXTRA_CFLAGS="${EXTRA_CFLAGS} -DTIZEN_SDK_MAJOR=${TIZEN_SDK_MAJOR} -DTIZEN_SDK_MINOR=${TIZEN_SDK_MINOR}"
EXTRA_CXXFLAGS="${EXTRA_CFLAGS} -D__STDC_FORMAT_MACROS=1 -D__STDC_CONSTANT_MACROS=1 -D__STDC_LIMIT_MACROS=1"
CPPFLAGS="-I${SYSROOT}/include/c++/${GCCVERFULL} -I${SYSROOT}/include/c++/${GCCVERFULL}/${TARGET_TUPLE} -I${TIZEN_INCLUDES} -I${TIZEN_INCLUDES}/media"
CPPFLAGS="-I${SYSROOT}/include/c++/${GCCVERFULL} -I${SYSROOT}/include/c++/${GCCVERFULL}/${TARGET_TUPLE} -I${TIZEN_INCLUDES} -I${TIZEN_INCLUDES}/media -I${TIZEN_INCLUDES}/efl-1"
#################
# Setup LDFLAGS #
......
......@@ -52,6 +52,12 @@ if [ "$RELEASE" = 1 ]; then
CMAKE_OPTS=""
fi
if [ ${TIZEN_SDK_VERSION} = "2.3.1" ];then
PKG_CONFIG_PATH="${TIZEN_SDK}/tools/efl-tools/lib/pkgconfig/"
else
PKG_CONFIG_PATH="${TIZEN_SDK}/platforms/tizen-${TIZEN_SDK_SHORT_VERSION}/common/efl-tool/efl-tools/lib/pkgconfig/"
fi
# PKG_CONFIG_PATH is required to have a proper evas detection.
# however, since the .pc the SDK provides are broken, we override with
# our own values
......@@ -65,7 +71,7 @@ CXX="${CROSS_COMPILE}g++ -fPIC --sysroot=${SYSROOT} -D__cpp_static_assert=200410
NM="${CROSS_COMPILE}nm" \
STRIP="${CROSS_COMPILE}strip" \
RANLIB="${CROSS_COMPILE}ranlib" \
PKG_CONFIG_PATH="${TIZEN_SDK}/tools/efl-tools/lib/pkgconfig/" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" \
AR="${CROSS_COMPILE}ar" \
cmake \
${CMAKE_OPTS} \
......
......@@ -310,8 +310,9 @@ RANLIB="${CROSS_COMPILE}ranlib" \
AR="${CROSS_COMPILE}ar" \
PKG_CONFIG_LIBDIR=../contrib/$TARGET_TUPLE/lib/pkgconfig \
EVAS_CFLAGS="-I${TIZEN_INCLUDES} -I${TIZEN_INCLUDES}/evas-1 \
-I${TIZEN_INCLUDES}/ecore-1 \
-I${TIZEN_INCLUDES}/eina-1 -I${TIZEN_INCLUDES}/eina-1/eina" \
-I${TIZEN_INCLUDES}/ecore-1 -I${TIZEN_INCLUDES}/efl-1 \
-I${TIZEN_INCLUDES}/eina-1 -I${TIZEN_INCLUDES}/eina-1/eina \
-I${TIZEN_INCLUDES}/eo-1" \
EVAS_LIBS="-L${TIZEN_LIBS}" \
sh ../configure --host=$TARGET_TUPLE --build=x86_64-unknown-linux \
${EXTRA_PARAMS} ${VLC_CONFIGURE_ARGS} ${OPTS}
......
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