Peter M. Groen / dali-demo

Commit 4ddfc310381ba392dcd0c11e41341e30a5908459

Authored by David Steele
1 parent 4ecbbb31

Updated android build to use C++17 

demo build was adding -std=g++11 to cflags in scripts calling library.
demo app also had -std=g++11 in own C++ CMakeLists.txt _and_ in gradle.

Changed everything to use std=c++17.

Change-Id: Id46801a812c043db41514be17e8bd8da2ec97845
Inline Side-by-side
Showing 6 changed files with 9 additions and 8 deletions
build/android/app/build.gradle
  View file @4ddfc31
@@ -25,7 +25,7 @@ android { @@ -25,7 +25,7 @@ android {
25 versionName "1.0" 25 versionName "1.0"
26 externalNativeBuild { 26 externalNativeBuild {
27 cmake { 27 cmake {
28 - cppFlags "-fexceptions -frtti -w -Wall -std=gnu++11" 28 + cppFlags "-fexceptions -frtti -w -Wall -std=c++17"
29 arguments '-DANDROID_STL=c++_shared' 29 arguments '-DANDROID_STL=c++_shared'
30 } 30 }
31 } 31 }
build/android/app/src/main/cpp/CMakeLists.txt
  View file @4ddfc31
1 CMAKE_MINIMUM_REQUIRED(VERSION 3.4.1) 1 CMAKE_MINIMUM_REQUIRED(VERSION 3.4.1)
2 2
  3 +SET(CMAKE_CXX_STANDARD 17)
  4 +
3 SET(DALI_ENV_DIR $ENV{DALI_ENV_DIR}) 5 SET(DALI_ENV_DIR $ENV{DALI_ENV_DIR})
4 SET(ENV{PKG_CONFIG_PATH} "${DALI_ENV_DIR}/lib/${ANDROID_ABI}/pkgconfig:$ENV{PKG_CONFIG_PATH}") 6 SET(ENV{PKG_CONFIG_PATH} "${DALI_ENV_DIR}/lib/${ANDROID_ABI}/pkgconfig:$ENV{PKG_CONFIG_PATH}")
5 FIND_PACKAGE(PkgConfig REQUIRED) 7 FIND_PACKAGE(PkgConfig REQUIRED)
@@ -12,7 +14,7 @@ ADD_LIBRARY(native_app_glue STATIC @@ -12,7 +14,7 @@ ADD_LIBRARY(native_app_glue STATIC
12 ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c) 14 ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
13 15
14 # now build app's shared lib 16 # now build app's shared lib
15 -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -frtti -w -Wall -std=gnu++11") 17 +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -frtti -w -Wall")
16 18
17 # Export ANativeActivity_onCreate(), 19 # Export ANativeActivity_onCreate(),
18 # Refer to: https://github.com/android-ndk/ndk/issues/381. 20 # Refer to: https://github.com/android-ndk/ndk/issues/381.
build/android/dali/build_adaptor.sh
  View file @4ddfc31
@@ -19,7 +19,7 @@ else @@ -19,7 +19,7 @@ else
19 export PKG_CONFIG_PATH=${PREFIX}/lib/${ANDROID_ABI}/pkgconfig 19 export PKG_CONFIG_PATH=${PREFIX}/lib/${ANDROID_ABI}/pkgconfig
20 export DALI_DATA_RO_DIR=assets 20 export DALI_DATA_RO_DIR=assets
21 export DALI_DATA_RW_DIR=/data/data/com.sec.dali_demo/files 21 export DALI_DATA_RW_DIR=/data/data/com.sec.dali_demo/files
22 - ${ANDROID_SDK}/cmake/3.10.2.4988404/bin/cmake ${DALI_DIR}/dali-adaptor/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=gnu++11' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DENABLE_PROFILE=ANDROID 22 + ${ANDROID_SDK}/cmake/3.10.2.4988404/bin/cmake ${DALI_DIR}/dali-adaptor/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DENABLE_PROFILE=ANDROID
23 fi 23 fi
24 24
25 make -j8 || exit 1 25 make -j8 || exit 1
build/android/dali/build_core.sh
  View file @4ddfc31
@@ -18,7 +18,7 @@ else @@ -18,7 +18,7 @@ else
18 export PREFIX=${DALI_ENV_DIR} 18 export PREFIX=${DALI_ENV_DIR}
19 export PKG_CONFIG_LIBDIR=${ANDROID_NDK}/prebuilt/linux-x86_64/lib/pkgconfig 19 export PKG_CONFIG_LIBDIR=${ANDROID_NDK}/prebuilt/linux-x86_64/lib/pkgconfig
20 export PKG_CONFIG_PATH=${PREFIX}/lib/${ANDROID_ABI}/pkgconfig 20 export PKG_CONFIG_PATH=${PREFIX}/lib/${ANDROID_ABI}/pkgconfig
21 - ${ANDROID_SDK}/cmake/3.10.2.4988404/bin/cmake ${DALI_DIR}/dali-core/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=gnu++11' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} 21 + ${ANDROID_SDK}/cmake/3.10.2.4988404/bin/cmake ${DALI_DIR}/dali-core/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE}
22 fi 22 fi
23 23
24 make -j8 || exit 1 24 make -j8 || exit 1
build/android/dali/build_demo.sh
  View file @4ddfc31
@@ -22,11 +22,10 @@ else @@ -22,11 +22,10 @@ else
22 export DALI_APP_DIR=${PREFIX}/lib/${ANDROID_ABI} 22 export DALI_APP_DIR=${PREFIX}/lib/${ANDROID_ABI}
23 export DALI_DEMO_RES_DIR=assets 23 export DALI_DEMO_RES_DIR=assets
24 24
25 - ${ANDROID_SDK}/cmake/3.10.2.4988404/bin/cmake ${DALI_DIR}/dali-demo/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=gnu++11' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DINTERNATIONALIZATION=OFF -DSHARED=ON -DDALI_APP_RES_DIR=${DALI_APP_RES_DIR} -DDALI_APP_DIR=${DALI_APP_DIR} -DDALI_DEMO_RES_DIR=${DALI_DEMO_RES_DIR} 25 + ${ANDROID_SDK}/cmake/3.10.2.4988404/bin/cmake ${DALI_DIR}/dali-demo/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DINTERNATIONALIZATION=OFF -DSHARED=ON -DDALI_APP_RES_DIR=${DALI_APP_RES_DIR} -DDALI_APP_DIR=${DALI_APP_DIR} -DDALI_DEMO_RES_DIR=${DALI_DEMO_RES_DIR}
26 fi 26 fi
27 27
28 make -j8 || exit 1 28 make -j8 || exit 1
29 make install || exit 1 29 make install || exit 1
30 30
31 cd - 31 cd -
32 -  
build/android/dali/build_toolkit.sh
  View file @4ddfc31
@@ -12,7 +12,7 @@ else @@ -12,7 +12,7 @@ else
12 fi 12 fi
13 13
14 if [ -z "$ENABLE_TRACE" ]; then 14 if [ -z "$ENABLE_TRACE" ]; then
15 - export ENABLE_TRACE=OFF 15 + export ENABLE_TRACE=OFF
16 fi 16 fi
17 17
18 export PREFIX=${DALI_ENV_DIR} 18 export PREFIX=${DALI_ENV_DIR}
@@ -23,7 +23,7 @@ else @@ -23,7 +23,7 @@ else
23 export DALI_DATA_RO_INSTALL_DIR=${PREFIX}/files 23 export DALI_DATA_RO_INSTALL_DIR=${PREFIX}/files
24 export DALI_DATA_RW_INSTALL_DIR=${PREFIX}/files 24 export DALI_DATA_RW_INSTALL_DIR=${PREFIX}/files
25 25
26 - ${ANDROID_SDK}/cmake/3.10.2.4988404/bin/cmake ${DALI_DIR}/dali-toolkit/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=gnu++11' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DWITH_STYLE='2048x1080' 26 + ${ANDROID_SDK}/cmake/3.10.2.4988404/bin/cmake ${DALI_DIR}/dali-toolkit/build/tizen -DCMAKE_C_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -DCMAKE_CXX_COMPILER=${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI} -DANDROID_NDK=${ANDROID_NDK} -DANDROID_STL=c++_shared -DCMAKE_CXX_FLAGS='-fexceptions -frtti -w -Wall -std=c++17' -DINCLUDE_DIR=${PREFIX}/include -DLIB_DIR=${PREFIX}/lib/${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DENABLE_TRACE=${ENABLE_TRACE} -DWITH_STYLE='720x1280'
27 fi 27 fi
28 28
29 make -j8 || exit 1 29 make -j8 || exit 1