From ca5ca8e97498b95a18196d2d1503d53523e50523 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 24 Sep 2019 11:53:18 +0300 Subject: [PATCH 1/2] - fixed C++ compilation flags applied to C files This had an effect on 32-bit targets without SSE support --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 136f73002..2c0f565ab 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -353,7 +353,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) endif () if( NOT X64 AND NOT CAN_DO_MFPMATH ) - set( CMAKE_C_FLAGS "-DNO_SSE ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_C_FLAGS "-DNO_SSE ${CMAKE_C_FLAGS}" ) set( CMAKE_CXX_FLAGS "-DNO_SSE ${CMAKE_CXX_FLAGS}" ) endif() From 40f01b418f2215580350406e9f177df660bda812 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 24 Sep 2019 11:57:40 +0300 Subject: [PATCH 2/2] - explicit use of C++11 standard for TiMidity++ This fixes compilation with older GCC and Clang --- libraries/timidityplus/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/timidityplus/CMakeLists.txt b/libraries/timidityplus/CMakeLists.txt index ae310e320..6bdaa2840 100644 --- a/libraries/timidityplus/CMakeLists.txt +++ b/libraries/timidityplus/CMakeLists.txt @@ -4,6 +4,7 @@ make_release_only() if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE ) set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer" ) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) endif() set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ZD_FASTMATH_FLAG}")