From 41f3fb8cc80bf89f0062ceb1eabf162c8c48bbba Mon Sep 17 00:00:00 2001 From: ZhaoJun Date: Thu, 28 Jul 2016 03:43:15 +0000 Subject: [PATCH] [sofia-3gr-linux]: add sofia-3gr makefile git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@1114 6e48237b-75ef-9749-8fc9-41990f28c85a --- build/linux/arm.linux.cross.cmake | 13 ------------- build/linux/make-Makefiles.bash | 4 ---- build/linux/make-arm-Makefiles.bash | 6 ------ build/linux/x86/sofia-3gr/make-Makefiles.bash | 6 ++++++ .../linux/x86/sofia-3gr/sofia-3gr.linux.cross.cmake | 6 ++++++ 5 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 build/linux/arm.linux.cross.cmake delete mode 100755 build/linux/make-Makefiles.bash delete mode 100755 build/linux/make-arm-Makefiles.bash create mode 100644 build/linux/x86/sofia-3gr/make-Makefiles.bash create mode 100644 build/linux/x86/sofia-3gr/sofia-3gr.linux.cross.cmake diff --git a/build/linux/arm.linux.cross.cmake b/build/linux/arm.linux.cross.cmake deleted file mode 100644 index 33c6d229..00000000 --- a/build/linux/arm.linux.cross.cmake +++ /dev/null @@ -1,13 +0,0 @@ - -cmake_minimum_required( VERSION 2.6.3 ) - -SET(CMAKE_SYSTEM_NAME Linux) -SET(CMAKE_C_COMPILER "arm-linux-gcc") -SET(CMAKE_CXX_COMPILER "arm-linux-g++") -set(ANDROID true) -set(ARMLINUX true) -add_definitions(-fPIC) -add_definitions(-DANDROID) -add_definitions(-DARMLINUX) -include_directories(osal) - diff --git a/build/linux/make-Makefiles.bash b/build/linux/make-Makefiles.bash deleted file mode 100755 index c0f8c3ad..00000000 --- a/build/linux/make-Makefiles.bash +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -# Run this from within a bash shell -cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=debug ../../ && ccmake ../../ - diff --git a/build/linux/make-arm-Makefiles.bash b/build/linux/make-arm-Makefiles.bash deleted file mode 100755 index 81467866..00000000 --- a/build/linux/make-arm-Makefiles.bash +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Run this from within a bash shell -cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=debug \ - -DCMAKE_TOOLCHAIN_FILE=./arm.linux.cross.cmake \ - -DCMAKE_RKPLATFORM_ENABLE=ON \ - ../../ && ccmake ../../ diff --git a/build/linux/x86/sofia-3gr/make-Makefiles.bash b/build/linux/x86/sofia-3gr/make-Makefiles.bash new file mode 100644 index 00000000..14e5a963 --- /dev/null +++ b/build/linux/x86/sofia-3gr/make-Makefiles.bash @@ -0,0 +1,6 @@ +#!/bin/bash +# Run this from within a bash shell +cmake -G "Unix Makefiles" \ + -DCMAKE_TOOLCHAIN_FILE=./sofia-3gr.linux.cross.cmake \ + -DCMAKE_RKPLATFORM_ENABLE=ON \ + ../../../../ && ccmake ../../../../ diff --git a/build/linux/x86/sofia-3gr/sofia-3gr.linux.cross.cmake b/build/linux/x86/sofia-3gr/sofia-3gr.linux.cross.cmake new file mode 100644 index 00000000..497c7fb7 --- /dev/null +++ b/build/linux/x86/sofia-3gr/sofia-3gr.linux.cross.cmake @@ -0,0 +1,6 @@ +cmake_minimum_required( VERSION 2.6.3 ) + +SET(CMAKE_SYSTEM_NAME Linux) +add_definitions(-fPIC) +add_definitions(-DSOFIA_3GR_LINUX) +include_directories(osal)