fix android c-flags

author: manuel <manuel@mausz.at> 2015-03-10 22:20:19 +0100
committer: manuel <manuel@mausz.at> 2015-03-10 22:20:53 +0100
commit: b367f43195e894c8a48cedd130c771d1758daa86 (patch)
tree: 5d0dbd2f2366435c90f62f050b6a29577dd1e900
parent: 96fb8d016fe50ba67d830ce6a965b988b8fea942 (diff)
download: kodi-pvr-build-b367f43195e894c8a48cedd130c771d1758daa86.tar.gz
kodi-pvr-build-b367f43195e894c8a48cedd130c771d1758daa86.tar.bz2
kodi-pvr-build-b367f43195e894c8a48cedd130c771d1758daa86.zip
7 files changed, 8 insertions, 8 deletions
diff --git a/toolchain/android-arm.cmake b/toolchain/android-arm.cmake
index cc4fdc1..16dc1bb 100644
--- a/toolchain/android-arm.cmake
+++ b/toolchain/android-arm.cmake
@@ -42,8 +42,8 @@ set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
 set(CMAKE_AR           ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
 set(CMAKE_LINKER       ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
 set(CMAKE_RANLIB       ${COMPILER_PREFIX}-ranlib)
-set(CMAKE_C_FLAGS      "-march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=neon")
+set(CMAKE_C_FLAGS      "-DANDROID -Os -fexceptions -march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=neon")
-set(CMAKE_CXX_FLAGS    "-march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=neon -frtti")
+set(CMAKE_CXX_FLAGS    "${CMAKE_C_FLAGS} -frtti")
 set(CMAKE_CPP_FLAGS    "")
 set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
 set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})
diff --git a/toolchain/ios-arm.cmake b/toolchain/ios-arm.cmake
index 7c88021..5eb10a6 100644
--- a/toolchain/ios-arm.cmake
+++ b/toolchain/ios-arm.cmake
@@ -43,7 +43,7 @@ set(CMAKE_AR           ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
 set(CMAKE_LINKER       ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
 set(CMAKE_RANLIB       ${COMPILER_PREFIX}-ranlib)
 set(CMAKE_C_FLAGS      "-mcpu=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -pipe -Wno-trigraphs -fpascal-strings -O3 -Wreturn-type -Wunused-variable -fmessage-length=0 -gdwarf-2")
-set(CMAKE_CXX_FLAGS    "-mcpu=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -pipe -Wno-trigraphs -fpascal-strings -O3 -Wreturn-type -Wunused-variable -fmessage-length=0 -gdwarf-2 -stdlib=libc++")
+set(CMAKE_CXX_FLAGS    "${CMAKE_C_FLAGS} -stdlib=libc++")
 set(CMAKE_CPP_FLAGS    "")
 set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
 set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})
diff --git a/toolchain/linux-i486.cmake b/toolchain/linux-i486.cmake
index 9d71e74..276e24e 100644
--- a/toolchain/linux-i486.cmake
+++ b/toolchain/linux-i486.cmake
@@ -43,7 +43,7 @@ set(CMAKE_AR           ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
 set(CMAKE_LINKER       ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
 set(CMAKE_RANLIB       ${COMPILER_PREFIX}-ranlib)
 set(CMAKE_C_FLAGS      "-m32")
-set(CMAKE_CXX_FLAGS    "-m32")
+set(CMAKE_CXX_FLAGS    "${CMAKE_C_FLAGS}")
 set(CMAKE_CPP_FLAGS    "")
 set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
 set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})
diff --git a/toolchain/linux-x86_64.cmake b/toolchain/linux-x86_64.cmake
index 2fbe2aa..a678d06 100644
--- a/toolchain/linux-x86_64.cmake
+++ b/toolchain/linux-x86_64.cmake
@@ -43,7 +43,7 @@ set(CMAKE_AR           ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
 set(CMAKE_LINKER       ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
 set(CMAKE_RANLIB       ${COMPILER_PREFIX}-ranlib)
 set(CMAKE_C_FLAGS      "")
-set(CMAKE_CXX_FLAGS    "")
+set(CMAKE_CXX_FLAGS    "${CMAKE_C_FLAGS}")
 set(CMAKE_CPP_FLAGS    "")
 set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
 set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})
diff --git a/toolchain/osx-i386.cmake b/toolchain/osx-i386.cmake
index ae4eda3..63e5a50 100644
--- a/toolchain/osx-i386.cmake
+++ b/toolchain/osx-i386.cmake
@@ -43,7 +43,7 @@ set(CMAKE_AR           ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
 set(CMAKE_LINKER       ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
 set(CMAKE_RANLIB       ${COMPILER_PREFIX}-ranlib)
 set(CMAKE_C_FLAGS      "")
-set(CMAKE_CXX_FLAGS    "-stdlib=libc++")
+set(CMAKE_CXX_FLAGS    "${CMAKE_C_FLAGS} -stdlib=libc++")
 set(CMAKE_CPP_FLAGS    "")
 set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
 set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})
diff --git a/toolchain/osx-x86_64.cmake b/toolchain/osx-x86_64.cmake
index 8c35c6d..44af62c 100644
--- a/toolchain/osx-x86_64.cmake
+++ b/toolchain/osx-x86_64.cmake
@@ -43,7 +43,7 @@ set(CMAKE_AR           ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
 set(CMAKE_LINKER       ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
 set(CMAKE_RANLIB       ${COMPILER_PREFIX}-ranlib)
 set(CMAKE_C_FLAGS      "")
-set(CMAKE_CXX_FLAGS    "-stdlib=libc++")
+set(CMAKE_CXX_FLAGS    "${CMAKE_C_FLAGS} -stdlib=libc++")
 set(CMAKE_CPP_FLAGS    "")
 set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
 set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})
diff --git a/toolchain/rbpi-arm.cmake b/toolchain/rbpi-arm.cmake
index ae44ce1..b6107be 100644
--- a/toolchain/rbpi-arm.cmake
+++ b/toolchain/rbpi-arm.cmake
@@ -43,7 +43,7 @@ set(CMAKE_AR           ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
 set(CMAKE_LINKER       ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
 set(CMAKE_RANLIB       ${COMPILER_PREFIX}-ranlib)
 set(CMAKE_C_FLAGS      "-mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux")
-set(CMAKE_CXX_FLAGS    "-mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux")
+set(CMAKE_CXX_FLAGS    "${CMAKE_C_FLAGS}")
 set(CMAKE_CPP_FLAGS    "")
 set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
 set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})
author	manuel <manuel@mausz.at>	2015-03-10 22:20:19 +0100
committer	manuel <manuel@mausz.at>	2015-03-10 22:20:53 +0100
commit	b367f43195e894c8a48cedd130c771d1758daa86 (patch)
tree	5d0dbd2f2366435c90f62f050b6a29577dd1e900
parent	96fb8d016fe50ba67d830ce6a965b988b8fea942 (diff)
download	kodi-pvr-build-b367f43195e894c8a48cedd130c771d1758daa86.tar.gz kodi-pvr-build-b367f43195e894c8a48cedd130c771d1758daa86.tar.bz2 kodi-pvr-build-b367f43195e894c8a48cedd130c771d1758daa86.zip

diff --git a/toolchain/android-arm.cmake b/toolchain/android-arm.cmake index cc4fdc1..16dc1bb 100644 --- a/toolchain/android-arm.cmake +++ b/toolchain/android-arm.cmake
@@ -42,8 +42,8 @@ set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
42	set(CMAKE_AR ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")	42	set(CMAKE_AR ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")	43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)	44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)
45	set(CMAKE_C_FLAGS "-march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=neon")	45	set(CMAKE_C_FLAGS "-DANDROID -Os -fexceptions -march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=neon")
46	set(CMAKE_CXX_FLAGS "-march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=neon -frtti")	46	set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -frtti")
47	set(CMAKE_CPP_FLAGS "")	47	set(CMAKE_CPP_FLAGS "")
48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})	48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})	49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})


diff --git a/toolchain/ios-arm.cmake b/toolchain/ios-arm.cmake index 7c88021..5eb10a6 100644 --- a/toolchain/ios-arm.cmake +++ b/toolchain/ios-arm.cmake
@@ -43,7 +43,7 @@ set(CMAKE_AR ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")	43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)	44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)
45	set(CMAKE_C_FLAGS "-mcpu=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -pipe -Wno-trigraphs -fpascal-strings -O3 -Wreturn-type -Wunused-variable -fmessage-length=0 -gdwarf-2")	45	set(CMAKE_C_FLAGS "-mcpu=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -pipe -Wno-trigraphs -fpascal-strings -O3 -Wreturn-type -Wunused-variable -fmessage-length=0 -gdwarf-2")
46	set(CMAKE_CXX_FLAGS "-mcpu=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -pipe -Wno-trigraphs -fpascal-strings -O3 -Wreturn-type -Wunused-variable -fmessage-length=0 -gdwarf-2 -stdlib=libc++")	46	set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -stdlib=libc++")
47	set(CMAKE_CPP_FLAGS "")	47	set(CMAKE_CPP_FLAGS "")
48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})	48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})	49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})


diff --git a/toolchain/linux-i486.cmake b/toolchain/linux-i486.cmake index 9d71e74..276e24e 100644 --- a/toolchain/linux-i486.cmake +++ b/toolchain/linux-i486.cmake
@@ -43,7 +43,7 @@ set(CMAKE_AR ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")	43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)	44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)
45	set(CMAKE_C_FLAGS "-m32")	45	set(CMAKE_C_FLAGS "-m32")
46	set(CMAKE_CXX_FLAGS "-m32")	46	set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
47	set(CMAKE_CPP_FLAGS "")	47	set(CMAKE_CPP_FLAGS "")
48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})	48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})	49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})


diff --git a/toolchain/linux-x86_64.cmake b/toolchain/linux-x86_64.cmake index 2fbe2aa..a678d06 100644 --- a/toolchain/linux-x86_64.cmake +++ b/toolchain/linux-x86_64.cmake
@@ -43,7 +43,7 @@ set(CMAKE_AR ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")	43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)	44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)
45	set(CMAKE_C_FLAGS "")	45	set(CMAKE_C_FLAGS "")
46	set(CMAKE_CXX_FLAGS "")	46	set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
47	set(CMAKE_CPP_FLAGS "")	47	set(CMAKE_CPP_FLAGS "")
48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})	48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})	49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})


diff --git a/toolchain/osx-i386.cmake b/toolchain/osx-i386.cmake index ae4eda3..63e5a50 100644 --- a/toolchain/osx-i386.cmake +++ b/toolchain/osx-i386.cmake
@@ -43,7 +43,7 @@ set(CMAKE_AR ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")	43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)	44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)
45	set(CMAKE_C_FLAGS "")	45	set(CMAKE_C_FLAGS "")
46	set(CMAKE_CXX_FLAGS "-stdlib=libc++")	46	set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -stdlib=libc++")
47	set(CMAKE_CPP_FLAGS "")	47	set(CMAKE_CPP_FLAGS "")
48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})	48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})	49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})


diff --git a/toolchain/osx-x86_64.cmake b/toolchain/osx-x86_64.cmake index 8c35c6d..44af62c 100644 --- a/toolchain/osx-x86_64.cmake +++ b/toolchain/osx-x86_64.cmake
@@ -43,7 +43,7 @@ set(CMAKE_AR ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")	43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)	44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)
45	set(CMAKE_C_FLAGS "")	45	set(CMAKE_C_FLAGS "")
46	set(CMAKE_CXX_FLAGS "-stdlib=libc++")	46	set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -stdlib=libc++")
47	set(CMAKE_CPP_FLAGS "")	47	set(CMAKE_CPP_FLAGS "")
48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})	48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})	49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})


diff --git a/toolchain/rbpi-arm.cmake b/toolchain/rbpi-arm.cmake index ae44ce1..b6107be 100644 --- a/toolchain/rbpi-arm.cmake +++ b/toolchain/rbpi-arm.cmake
@@ -43,7 +43,7 @@ set(CMAKE_AR ${COMPILER_PREFIX}-ar CACHE FILEPATH "Archiver")
43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")	43	set(CMAKE_LINKER ${COMPILER_PREFIX}-ld CACHE FILEPATH "Linker")
44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)	44	set(CMAKE_RANLIB ${COMPILER_PREFIX}-ranlib)
45	set(CMAKE_C_FLAGS "-mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux")	45	set(CMAKE_C_FLAGS "-mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux")
46	set(CMAKE_CXX_FLAGS "-mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux")	46	set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
47	set(CMAKE_CPP_FLAGS "")	47	set(CMAKE_CPP_FLAGS "")
48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})	48	set(ENV{CFLAGS} ${CMAKE_C_FLAGS})
49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})	49	set(ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS})