diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | samples/LiveEffect/src/main/cpp/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | samples/MegaDrone/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | samples/RhythmGame/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | samples/debug-utils/logging_macros.h | 2 | ||||
| -rw-r--r-- | samples/hello-oboe/CMakeLists.txt | 3 |
6 files changed, 11 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index be3b572d..e18d86a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,4 +35,7 @@ target_compile_options(oboe PRIVATE -std=c++11 PRIVATE "$<$<CONFIG:DEBUG>:-Werror>" PRIVATE "$<$<CONFIG:RELEASE>:-Ofast>") +# Enable logging when debugging +# target_compile_options(oboe PUBLIC -DOBOE_ENABLE_LOGGING=1) + 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 71dfb0f1..539c8927 100644 --- a/samples/LiveEffect/src/main/cpp/CMakeLists.txt +++ b/samples/LiveEffect/src/main/cpp/CMakeLists.txt @@ -42,5 +42,5 @@ target_link_libraries(liveEffect # Enable optimization for release build; it could be enabled for debug build # if performance is of interest. target_compile_options(liveEffect - PRIVATE - -std=c++14 -Wall -Werror $<$<CONFIG:RELEASE>:-Ofast>) + PRIVATE -std=c++14 -Wall -Werror $<$<CONFIG:RELEASE>:-Ofast>) + diff --git a/samples/MegaDrone/CMakeLists.txt b/samples/MegaDrone/CMakeLists.txt index cd68c1bc..6382fcc0 100644 --- a/samples/MegaDrone/CMakeLists.txt +++ b/samples/MegaDrone/CMakeLists.txt @@ -30,5 +30,4 @@ include_directories (${OBOE_DIR}/include) # Enable optimization for release build; it could be enabled for debug build # if performance is of interest. target_compile_options(megadrone - PRIVATE - -std=c++14 -Wall $<$<CONFIG:RELEASE>:-Ofast>) + PRIVATE -std=c++14 -Wall $<$<CONFIG:RELEASE>:-Ofast>) diff --git a/samples/RhythmGame/CMakeLists.txt b/samples/RhythmGame/CMakeLists.txt index e39b5afe..123e1881 100644 --- a/samples/RhythmGame/CMakeLists.txt +++ b/samples/RhythmGame/CMakeLists.txt @@ -47,5 +47,6 @@ include_directories (${OBOE_DIR}/include) # Enable optimization for release build; it could be enabled for debug build # if performance is of interest. target_compile_options(native-lib - PRIVATE - -std=c++14 -Wall -Werror $<$<CONFIG:RELEASE>:-Ofast>) + PRIVATE -std=c++14 + PRIVATE -Wall -Werror + PRIVATE $<$<CONFIG:RELEASE>:-Ofast>) diff --git a/samples/debug-utils/logging_macros.h b/samples/debug-utils/logging_macros.h index d2f43282..88309ca6 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 1 +#if OBOE_ENABLE_LOGGING #ifndef MODULE_NAME #define MODULE_NAME "AUDIO-APP" #endif diff --git a/samples/hello-oboe/CMakeLists.txt b/samples/hello-oboe/CMakeLists.txt index be7f3fd5..e198b38c 100644 --- a/samples/hello-oboe/CMakeLists.txt +++ b/samples/hello-oboe/CMakeLists.txt @@ -57,5 +57,4 @@ target_link_libraries(hello-oboe android log oboe) # Enable optimization for release build; it could be enabled for debug build # if performance is of interest. target_compile_options(hello-oboe - PRIVATE - -std=c++14 -Wall -Werror $<$<CONFIG:RELEASE>:-Ofast>) + PRIVATE -std=c++14 -Wall -Werror $<$<CONFIG:RELEASE>:-Ofast>) |