Remove obsolete cmake toolchain files
authorPyry Haulos <phaulos@google.com>
Mon, 26 Sep 2016 22:12:11 +0000 (15:12 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 26 Sep 2016 22:12:11 +0000 (15:12 -0700)
These have not been used for a while and are likely broken at this
point.

Change-Id: I3d470e76b8dc89836eb6baa1377bfb7cd91b65ef

18 files changed:
framework/delibs/cmake/LCovUtils.cmake [deleted file]
framework/delibs/cmake/toolchain-android-clang-r8d.cmake [deleted file]
framework/delibs/cmake/toolchain-android-clang-r8e.cmake [deleted file]
framework/delibs/cmake/toolchain-android-clang-r9.cmake [deleted file]
framework/delibs/cmake/toolchain-android-clang-r9d.cmake [deleted file]
framework/delibs/cmake/toolchain-android-r4.cmake [deleted file]
framework/delibs/cmake/toolchain-android-r5.cmake [deleted file]
framework/delibs/cmake/toolchain-android-r6.cmake [deleted file]
framework/delibs/cmake/toolchain-android-r7.cmake [deleted file]
framework/delibs/cmake/toolchain-android-r8.cmake [deleted file]
framework/delibs/cmake/toolchain-android-r8b.cmake [deleted file]
framework/delibs/cmake/toolchain-android-r8c.cmake [deleted file]
framework/delibs/cmake/toolchain-android-r8d.cmake [deleted file]
framework/delibs/cmake/toolchain-android-r8e.cmake [deleted file]
framework/delibs/cmake/toolchain-android-r9.cmake [deleted file]
framework/delibs/cmake/toolchain-arm-cs.cmake [deleted file]
framework/delibs/cmake/toolchain-mingw-clang.cmake [deleted file]
framework/delibs/cmake/toolchain-symbian-gcce.cmake [deleted file]

diff --git a/framework/delibs/cmake/LCovUtils.cmake b/framework/delibs/cmake/LCovUtils.cmake
deleted file mode 100644 (file)
index 30d3b65..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-macro(MAKE_LCOV_TARGET name)
- add_custom_target(${name}-lcov lcov -d ${PROJECT_BINARY_DIR}/${name}/CMakeFiles/${name}.dir -o ${name}.info -c > /dev/null WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/${name} COMMENT "Running lcov for ${name}" VERBATIM)
-endmacro()
-
-macro(MAKE_LCOV_REPORT_TARGET target exe-targets projects outdir title)
-  foreach (PRJ ${projects})
-       MAKE_LCOV_TARGET(${PRJ})
-       set(INFO_FILES ${PRJ}/${PRJ}.info ${INFO_FILES})
-       add_dependencies(${PRJ}-lcov ${exe-targets})
-       set(LCOV_PRJS ${LCOV_PRJS} ${PRJ}-lcov)
-  endforeach()
-  add_custom_target(${target} ALL genhtml -o ${outdir} -t "${title}" ${INFO_FILES} | grep "\\.\\.:" WORKING_DIRECTORY "${PROJECT_BINARY_DIR}" COMMENT "Generate LCOV HTML report" VERBATIM)
-  add_dependencies(${target} ${LCOV_PRJS})
-
-endmacro()
diff --git a/framework/delibs/cmake/toolchain-android-clang-r8d.cmake b/framework/delibs/cmake/toolchain-android-clang-r8d.cmake
deleted file mode 100644 (file)
index 30141af..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# dE defines
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_CLANG")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# NDK installation path
-set(ANDROID_NDK_PATH   "/opt/android-ndk-r8d"  CACHE STRING "Android NDK installation path")
-set(ANDROID_NDK_HOST_OS        "linux-x86"                             CACHE STRING "Android ndk host OS")
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# Select cpu
-if (ANDROID_ABI STREQUAL "x86")
-       set(DE_CPU                                      "DE_CPU_X86")
-       set(CMAKE_SYSTEM_PROCESSOR      i686-android-linux)
-else ()
-       set(DE_CPU                                      "DE_CPU_ARM")
-       set(CMAKE_SYSTEM_PROCESSOR      arm-linux-androideabi)
-endif ()
-
-# Path to LLVM
-set(LLVM_PATH  "${ANDROID_NDK_PATH}/toolchains/llvm-3.1/prebuilt/${ANDROID_NDK_HOST_OS}/")
-
-# Cross-compiler, search paths and sysroot
-if (ANDROID_ABI STREQUAL "x86")
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/x86-4.6/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/i686-linux-android-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-x86")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}i686-linux-android"
-               "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.6"
-               ${ANDROID_SYSROOT}
-               )
-
-else ()
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.6/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}arm-linux-androideabi"
-               ${ANDROID_SYSROOT}
-               )
-
-endif ()
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-# libgcc
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.6/armv7-a/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.6/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.6/libgcc.a")
-else ()
-       message(FATAL_ERROR "Don't know where libgcc.a is")
-endif ()
-
-# C++ library
-set(LIBCPP "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}/libgnustl_static.a")
-
-include(CMakeForceCompiler)
-
-# Compiler binaries
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${LLVM_PATH}bin/clang"                  Clang)
-       cmake_force_cxx_compiler("${LLVM_PATH}bin/clang++"              Clang)
-       set(CMAKE_AR "${CROSS_COMPILE}ar" CACHE FILEPATH "Archiver")
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${LLVM_PATH}bin/clang.exe"              Clang)
-       cmake_force_cxx_compiler("${LLVM_PATH}bin/clang++.exe"  Clang)
-       set(CMAKE_AR "${CROSS_COMPILE}ar.exe" CACHE FILEPATH "Archiver")
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY
-  "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-  "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC} ${CRTEND_SO}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(COMMON_C_FLAGS             "-gcc-toolchain ${ANDROID_CC_PATH} --sysroot=${ANDROID_SYSROOT} -fpic -no-canonical-prefixes -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-set(COMMON_LINKER_FLAGS        "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined")
-set(ARM_C_FLAGS                        "-mfloat-abi=softfp -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ ")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -target armv7-none-linux-androideabi -march=armv7-a -mfpu=vfpv3-d16")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} -Wl,--fix-cortex-a8 -march=armv7-a")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -target armv5te-none-linux-androideabi -march=armv5te")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS} -march=armv5te")
-
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} -target i686-none-linux-android -march=i686 -msse3 -mstackrealign -mfpmath=sse")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS}")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Hacky workaround for flags...
-set(CMAKE_C_FLAGS      "${TARGET_C_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS    "${TARGET_C_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS "${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-clang-r8e.cmake b/framework/delibs/cmake/toolchain-android-clang-r8e.cmake
deleted file mode 100644 (file)
index e580775..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# NDK installation path
-if (NOT DEFINED ANDROID_NDK_PATH)
-       message(FATAL_ERROR "Please provide ANDROID_NDK_PATH")
-endif ()
-
-# Host os (for toolchain binaries)
-if (NOT DEFINED ANDROID_NDK_HOST_OS)
-       message(STATUS "Warning: ANDROID_NDK_HOST_OS is not set")
-       if (WIN32)
-               set(ANDROID_NDK_HOST_OS "windows")
-       elseif (UNIX)
-               set(ANDROID_NDK_HOST_OS "linux-86")
-       endif ()
-endif ()
-
-# Compile target
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# dE defines
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_CLANG")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# Select cpu
-if (ANDROID_ABI STREQUAL "x86")
-       set(DE_CPU                                      "DE_CPU_X86")
-       set(CMAKE_SYSTEM_PROCESSOR      i686-android-linux)
-else ()
-       set(DE_CPU                                      "DE_CPU_ARM")
-       set(CMAKE_SYSTEM_PROCESSOR      arm-linux-androideabi)
-endif ()
-
-# Path to LLVM
-set(LLVM_PATH  "${ANDROID_NDK_PATH}/toolchains/llvm-3.2/prebuilt/${ANDROID_NDK_HOST_OS}/")
-
-# Cross-compiler, search paths and sysroot
-if (ANDROID_ABI STREQUAL "x86")
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/x86-4.6/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/i686-linux-android-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-x86")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}i686-linux-android"
-               "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.6"
-               ${ANDROID_SYSROOT}
-               )
-
-else ()
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.6/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}arm-linux-androideabi"
-               ${ANDROID_SYSROOT}
-               )
-
-endif ()
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-# libgcc
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.6/armv7-a/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.6/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.6/libgcc.a")
-else ()
-       message(FATAL_ERROR "Don't know where libgcc.a is")
-endif ()
-
-# C++ library
-set(LIBCPP "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}/libgnustl_static.a")
-
-include(CMakeForceCompiler)
-
-# Compiler binaries
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${LLVM_PATH}bin/clang"                  Clang)
-       cmake_force_cxx_compiler("${LLVM_PATH}bin/clang++"              Clang)
-       set(CMAKE_AR "${CROSS_COMPILE}ar" CACHE FILEPATH "Archiver")
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${LLVM_PATH}bin/clang.exe"              Clang)
-       cmake_force_cxx_compiler("${LLVM_PATH}bin/clang++.exe"  Clang)
-       set(CMAKE_AR "${CROSS_COMPILE}ar.exe" CACHE FILEPATH "Archiver")
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS       "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS     "")
-
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY      "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY    "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC} ${CRTEND_SO}")
-set(CMAKE_CXX_LINK_EXECUTABLE          "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(COMMON_C_FLAGS             "-gcc-toolchain ${ANDROID_CC_PATH} --sysroot=${ANDROID_SYSROOT} -fpic -no-canonical-prefixes -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-set(COMMON_LINKER_FLAGS        "")
-set(ARM_C_FLAGS                        "-mfloat-abi=softfp -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ ")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(TARGET_C_FLAGS              "${ARM_C_FLAGS} -target armv7-none-linux-androideabi -march=armv7-a -mfpu=vfpv3-d16")
-       set(TARGET_LINKER_FLAGS "-Wl,--fix-cortex-a8 -march=armv7-a")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(TARGET_C_FLAGS              "${ARM_C_FLAGS} -target armv5te-none-linux-androideabi -march=armv5te")
-       set(TARGET_LINKER_FLAGS "${ARM_LINKER_FLAGS} -march=armv5te")
-
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(TARGET_C_FLAGS              "-target i686-none-linux-android -march=i686 -msse3 -mstackrealign")
-       set(TARGET_LINKER_FLAGS "")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Without CACHE STRING FORCE cmake ignores these.
-set(CMAKE_C_FLAGS                              "${COMMON_C_FLAGS} ${TARGET_C_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS                            "${COMMON_C_FLAGS} ${TARGET_C_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS  "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined ${COMMON_LINKER_FLAGS} ${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_EXE_LINKER_FLAGS             "${COMMON_LINKER_FLAGS} ${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-clang-r9.cmake b/framework/delibs/cmake/toolchain-android-clang-r9.cmake
deleted file mode 100644 (file)
index 1b78911..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# NDK installation path
-if (NOT DEFINED ANDROID_NDK_PATH)
-       message(FATAL_ERROR "Please provide ANDROID_NDK_PATH")
-endif ()
-
-# Host os (for toolchain binaries)
-if (NOT DEFINED ANDROID_NDK_HOST_OS)
-       message(STATUS "Warning: ANDROID_NDK_HOST_OS is not set")
-       if (WIN32)
-               set(ANDROID_NDK_HOST_OS "windows")
-       elseif (UNIX)
-               set(ANDROID_NDK_HOST_OS "linux-86")
-       endif ()
-endif ()
-
-# Compile target
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# dE defines
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_CLANG")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# Select cpu
-if (ANDROID_ABI STREQUAL "x86")
-       set(DE_CPU                                      "DE_CPU_X86")
-       set(CMAKE_SYSTEM_PROCESSOR      i686-android-linux)
-else ()
-       set(DE_CPU                                      "DE_CPU_ARM")
-       set(CMAKE_SYSTEM_PROCESSOR      arm-linux-androideabi)
-endif ()
-
-# Path to LLVM
-set(LLVM_PATH  "${ANDROID_NDK_PATH}/toolchains/llvm-3.3/prebuilt/${ANDROID_NDK_HOST_OS}/")
-
-# Cross-compiler, search paths and sysroot
-if (ANDROID_ABI STREQUAL "x86")
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/x86-4.8/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/i686-linux-android-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-x86")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}i686-linux-android"
-               "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.8"
-               ${ANDROID_SYSROOT}
-               )
-
-else ()
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.8/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}arm-linux-androideabi"
-               ${ANDROID_SYSROOT}
-               )
-
-endif ()
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-# libgcc
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.8/armv7-a/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.8/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.8/libgcc.a")
-else ()
-       message(FATAL_ERROR "Don't know where libgcc.a is")
-endif ()
-
-# C++ library
-set(LIBCPP "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/libs/${ANDROID_ABI}/libgnustl_static.a")
-
-include(CMakeForceCompiler)
-
-# Compiler binaries
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${LLVM_PATH}bin/clang"                  Clang)
-       cmake_force_cxx_compiler("${LLVM_PATH}bin/clang++"              Clang)
-       set(CMAKE_AR "${CROSS_COMPILE}ar" CACHE FILEPATH "Archiver")
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${LLVM_PATH}bin/clang.exe"              Clang)
-       cmake_force_cxx_compiler("${LLVM_PATH}bin/clang++.exe"  Clang)
-       set(CMAKE_AR "${CROSS_COMPILE}ar.exe" CACHE FILEPATH "Archiver")
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS       "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS     "")
-
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY      "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY    "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC} ${CRTEND_SO}")
-set(CMAKE_CXX_LINK_EXECUTABLE          "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(COMMON_C_FLAGS             "-gcc-toolchain ${ANDROID_CC_PATH} --sysroot=${ANDROID_SYSROOT} -fpic -no-canonical-prefixes -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-set(COMMON_LINKER_FLAGS        "")
-set(ARM_C_FLAGS                        "-mfloat-abi=softfp -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ ")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(TARGET_C_FLAGS              "${ARM_C_FLAGS} -target armv7-none-linux-androideabi -march=armv7-a -mfpu=vfpv3-d16")
-       set(TARGET_LINKER_FLAGS "-Wl,--fix-cortex-a8 -march=armv7-a")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(TARGET_C_FLAGS              "${ARM_C_FLAGS} -target armv5te-none-linux-androideabi -march=armv5te")
-       set(TARGET_LINKER_FLAGS "${ARM_LINKER_FLAGS} -march=armv5te")
-
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(TARGET_C_FLAGS              "-target i686-none-linux-android -march=i686 -msse3 -mstackrealign")
-       set(TARGET_LINKER_FLAGS "")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Without CACHE STRING FORCE cmake ignores these.
-set(CMAKE_C_FLAGS                              "${COMMON_C_FLAGS} ${TARGET_C_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS                            "${COMMON_C_FLAGS} ${TARGET_C_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS  "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined ${COMMON_LINKER_FLAGS} ${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_EXE_LINKER_FLAGS             "${COMMON_LINKER_FLAGS} ${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-clang-r9d.cmake b/framework/delibs/cmake/toolchain-android-clang-r9d.cmake
deleted file mode 100644 (file)
index 4183a8d..0000000
+++ /dev/null
@@ -1,147 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# NDK installation path
-if (NOT DEFINED ANDROID_NDK_PATH)
-       message(FATAL_ERROR "Please provide ANDROID_NDK_PATH")
-endif ()
-
-# Host os (for toolchain binaries)
-if (NOT DEFINED ANDROID_NDK_HOST_OS)
-       message(STATUS "Warning: ANDROID_NDK_HOST_OS is not set")
-       if (WIN32)
-               set(ANDROID_NDK_HOST_OS "windows")
-       elseif (UNIX)
-               set(ANDROID_NDK_HOST_OS "linux-86")
-       endif ()
-endif ()
-
-# Compile target
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# dE defines
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_CLANG")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# Select cpu
-if (ANDROID_ABI STREQUAL "x86")
-       set(DE_CPU                                      "DE_CPU_X86")
-       set(CMAKE_SYSTEM_PROCESSOR      i686-android-linux)
-else ()
-       set(DE_CPU                                      "DE_CPU_ARM")
-       set(CMAKE_SYSTEM_PROCESSOR      arm-linux-androideabi)
-endif ()
-
-# Path to LLVM
-set(LLVM_PATH  "${ANDROID_NDK_PATH}/toolchains/llvm-3.4/prebuilt/${ANDROID_NDK_HOST_OS}/")
-
-# Cross-compiler, search paths and sysroot
-if (ANDROID_ABI STREQUAL "x86")
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/x86-4.8/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/i686-linux-android-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-x86")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}i686-linux-android"
-               "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.8"
-               ${ANDROID_SYSROOT}
-               )
-
-else ()
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.8/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}arm-linux-androideabi"
-               ${ANDROID_SYSROOT}
-               )
-
-endif ()
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-# libgcc
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.8/armv7-a/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.8/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.8/libgcc.a")
-else ()
-       message(FATAL_ERROR "Don't know where libgcc.a is")
-endif ()
-
-# C++ library
-set(LIBCPP "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/libs/${ANDROID_ABI}/libgnustl_static.a")
-
-include(CMakeForceCompiler)
-
-# Compiler binaries
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "linux-x86_64" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${LLVM_PATH}bin/clang"                  Clang)
-       cmake_force_cxx_compiler("${LLVM_PATH}bin/clang++"              Clang)
-       set(CMAKE_AR "${CROSS_COMPILE}ar" CACHE FILEPATH "Archiver")
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${LLVM_PATH}bin/clang.exe"              Clang)
-       cmake_force_cxx_compiler("${LLVM_PATH}bin/clang++.exe"  Clang)
-       set(CMAKE_AR "${CROSS_COMPILE}ar.exe" CACHE FILEPATH "Archiver")
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS       "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS     "")
-
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY      "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY    "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC} ${CRTEND_SO}")
-set(CMAKE_CXX_LINK_EXECUTABLE          "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(COMMON_C_FLAGS             "-gcc-toolchain ${ANDROID_CC_PATH} --sysroot=${ANDROID_SYSROOT} -fpic -no-canonical-prefixes -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-set(COMMON_LINKER_FLAGS        "")
-set(ARM_C_FLAGS                        "-mfloat-abi=softfp -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ ")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(TARGET_C_FLAGS              "${ARM_C_FLAGS} -target armv7-none-linux-androideabi -march=armv7-a -mfpu=vfpv3-d16")
-       set(TARGET_LINKER_FLAGS "-Wl,--fix-cortex-a8 -march=armv7-a")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(TARGET_C_FLAGS              "${ARM_C_FLAGS} -target armv5te-none-linux-androideabi -march=armv5te")
-       set(TARGET_LINKER_FLAGS "${ARM_LINKER_FLAGS} -march=armv5te")
-
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(TARGET_C_FLAGS              "-target i686-none-linux-android -march=i686 -msse3 -mstackrealign")
-       set(TARGET_LINKER_FLAGS "")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Without CACHE STRING FORCE cmake ignores these.
-set(CMAKE_C_FLAGS                              "${COMMON_C_FLAGS} ${TARGET_C_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS                            "${COMMON_C_FLAGS} ${TARGET_C_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS  "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined ${COMMON_LINKER_FLAGS} ${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_EXE_LINKER_FLAGS             "${COMMON_LINKER_FLAGS} ${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-r4.cmake b/framework/delibs/cmake/toolchain-android-r4.cmake
deleted file mode 100644 (file)
index c2cfb57..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME          Linux)
-set(CMAKE_SYSTEM_PROCESSOR     arm-eabi)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# dE defines
-set(DE_CPU             "DE_CPU_ARM")
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_GCC")
-
-# NDK installation path
-set(ANDROID_NDK_PATH   "/opt/android-ndk-r4/"  CACHE STRING "Android NDK installation path")
-set(ANDROID_NDK_HOST_OS        "linux-x86"                             CACHE STRING "Android ndk host os")
-set(ANDROID_NDK_TARGET "android-5"                             CACHE STRING "Android target")
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-
-# \todo [pyry] Detect host type
-set(ANDROID_CC_PATH    "${ANDROID_NDK_PATH}/build/prebuilt/${ANDROID_NDK_HOST_OS}/arm-eabi-4.4.0/")
-set(CROSS_COMPILE      "${ANDROID_CC_PATH}bin/arm-eabi-")
-
-include(CMakeForceCompiler)
-
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc"            GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++"          GNU)
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc.exe"        GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++.exe"      GNU)
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY
-  "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-  "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-
-
-# Search libs and include files (but not programs) from toolchain dir.
-set(CMAKE_FIND_ROOT_PATH
-       "${ANDROID_NDK_PATH}/build/platforms/${ANDROID_NDK_TARGET}/arch-arm"
-       "${ANDROID_CC_PATH}arm-eabi"
-       )
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-include_directories(
-       "${ANDROID_NDK_PATH}/build/platforms/${ANDROID_NDK_TARGET}/arch-arm/usr/include"
-       )
-
-link_directories(
-       "${ANDROID_NDK_PATH}/build/platforms/${ANDROID_NDK_TARGET}/arch-arm/usr/lib"
-       )
-
-set(NDK_FLAGS "-fpic -mthumb-interwork -ffunction-sections -funwind-tables -fstack-protector -fno-short-enums -mfloat-abi=softfp -Os -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(NDK_FLAGS "${NDK_FLAGS} -march=armv7-a -mfpu=vfp")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(NDK_FLAGS "${NDK_FLAGS} -march=armv5te")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Hacky workaround for flags...
-set(CMAKE_C_FLAGS      "${NDK_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS    "${NDK_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-r5.cmake b/framework/delibs/cmake/toolchain-android-r5.cmake
deleted file mode 100644 (file)
index 2ea5498..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME          Linux)
-set(CMAKE_SYSTEM_PROCESSOR     arm-linux-androideabi)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# dE defines
-set(DE_CPU             "DE_CPU_ARM")
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_GCC")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# NDK installation path
-set(ANDROID_NDK_PATH   "/opt/android-ndk-r5b"  CACHE STRING "Android NDK installation path")
-set(ANDROID_NDK_HOST_OS        "linux-x86"                             CACHE STRING "Android ndk host os")
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# \todo [pyry] Detect host type
-set(ANDROID_CC_PATH    "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/${ANDROID_NDK_HOST_OS}/")
-set(CROSS_COMPILE      "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-set(ANDROID_SYSROOT    "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-include(CMakeForceCompiler)
-
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc"            GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++"          GNU)
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc.exe"        GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++.exe"      GNU)
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY
-  "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-  "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${CRTEND_SO}")
-
-# Search libs and include files (but not programs) from toolchain dir.
-set(CMAKE_FIND_ROOT_PATH
-       "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}"
-       "${ANDROID_CC_PATH}arm-linux-androideabi"
-       ${ANDROID_SYSROOT}
-       )
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(NDK_FLAGS "--sysroot=${ANDROID_SYSROOT} -fpic -mfloat-abi=softfp -Os -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(NDK_FLAGS "${NDK_FLAGS} -march=armv7-a -mfpu=vfp")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(NDK_FLAGS "${NDK_FLAGS} -march=armv5te")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Hacky workaround for flags...
-set(CMAKE_C_FLAGS      "${NDK_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS    "${NDK_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined -Wl,--fix-cortex-a" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-r6.cmake b/framework/delibs/cmake/toolchain-android-r6.cmake
deleted file mode 100644 (file)
index 204d324..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# dE defines
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_GCC")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# NDK installation path
-set(ANDROID_NDK_PATH   "/opt/android-ndk-r6"   CACHE STRING "Android NDK installation path")
-set(ANDROID_NDK_HOST_OS        "linux-x86"                             CACHE STRING "Android ndk host os")
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# Select cpu
-if (ANDROID_ABI STREQUAL "x86")
-       set(DE_CPU                                      "DE_CPU_X86")
-       set(CMAKE_SYSTEM_PROCESSOR      i686-android-linux)
-else ()
-       set(DE_CPU                                      "DE_CPU_ARM")
-       set(CMAKE_SYSTEM_PROCESSOR      arm-linux-androideabi)
-endif ()
-
-# Cross-compiler, search paths and sysroot
-if (ANDROID_ABI STREQUAL "x86")
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/x86-4.4.3/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/i686-android-linux-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-x86")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}i686-android-linux"
-               "${ANDROID_CC_PATH}lib/gcc/i686-android-linux/4.4.3"
-               ${ANDROID_SYSROOT}
-               )
-
-else ()
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}arm-linux-androideabi"
-               ${ANDROID_SYSROOT}
-               )
-
-endif ()
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-include(CMakeForceCompiler)
-
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc"            GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++"          GNU)
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc.exe"        GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++.exe"      GNU)
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY
-  "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-  "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${CRTEND_SO}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(COMMON_C_FLAGS             "--sysroot=${ANDROID_SYSROOT} -fpic -Os -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-set(COMMON_LINKER_FLAGS        "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined")
-set(ARM_C_FLAGS                        "-mfloat-abi=softfp -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ ")
-set(ARM_LINKER_FLAGS   "-Wl,--fix-cortex-a")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -march=armv7-a -mfpu=vfp")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS}")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -march=armv5te")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS}")
-
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} -march=i686 -msse3 -mstackrealign -mfpmath=sse")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS}")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Hacky workaround for flags...
-set(CMAKE_C_FLAGS      "${TARGET_C_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS    "${TARGET_C_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS "${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-r7.cmake b/framework/delibs/cmake/toolchain-android-r7.cmake
deleted file mode 100644 (file)
index 087e026..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# dE defines
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_GCC")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# NDK installation path
-set(ANDROID_NDK_PATH   "/opt/android-ndk-r7"   CACHE STRING "Android NDK installation path")
-set(ANDROID_NDK_HOST_OS        "linux-x86"                             CACHE STRING "Android ndk host os")
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# Select cpu
-if (ANDROID_ABI STREQUAL "x86")
-       set(DE_CPU                                      "DE_CPU_X86")
-       set(CMAKE_SYSTEM_PROCESSOR      i686-android-linux)
-else ()
-       set(DE_CPU                                      "DE_CPU_ARM")
-       set(CMAKE_SYSTEM_PROCESSOR      arm-linux-androideabi)
-endif ()
-
-# Cross-compiler, search paths and sysroot
-if (ANDROID_ABI STREQUAL "x86")
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/x86-4.4.3/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/i686-android-linux-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-x86")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}i686-android-linux"
-               "${ANDROID_CC_PATH}lib/gcc/i686-android-linux/4.4.3"
-               ${ANDROID_SYSROOT}
-               )
-
-else ()
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}arm-linux-androideabi"
-               ${ANDROID_SYSROOT}
-               )
-
-endif ()
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-# libgcc
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.4.3/armv7-a/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.4.3/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/i686-android-linux/4.4.3/libgcc.a")
-else ()
-       message(FATAL_ERROR "Don't know where libgcc.a is")
-endif ()
-
-include(CMakeForceCompiler)
-
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc"            GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++"          GNU)
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc.exe"        GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++.exe"      GNU)
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY
-  "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-  "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${LIBGCC} ${CRTEND_SO}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(COMMON_C_FLAGS             "--sysroot=${ANDROID_SYSROOT} -fpic -Os -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-set(COMMON_LINKER_FLAGS        "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined")
-set(ARM_C_FLAGS                        "-mfloat-abi=softfp -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ ")
-set(ARM_LINKER_FLAGS   "-Wl,--fix-cortex-a8")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -march=armv7-a -mfpu=vfpv3-d16")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS} -march=armv7-a")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -march=armv5te")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS} -march=armv5te")
-
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} -march=i686 -msse3 -mstackrealign -mfpmath=sse")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS}")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Hacky workaround for flags...
-set(CMAKE_C_FLAGS      "${TARGET_C_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS    "${TARGET_C_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS "${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-r8.cmake b/framework/delibs/cmake/toolchain-android-r8.cmake
deleted file mode 100644 (file)
index 6518b6b..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# dE defines
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_GCC")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# NDK installation path
-set(ANDROID_NDK_PATH   "/opt/android-ndk-r8"   CACHE STRING "Android NDK installation path")
-set(ANDROID_NDK_HOST_OS        "linux-x86"                             CACHE STRING "Android ndk host os")
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# Select cpu
-if (ANDROID_ABI STREQUAL "x86")
-       set(DE_CPU                                      "DE_CPU_X86")
-       set(CMAKE_SYSTEM_PROCESSOR      i686-android-linux)
-else ()
-       set(DE_CPU                                      "DE_CPU_ARM")
-       set(CMAKE_SYSTEM_PROCESSOR      arm-linux-androideabi)
-endif ()
-
-# Cross-compiler, search paths and sysroot
-if (ANDROID_ABI STREQUAL "x86")
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/x86-4.4.3/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/i686-android-linux-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-x86")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}i686-android-linux"
-               "${ANDROID_CC_PATH}lib/gcc/i686-android-linux/4.4.3"
-               ${ANDROID_SYSROOT}
-               )
-
-else ()
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}arm-linux-androideabi"
-               ${ANDROID_SYSROOT}
-               )
-
-endif ()
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-# libgcc
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.4.3/armv7-a/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.4.3/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/i686-android-linux/4.4.3/libgcc.a")
-else ()
-       message(FATAL_ERROR "Don't know where libgcc.a is")
-endif ()
-
-include(CMakeForceCompiler)
-
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc"            GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++"          GNU)
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc.exe"        GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++.exe"      GNU)
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY
-  "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-  "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${LIBGCC} ${CRTEND_SO}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(COMMON_C_FLAGS             "--sysroot=${ANDROID_SYSROOT} -fpic -Os -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-set(COMMON_LINKER_FLAGS        "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined")
-set(ARM_C_FLAGS                        "-mfloat-abi=softfp -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ ")
-set(ARM_LINKER_FLAGS   "-Wl,--fix-cortex-a8")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -march=armv7-a -mfpu=vfpv3-d16")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS} -march=armv7-a")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -march=armv5te")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS} -march=armv5te")
-
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} -march=i686 -msse3 -mstackrealign -mfpmath=sse")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS}")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Hacky workaround for flags...
-set(CMAKE_C_FLAGS      "${TARGET_C_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS    "${TARGET_C_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS "${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-r8b.cmake b/framework/delibs/cmake/toolchain-android-r8b.cmake
deleted file mode 100644 (file)
index 6c20a52..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# dE defines
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_GCC")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# NDK installation path
-set(ANDROID_NDK_PATH   "/opt/android-ndk-r8b"  CACHE STRING "Android NDK installation path")
-set(ANDROID_NDK_HOST_OS        "linux-x86"                             CACHE STRING "Android ndk host os")
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# Select cpu
-if (ANDROID_ABI STREQUAL "x86")
-       set(DE_CPU                                      "DE_CPU_X86")
-       set(CMAKE_SYSTEM_PROCESSOR      i686-android-linux)
-else ()
-       set(DE_CPU                                      "DE_CPU_ARM")
-       set(CMAKE_SYSTEM_PROCESSOR      arm-linux-androideabi)
-endif ()
-
-# Cross-compiler, search paths and sysroot
-if (ANDROID_ABI STREQUAL "x86")
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/x86-4.6/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/i686-linux-android-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-x86")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}i686-linux-android"
-               "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.6"
-               ${ANDROID_SYSROOT}
-               )
-
-else ()
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.6/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}arm-linux-androideabi"
-               ${ANDROID_SYSROOT}
-               )
-
-endif ()
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-# libgcc
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.6.x-google/armv7-a/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.6.x-google/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.6.x-google/libgcc.a")
-else ()
-       message(FATAL_ERROR "Don't know where libgcc.a is")
-endif ()
-
-# C++ library
-set(LIBCPP "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}/libgnustl_static.a")
-
-include(CMakeForceCompiler)
-
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc"            GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++"          GNU)
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc.exe"        GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++.exe"      GNU)
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY
-  "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-  "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC} ${CRTEND_SO}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(COMMON_C_FLAGS             "--sysroot=${ANDROID_SYSROOT} -fpic -Os -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-set(COMMON_LINKER_FLAGS        "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined")
-set(ARM_C_FLAGS                        "-mfloat-abi=softfp -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ ")
-set(ARM_LINKER_FLAGS   "-Wl,--fix-cortex-a8")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -march=armv7-a -mfpu=vfpv3-d16")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS} -march=armv7-a")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -march=armv5te")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS} -march=armv5te")
-
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} -march=i686 -msse3 -mstackrealign -mfpmath=sse")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS}")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Hacky workaround for flags...
-set(CMAKE_C_FLAGS      "${TARGET_C_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS    "${TARGET_C_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS "${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-r8c.cmake b/framework/delibs/cmake/toolchain-android-r8c.cmake
deleted file mode 100644 (file)
index 2d74bef..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# dE defines
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_GCC")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# NDK installation path
-set(ANDROID_NDK_PATH   "/opt/android-ndk-r8b"  CACHE STRING "Android NDK installation path")
-set(ANDROID_NDK_HOST_OS        "linux-x86"                             CACHE STRING "Android ndk host os")
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# Select cpu
-if (ANDROID_ABI STREQUAL "x86")
-       set(DE_CPU                                      "DE_CPU_X86")
-       set(CMAKE_SYSTEM_PROCESSOR      i686-android-linux)
-else ()
-       set(DE_CPU                                      "DE_CPU_ARM")
-       set(CMAKE_SYSTEM_PROCESSOR      arm-linux-androideabi)
-endif ()
-
-# Cross-compiler, search paths and sysroot
-if (ANDROID_ABI STREQUAL "x86")
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/x86-4.6/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/i686-linux-android-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-x86")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}i686-linux-android"
-               "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.6"
-               ${ANDROID_SYSROOT}
-               )
-
-else ()
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.6/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}arm-linux-androideabi"
-               ${ANDROID_SYSROOT}
-               )
-
-endif ()
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-# libgcc
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.6/armv7-a/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.6/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.6/libgcc.a")
-else ()
-       message(FATAL_ERROR "Don't know where libgcc.a is")
-endif ()
-
-# C++ library
-set(LIBCPP "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}/libgnustl_static.a")
-
-include(CMakeForceCompiler)
-
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc"            GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++"          GNU)
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc.exe"        GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++.exe"      GNU)
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY
-  "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-  "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC} ${CRTEND_SO}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(COMMON_C_FLAGS             "--sysroot=${ANDROID_SYSROOT} -fpic -Os -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-set(COMMON_LINKER_FLAGS        "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined")
-set(ARM_C_FLAGS                        "-mfloat-abi=softfp -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ ")
-set(ARM_LINKER_FLAGS   "-Wl,--fix-cortex-a8")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -march=armv7-a -mfpu=vfpv3-d16")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS} -march=armv7-a")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -march=armv5te")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS} -march=armv5te")
-
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} -march=i686 -msse3 -mstackrealign -mfpmath=sse")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS}")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Hacky workaround for flags...
-set(CMAKE_C_FLAGS      "${TARGET_C_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS    "${TARGET_C_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.6/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS "${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-r8d.cmake b/framework/delibs/cmake/toolchain-android-r8d.cmake
deleted file mode 100644 (file)
index 14bee8a..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# dE defines
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_GCC")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# NDK installation path
-set(ANDROID_NDK_PATH   "/opt/android-ndk-r8d"  CACHE STRING "Android NDK installation path")
-set(ANDROID_NDK_HOST_OS        "linux-x86"                             CACHE STRING "Android ndk host os")
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# Select cpu
-if (ANDROID_ABI STREQUAL "x86")
-       set(DE_CPU                                      "DE_CPU_X86")
-       set(CMAKE_SYSTEM_PROCESSOR      i686-android-linux)
-else ()
-       set(DE_CPU                                      "DE_CPU_ARM")
-       set(CMAKE_SYSTEM_PROCESSOR      arm-linux-androideabi)
-endif ()
-
-# Cross-compiler, search paths and sysroot
-if (ANDROID_ABI STREQUAL "x86")
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/x86-4.7/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/i686-linux-android-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-x86")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.7/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}i686-linux-android"
-               "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.7"
-               ${ANDROID_SYSROOT}
-               )
-
-else ()
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.7/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.7/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}arm-linux-androideabi"
-               ${ANDROID_SYSROOT}
-               )
-
-endif ()
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-# libgcc
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.7/armv7-a/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.7/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.7/libgcc.a")
-else ()
-       message(FATAL_ERROR "Don't know where libgcc.a is")
-endif ()
-
-# C++ library
-set(LIBCPP "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.7/libs/${ANDROID_ABI}/libgnustl_static.a")
-
-include(CMakeForceCompiler)
-
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc"            GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++"          GNU)
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc.exe"        GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++.exe"      GNU)
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY
-  "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-  "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC} ${CRTEND_SO}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(COMMON_C_FLAGS             "--sysroot=${ANDROID_SYSROOT} -fpic -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-set(COMMON_LINKER_FLAGS        "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined")
-set(ARM_C_FLAGS                        "-mfloat-abi=softfp -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ ")
-set(ARM_LINKER_FLAGS   "-Wl,--fix-cortex-a8")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -march=armv7-a -mfpu=vfpv3-d16")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS} -march=armv7-a")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} ${ARM_C_FLAGS} -march=armv5te")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS} ${ARM_LINKER_FLAGS} -march=armv5te")
-
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(TARGET_C_FLAGS              "${COMMON_C_FLAGS} -march=i686 -msse3 -mstackrealign -mfpmath=sse")
-       set(TARGET_LINKER_FLAGS "${COMMON_LINKER_FLAGS}")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Hacky workaround for flags...
-set(CMAKE_C_FLAGS      "${TARGET_C_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS    "${TARGET_C_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.7/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.7/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS "${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-r8e.cmake b/framework/delibs/cmake/toolchain-android-r8e.cmake
deleted file mode 100644 (file)
index aa77755..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# NDK installation path
-if (NOT DEFINED ANDROID_NDK_PATH)
-       message(FATAL_ERROR "Please provide ANDROID_NDK_PATH")
-endif ()
-
-# Host os (for toolchain binaries)
-if (NOT DEFINED ANDROID_NDK_HOST_OS)
-       message(STATUS "Warning: ANDROID_NDK_HOST_OS is not set")
-       if (WIN32)
-               set(ANDROID_NDK_HOST_OS "windows")
-       elseif (UNIX)
-               set(ANDROID_NDK_HOST_OS "linux-86")
-       endif ()
-endif ()
-
-# Compile target
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# dE defines
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_GCC")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# Select cpu
-if (ANDROID_ABI STREQUAL "x86")
-       set(DE_CPU                                      "DE_CPU_X86")
-       set(CMAKE_SYSTEM_PROCESSOR      i686-android-linux)
-else ()
-       set(DE_CPU                                      "DE_CPU_ARM")
-       set(CMAKE_SYSTEM_PROCESSOR      arm-linux-androideabi)
-endif ()
-
-# Cross-compiler, search paths and sysroot
-if (ANDROID_ABI STREQUAL "x86")
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/x86-4.7/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/i686-linux-android-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-x86")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.7/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}i686-linux-android"
-               "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.7"
-               ${ANDROID_SYSROOT}
-               )
-
-else ()
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.7/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.7/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}arm-linux-androideabi"
-               ${ANDROID_SYSROOT}
-               )
-
-endif ()
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-# libgcc
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.7/armv7-a/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.7/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.7/libgcc.a")
-else ()
-       message(FATAL_ERROR "Don't know where libgcc.a is")
-endif ()
-
-# C++ library
-set(LIBCPP "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.7/libs/${ANDROID_ABI}/libgnustl_static.a")
-
-include(CMakeForceCompiler)
-
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc"            GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++"          GNU)
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc.exe"        GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++.exe"      GNU)
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS       "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS     "")
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY      "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY    "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC} ${CRTEND_SO}")
-set(CMAKE_CXX_LINK_EXECUTABLE          "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(COMMON_C_FLAGS             "--sysroot=${ANDROID_SYSROOT} -fpic -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-set(COMMON_LINKER_FLAGS        "")
-set(ARM_C_FLAGS                        "-mfloat-abi=softfp -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ ")
-set(ARM_LINKER_FLAGS   "-Wl,--fix-cortex-a8")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(TARGET_C_FLAGS              "-march=armv7-a -mfpu=vfpv3-d16")
-       set(TARGET_LINKER_FLAGS "${ARM_LINKER_FLAGS} -march=armv7-a")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(TARGET_C_FLAGS              "${ARM_C_FLAGS} -march=armv5te")
-       set(TARGET_LINKER_FLAGS "${ARM_LINKER_FLAGS} -march=armv5te")
-
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(TARGET_C_FLAGS              "-march=i686 -msse3 -mstackrealign -mfpmath=sse")
-       set(TARGET_LINKER_FLAGS "")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Without CACHE STRING FORCE cmake ignores these.
-set(CMAKE_C_FLAGS                              "${COMMON_C_FLAGS} ${TARGET_C_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS                            "${COMMON_C_FLAGS} ${TARGET_C_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.7/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.7/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS  "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined ${COMMON_LINKER_FLAGS} ${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_EXE_LINKER_FLAGS             "${COMMON_LINKER_FLAGS} ${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-android-r9.cmake b/framework/delibs/cmake/toolchain-android-r9.cmake
deleted file mode 100644 (file)
index 422bb08..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-
-set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-set(CMAKE_CROSSCOMPILING 1)
-
-# NDK installation path
-if (NOT DEFINED ANDROID_NDK_PATH)
-       message(FATAL_ERROR "Please provide ANDROID_NDK_PATH")
-endif ()
-
-# Host os (for toolchain binaries)
-if (NOT DEFINED ANDROID_NDK_HOST_OS)
-       message(STATUS "Warning: ANDROID_NDK_HOST_OS is not set")
-       if (WIN32)
-               set(ANDROID_NDK_HOST_OS "windows")
-       elseif (UNIX)
-               set(ANDROID_NDK_HOST_OS "linux-86")
-       endif ()
-endif ()
-
-# Compile target
-set(ANDROID_ABI                        "armeabi-v7a"                   CACHE STRING "Android ABI")
-set(ANDROID_NDK_TARGET "android-${DE_ANDROID_API}")
-
-# dE defines
-set(DE_OS              "DE_OS_ANDROID")
-set(DE_COMPILER        "DE_COMPILER_GCC")
-if (NOT DEFINED DE_ANDROID_API)
-       set(DE_ANDROID_API 5)
-endif ()
-
-# Select cpu
-if (ANDROID_ABI STREQUAL "x86")
-       set(DE_CPU                                      "DE_CPU_X86")
-       set(CMAKE_SYSTEM_PROCESSOR      i686-android-linux)
-else ()
-       set(DE_CPU                                      "DE_CPU_ARM")
-       set(CMAKE_SYSTEM_PROCESSOR      arm-linux-androideabi)
-endif ()
-
-# Cross-compiler, search paths and sysroot
-if (ANDROID_ABI STREQUAL "x86")
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/x86-4.8/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/i686-linux-android-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-x86")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}i686-linux-android"
-               "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.8"
-               ${ANDROID_SYSROOT}
-               )
-
-else ()
-       set(ANDROID_CC_PATH     "${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.8/prebuilt/${ANDROID_NDK_HOST_OS}/")
-       set(CROSS_COMPILE       "${ANDROID_CC_PATH}bin/arm-linux-androideabi-")
-       set(ANDROID_SYSROOT     "${ANDROID_NDK_PATH}/platforms/${ANDROID_NDK_TARGET}/arch-arm")
-
-       set(CMAKE_FIND_ROOT_PATH
-               "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/libs/${ANDROID_ABI}"
-               "${ANDROID_CC_PATH}arm-linux-androideabi"
-               ${ANDROID_SYSROOT}
-               )
-
-endif ()
-
-# crtbegin_so.o & crtend_so.o \todo [pyry] Is there some special CMake variable for these?
-if (DE_ANDROID_API GREATER 8)
-       set(CRTBEGIN_SO "${ANDROID_SYSROOT}/usr/lib/crtbegin_so.o")
-       set(CRTEND_SO   "${ANDROID_SYSROOT}/usr/lib/crtend_so.o")
-endif ()
-
-# libgcc
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.8/armv7-a/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/arm-linux-androideabi/4.8/libgcc.a")
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(LIBGCC "${ANDROID_CC_PATH}lib/gcc/i686-linux-android/4.8/libgcc.a")
-else ()
-       message(FATAL_ERROR "Don't know where libgcc.a is")
-endif ()
-
-# C++ library
-set(LIBCPP "${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/libs/${ANDROID_ABI}/libgnustl_static.a")
-
-include(CMakeForceCompiler)
-
-if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR
-       ANDROID_NDK_HOST_OS STREQUAL "linux-x86_64" OR
-       ANDROID_NDK_HOST_OS STREQUAL "darwin-x86")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc"            GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++"          GNU)
-elseif (ANDROID_NDK_HOST_OS STREQUAL "windows")
-       cmake_force_c_compiler("${CROSS_COMPILE}gcc.exe"        GNU)
-       cmake_force_cxx_compiler("${CROSS_COMPILE}g++.exe"      GNU)
-else ()
-       message(FATAL_ERROR "Unknown ANDROID_NDK_HOST_OS")
-endif ()
-
-set(CMAKE_SHARED_LIBRARY_C_FLAGS       "")
-set(CMAKE_SHARED_LIBRARY_CXX_FLAGS     "")
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY      "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-set(CMAKE_CXX_CREATE_SHARED_LIBRARY    "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> ${CRTBEGIN_SO} <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC} ${CRTEND_SO}")
-set(CMAKE_CXX_LINK_EXECUTABLE          "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> ${LIBCPP} ${LIBGCC}")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(COMMON_C_FLAGS             "--sysroot=${ANDROID_SYSROOT} -fpic -DANDROID -D__ANDROID__ -D__STDC_INT64__")
-set(COMMON_LINKER_FLAGS        "")
-set(ARM_C_FLAGS                        "-mfloat-abi=softfp -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ ")
-set(ARM_LINKER_FLAGS   "-Wl,--fix-cortex-a8")
-
-if (ANDROID_ABI STREQUAL "armeabi-v7a")
-       # For armeabi-v7a
-       set(TARGET_C_FLAGS              "-march=armv7-a -mfpu=vfpv3-d16")
-       set(TARGET_LINKER_FLAGS "${ARM_LINKER_FLAGS} -march=armv7-a")
-
-elseif (ANDROID_ABI STREQUAL "armeabi")
-       # For armeabi (ARMv5TE)
-       set(TARGET_C_FLAGS              "${ARM_C_FLAGS} -march=armv5te")
-       set(TARGET_LINKER_FLAGS "${ARM_LINKER_FLAGS} -march=armv5te")
-
-elseif (ANDROID_ABI STREQUAL "x86")
-       set(TARGET_C_FLAGS              "-march=i686 -msse3 -mstackrealign -mfpmath=sse")
-       set(TARGET_LINKER_FLAGS "")
-
-else ()
-       message(FATAL_ERROR "Unknown Android ABI \"${ANDROID_ABI}\"")
-endif ()
-
-# \note Without CACHE STRING FORCE cmake ignores these.
-set(CMAKE_C_FLAGS                              "${COMMON_C_FLAGS} ${TARGET_C_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS                            "${COMMON_C_FLAGS} ${TARGET_C_FLAGS} -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/include -I${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/4.8/libs/${ANDROID_ABI}/include" CACHE STRING "" FORCE)
-set(CMAKE_SHARED_LINKER_FLAGS  "-nostdlib -Wl,-shared,-Bsymbolic -Wl,--no-undefined ${COMMON_LINKER_FLAGS} ${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
-set(CMAKE_EXE_LINKER_FLAGS             "${COMMON_LINKER_FLAGS} ${TARGET_LINKER_FLAGS}" CACHE STRING "" FORCE)
diff --git a/framework/delibs/cmake/toolchain-arm-cs.cmake b/framework/delibs/cmake/toolchain-arm-cs.cmake
deleted file mode 100644 (file)
index bd6ae4d..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_CROSSCOMPILING 1)
-set(DE_CPU "DE_CPU_ARM")
-
-# Toolchain/compiler base.
-set(ARM_CC_BASE "/opt/arm-2011.03" CACHE STRING "CodeSourcery GCC cross-compiler path")
-set(CROSS_COMPILE "${ARM_CC_BASE}/bin/arm-none-linux-gnueabi-" CACHE STRING "Cross compiler prefix")
-
-set(CMAKE_C_COMPILER "${CROSS_COMPILE}gcc")
-set(CMAKE_CXX_COMPILER "${CROSS_COMPILE}g++")
-
-# Search libs and include files (but not programs) from toolchain dir.
-set(CMAKE_FIND_ROOT_PATH "${ARM_CC_BASE}/arm-none-linux-gnueabi/libc/" ${ARM_CC_EXTRA_ROOT_PATHS})
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/framework/delibs/cmake/toolchain-mingw-clang.cmake b/framework/delibs/cmake/toolchain-mingw-clang.cmake
deleted file mode 100644 (file)
index eb3f6ba..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# Platform defines.
-set(CMAKE_SYSTEM_NAME Windows)
-set(DE_CPU             "DE_CPU_X86")
-set(DE_OS              "DE_OS_WIN32")
-set(DE_COMPILER        "DE_COMPILER_CLANG")
-
-# Base directories.
-set(MINGW_BASE "C:/mingw"              CACHE STRING "MinGW base directory")
-
-set(CMAKE_C_COMPILER   "${MINGW_BASE}/bin/clang.exe")
-set(CMAKE_CXX_COMPILER "${MINGW_BASE}/bin/clang++.exe")
-
-# Search and include files (but not programs or libs) from toolchain dir.
-set(CMAKE_FIND_ROOT_PATH "${MINGW_BASE}")
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY FIRST)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE FIRST)
-
diff --git a/framework/delibs/cmake/toolchain-symbian-gcce.cmake b/framework/delibs/cmake/toolchain-symbian-gcce.cmake
deleted file mode 100644 (file)
index f9a2944..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-
-# DE defines
-set(DE_COMPILER        "DE_COMPILER_GCC")
-set(DE_OS       "DE_OS_SYMBIAN")
-set(DE_CPU      "DE_CPU_ARM")
-
-# switch off the compiler tests -- these error out unnecessarily otherwise
-SET(CMAKE_C_COMPILER_WORKS    1)
-SET(CMAKE_C_COMPILER_FORCED   1)
-SET(CMAKE_CXX_COMPILER_WORKS  1)
-SET(CMAKE_CXX_COMPILER_FORCED 1)
-
-# Set prefixes and suffixes for targets
-SET(CMAKE_STATIC_LIBRARY_PREFIX "")
-SET(CMAKE_STATIC_LIBRARY_SUFFIX ".lib")
-SET(CMAKE_SHARED_LIBRARY_PREFIX "")
-SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dso")
-SET(CMAKE_IMPORT_LIBRARY_PREFIX "")
-SET(CMAKE_IMPORT_LIBRARY_SUFFIX ".lib")
-SET(CMAKE_EXECUTABLE_SUFFIX ".exe")
-SET(CMAKE_LINK_LIBRARY_SUFFIX ".lib")
-SET(CMAKE_DL_LIBS "")
-
-set(CMAKE_SYSTEM_NAME "Symbian")
-
-set(CMAKE_FIND_LIBRARY_PREFIXES "")
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".dso")
-
-# Symbian Epoc32 directory setup.
-set(SYMBIAN_SDK_PATH   "c:/Nokia/devices/Nokia_Symbian3_SDK_v1.0" CACHE STRING "Symbian SDK root directory")
-set(SYMBIAN_EPOCROOT   ${SYMBIAN_SDK_PATH}/Epoc32)
-
-# Codesourcery compiler setup
-set(ARM_CC_BASE                                "c:/Program Files/CodeSourcery/Sourcery G++ Lite" CACHE STRING "CodeSourcery ARM ELF compiler path")
-set(CROSS_COMPILER_PREFIX      "${ARM_CC_BASE}/bin/arm-none-symbianelf-" CACHE STRING "Cross compiler prefix")
-
-# CMAKE compiler executables
-set(CMAKE_C_COMPILER "${CROSS_COMPILER_PREFIX}gcc.exe")
-set(CMAKE_CXX_COMPILER "${CROSS_COMPILER_PREFIX}g++.exe")
-set(CMAKE_LINKER               "${CROSS_COMPILER_PREFIX}ld.exe")
-
-# Some shortcut variables for later use. See CFlags.cmake
-# TODO: Should these be in CFlags.cmake instead?
-set(COMPILER_INCLUDE_DIR "${ARM_CC_BASE}/lib/gcc/arm-none-symbianelf/4.4.1/include")
-set(COMPILER_LIB_DIR ${ARM_CC_BASE}/lib/gcc/arm-none-symbianelf/4.4.1 ${ARM_CC_BASE}/arm-none-symbianelf/lib)
-
-set(SYMBIAN_LIB_DIR ${SYMBIAN_EPOCROOT}/release/armv5/lib)
-
-# Search libs and include files (but not programs) from toolchain dir.
-set(CMAKE_FIND_ROOT_PATH ${SYMBIAN_EPOCROOT}/lib/gcc/arm-none-symbianelf/4.4.1 ${SYMBIAN_EPOCROOT} ${SYMBIAN_EPOCROOT}/release/armv5 ${SYMBIAN_EPOCROOT}/release/armv5/lib)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-# for nmake make long command lines are redirected to a file
-# with the following syntax, see Windows-bcc32.cmake for use
-if (CMAKE_GENERATOR MATCHES "NMake")
-       set(CMAKE_START_TEMP_FILE "@<<\n")
-       set(CMAKE_END_TEMP_FILE "\n<<")
-endif (CMAKE_GENERATOR MATCHES "NMake")