addressing code review requests for -Ofast flag
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fefa6c1..3249945 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,12 +30,7 @@
# Compile Flags:
# Enable -Werror when building debug config
# Enable -Ofast
-target_compile_options(oboe PRIVATE -std=c++11
- PRIVATE -Wall
- PRIVATE "$<$<CONFIG:DEBUG>:-Werror>"
- PRIVATE -Ofast)
-
-# Enable logging when debugging
-# target_compile_options(oboe PUBLIC -DOBOE_ENABLE_LOGGING=1)
+target_compile_options(oboe
+ PRIVATE -std=c++11 -Wall "$<$<CONFIG:DEBUG>:-Werror>" -Ofast)
target_link_libraries(oboe PRIVATE log OpenSLES)
diff --git a/samples/LiveEffect/src/main/cpp/CMakeLists.txt b/samples/LiveEffect/src/main/cpp/CMakeLists.txt
index e3cbe04..4f16621 100644
--- a/samples/LiveEffect/src/main/cpp/CMakeLists.txt
+++ b/samples/LiveEffect/src/main/cpp/CMakeLists.txt
@@ -41,5 +41,5 @@
# Enable optimization flags: if having problems with source level debugging,
# disable -Ofast ( and debug ), re-enable it after done debugging.
-target_compile_options(liveEffect PRIVATE -Wall -Werror -Ofast)
+target_compile_options(liveEffect PRIVATE -Wall -Werror "$<$<CONFIG:RELEASE>:-Ofast>")
diff --git a/samples/RhythmGame/CMakeLists.txt b/samples/RhythmGame/CMakeLists.txt
index 8ffb84d..f8bc1fb 100644
--- a/samples/RhythmGame/CMakeLists.txt
+++ b/samples/RhythmGame/CMakeLists.txt
@@ -47,6 +47,4 @@
# Enable optimization flags: if having problems with source level debugging,
# disable -Ofast ( and debug ), re-enable after done debugging.
target_compile_options(native-lib
- PRIVATE -std=c++14
- PRIVATE -Wall -Werror
- PRIVATE -Ofast)
+ PRIVATE -std=c++14 -Wall -Werror "$<$<CONFIG:RELEASE>:-Ofast>")
diff --git a/samples/debug-utils/logging_macros.h b/samples/debug-utils/logging_macros.h
index 88309ca..d2f4328 100644
--- a/samples/debug-utils/logging_macros.h
+++ b/samples/debug-utils/logging_macros.h
@@ -18,7 +18,7 @@
#define __SAMPLE_ANDROID_DEBUG_H__
#include <android/log.h>
-#if OBOE_ENABLE_LOGGING
+#if 1
#ifndef MODULE_NAME
#define MODULE_NAME "AUDIO-APP"
#endif
diff --git a/samples/hello-oboe/CMakeLists.txt b/samples/hello-oboe/CMakeLists.txt
index 8eefd4d..b194577 100644
--- a/samples/hello-oboe/CMakeLists.txt
+++ b/samples/hello-oboe/CMakeLists.txt
@@ -16,8 +16,6 @@
cmake_minimum_required(VERSION 3.4.1)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
-
### INCLUDE OBOE LIBRARY ###
# Set the path to the Oboe library directory
@@ -56,4 +54,4 @@
# Enable optimization flags: if having problems with source level debugging,
# disable -Ofast ( and debug ), re-enable after done debugging.
-target_compile_options(hello-oboe PRIVATE -std=c++14 -Wall -Werror -Ofast)
+target_compile_options(hello-oboe PRIVATE -Wall -Werror "$<$<CONFIG:RELEASE>:-Ofast>")