diff options
| -rw-r--r-- | cmake/compiler.cmake | 6 | ||||
| -rw-r--r-- | src/mumble/JSONSerialization.cpp | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake index d4f6c0348..b711446b9 100644 --- a/cmake/compiler.cmake +++ b/cmake/compiler.cmake @@ -72,12 +72,10 @@ elseif(UNIX OR MINGW) add_compile_options("-Wa,-mbig-obj") endif() - if(options) + if(optimize) add_compile_options( "-O3" "-march=native" - "-ffast-math" - "-ftree-vectorize" ) endif() @@ -128,7 +126,7 @@ elseif(UNIX OR MINGW) add_compile_options("-g") endif() endif() -endif() +endif() function(target_disable_warnings TARGET) if(MSVC) diff --git a/src/mumble/JSONSerialization.cpp b/src/mumble/JSONSerialization.cpp index cd24c483f..f377e3ab8 100644 --- a/src/mumble/JSONSerialization.cpp +++ b/src/mumble/JSONSerialization.cpp @@ -213,9 +213,9 @@ void from_json(const nlohmann::json &j, Settings &settings) { } #ifndef USE_RNNOISE - if (settings.noiseCancelMode == NoiseCancelRNN || settings.noiseCancelMode == NoiseCancelBoth) { + if (settings.noiseCancelMode == Settings::NoiseCancelRNN || settings.noiseCancelMode == Settings::NoiseCancelBoth) { // Use Speex instead as this Mumble build was built without support for RNNoise - settings.noiseCancelMode = NoiseCancelSpeex; + settings.noiseCancelMode = Settings::NoiseCancelSpeex; } #endif } |