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_CXX_FLAGS    "-march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=neon -frtti")
+set(CMAKE_C_FLAGS      "-DANDROID -Os -fexceptions -march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=neon")
+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})