Fix log level

RikkaApps · Aug 5, 2021 · a6a3e89 · a6a3e89
1 parent 397532c
commit a6a3e89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/riru/src/main/cpp/CMakeLists.txt b/riru/src/main/cpp/CMakeLists.txt
@@ -47,8 +47,8 @@ endif ()
 string(TOUPPER CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} CXX_FLAGS_WITH_BUILD_TYPE)
 string(TOUPPER CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} C_FLAGS_WITH_BUILD_TYPE)
 
-set(${CXX_FLAGS_WITH_BUILD_TYPE} "${C_FLAGS}")
-set(${C_FLAGS_WITH_BUILD_TYPE} "${C_FLAGS}")
+set(${CXX_FLAGS_WITH_BUILD_TYPE} "${${CXX_FLAGS_WITH_BUILD_TYPE}} ${C_FLAGS}")
+set(${C_FLAGS_WITH_BUILD_TYPE} "${${CXX_FLAGS_WITH_BUILD_TYPE}} ${C_FLAGS}")
 
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}")
 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")

diff --git a/riru/src/main/cpp/include/logging.h b/riru/src/main/cpp/include/logging.h
@@ -14,11 +14,12 @@
 #endif
 
 #ifndef NDEBUG
+#define LOGV(...)  __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
 #define LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
 #else
+#define LOGV(...)
 #define LOGD(...)
 #endif
-#define LOGV(...)  __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
 #define LOGI(...)  __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
 #define LOGW(...)  __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
 #define LOGE(...)  __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)