package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-06 09:36:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[cmake]: Change to shorter RKPLATFORM macro

Browse Source 
Change Android and Linux branches to use RKPLATFORM macro.
RKPLATFORM is shorter and it is not a cmake variable.

Change-Id: I09a6fe72e7dacedbb4b2b8e1a66b6f7ca625f019
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2017-12-19 19:44:30 +08:00
parent 81759e832a
commit b186d04390
9 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -31,12 +31,10 @@ if(NOT COMMAND find_host_program)
endmacro() endmacro()
endif() endif()
option(RKPLATFORM "Enable RK HW CONFIG" OFF) set(RKPLATFORM "" CACHE BOOL "Enable RK HW CONFIG")
if(${CMAKE_RKPLATFORM_ENABLE} MATCHES "ON") if (RKPLATFORM)
option(RKPLATFORM "Enable RK HW CONFIG" ON) ADD_DEFINITIONS(-DRKPLATFORM)
set(RKPLATFORM True) endif(RKPLATFORM)
add_definitions(-DRKPLATFORM)
endif()
project (rk_mpp) project (rk_mpp)

2
build/android/aarch64/make-Android.bash
View File

@@ -18,7 +18,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake \
-DANDROID_TOOLCHAIN_NAME="aarch64-linux-android-4.9" \ -DANDROID_TOOLCHAIN_NAME="aarch64-linux-android-4.9" \
-DANDROID_NATIVE_API_LEVEL=android-21 \ -DANDROID_NATIVE_API_LEVEL=android-21 \
-DANDROID_STL=system \ -DANDROID_STL=system \
-DCMAKE_RKPLATFORM_ENABLE=ON \ -DRKPLATFORM=ON \
../../../ ../../../
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------

2
build/android/arm/make-Android.bash
View File

@@ -18,7 +18,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake \
-DANDROID_TOOLCHAIN_NAME="arm-linux-androideabi-4.8" \ -DANDROID_TOOLCHAIN_NAME="arm-linux-androideabi-4.8" \
-DANDROID_NATIVE_API_LEVEL=android-21 \ -DANDROID_NATIVE_API_LEVEL=android-21 \
-DANDROID_STL=system \ -DANDROID_STL=system \
-DCMAKE_RKPLATFORM_ENABLE=ON \ -DRKPLATFORM=ON \
../../../ ../../../
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------

2
build/android/x86/make-Android.bash
View File

@@ -18,7 +18,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake \
-DANDROID_TOOLCHAIN_NAME="x86-4.8" \ -DANDROID_TOOLCHAIN_NAME="x86-4.8" \
-DANDROID_NATIVE_API_LEVEL=android-21 \ -DANDROID_NATIVE_API_LEVEL=android-21 \
-DANDROID_STL=system \ -DANDROID_STL=system \
-DCMAKE_RKPLATFORM_ENABLE=ON \ -DRKPLATFORM=ON \
../../../ ../../../
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------

2
build/linux/aarch64/make-Makefiles.bash
View File

@@ -23,6 +23,6 @@ fi
# generate Makefile # generate Makefile
cmake -DCMAKE_BUILD_TYPE=Release \ cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_TOOLCHAIN_FILE=./arm.linux.cross.cmake \ -DCMAKE_TOOLCHAIN_FILE=./arm.linux.cross.cmake \
-DCMAKE_RKPLATFORM_ENABLE=ON \ -DRKPLATFORM=ON \
-G "Unix Makefiles" \ -G "Unix Makefiles" \
${MPP_TOP} ${MPP_TOP}

2
build/linux/arm/make-Makefiles.bash
View File

@@ -23,6 +23,6 @@ fi
# generate Makefile # generate Makefile
cmake -DCMAKE_BUILD_TYPE=Release \ cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_TOOLCHAIN_FILE=./arm.linux.cross.cmake \ -DCMAKE_TOOLCHAIN_FILE=./arm.linux.cross.cmake \
-DCMAKE_RKPLATFORM_ENABLE=ON \ -DRKPLATFORM=ON \
-G "Unix Makefiles" \ -G "Unix Makefiles" \
${MPP_TOP} ${MPP_TOP}

2
build/linux/x86/sofia-3gr/make-Makefiles.bash
View File

@@ -2,5 +2,5 @@
# Run this from within a bash shell # Run this from within a bash shell
cmake -G "Unix Makefiles" \ cmake -G "Unix Makefiles" \
-DCMAKE_TOOLCHAIN_FILE=./sofia-3gr.linux.cross.cmake \ -DCMAKE_TOOLCHAIN_FILE=./sofia-3gr.linux.cross.cmake \
-DCMAKE_RKPLATFORM_ENABLE=ON \ -DRKPLATFORM=ON \
../../../../ && ccmake ../../../../ ../../../../ && ccmake ../../../../

2
build/linux/x86_64/make-Makefiles.bash
View File

@@ -3,5 +3,5 @@
# x86_64 is for simulation do not enable RK platform # x86_64 is for simulation do not enable RK platform
cmake -G "Unix Makefiles" \ cmake -G "Unix Makefiles" \
-DCMAKE_BUILD_TYPE=debug \ -DCMAKE_BUILD_TYPE=debug \
-DCMAKE_RKPLATFORM_ENABLE=OFF \ -DRKPLATFORM=OFF \
../../../ && ccmake ../../../ ../../../ && ccmake ../../../

2
debian/rules vendored
View File

@@ -26,6 +26,6 @@ override_dh_auto_configure:
dh_auto_configure -- \ dh_auto_configure -- \
-DCMAKE_TOOLCHAIN_FILE=/etc/dpkg-cross/cmake/CMakeCross.txt \ -DCMAKE_TOOLCHAIN_FILE=/etc/dpkg-cross/cmake/CMakeCross.txt \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_RKPLATFORM_ENABLE=ON \ -DRKPLATFORM=ON \
-DHAVE_DRM=ON \ -DHAVE_DRM=ON \
-DARM_MIX_32_64=ON -DARM_MIX_32_64=ON