Merge pull request #5 from rawrtc/fix-debug-level-override

Fix overriding of the debug level via RAWRTC_DEBUG_MODULE_LEVEL

Author: lgrahl

.circleci/config.yml

@@ -103,35 +103,47 @@ jobs:
     docker:
       - image: rawrtc/cross-build:linux-armv6
 
-  # Cross: Linux ARMv6
+  # Cross: Linux ARMv7
   linux-armv7:
     <<: *shared-cross
     docker:
       - image: rawrtc/cross-build:linux-armv7
 
-  # Cross: Android API 21 ARM
-  android-21-arm:
+  # Cross: Android API 16 ARM
+  android-16-arm:
+    <<: *shared-cross
+    docker:
+      - image: rawrtc/cross-build:android-16-arm
+
+  # Cross: Android API 16 x86
+  android-16-x86:
+    <<: *shared-cross
+    docker:
+      - image: rawrtc/cross-build:android-16-x86
+
+  # Cross: Android API 28 ARM
+  android-28-arm:
     <<: *shared-cross
     docker:
-      - image: rawrtc/cross-build:android-21-arm
+      - image: rawrtc/cross-build:android-28-arm
 
-  # Cross: Android API 21 ARM64
-  android-21-arm64:
+  # Cross: Android API 28 ARM64
+  android-28-arm64:
     <<: *shared-cross
     docker:
-      - image: rawrtc/cross-build:android-21-arm64
+      - image: rawrtc/cross-build:android-28-arm64
 
-  # Cross: Android API 27 ARM
-  android-27-arm:
+  # Cross: Android API 28 x86
+  android-28-x86:
     <<: *shared-cross
     docker:
-      - image: rawrtc/cross-build:android-27-arm
+      - image: rawrtc/cross-build:android-28-x86
 
-  # Cross: Android API 27 ARM64
-  android-27-arm64:
+  # Cross: Android API 28 x86_64
+  android-28-x86_64:
     <<: *shared-cross
     docker:
-      - image: rawrtc/cross-build:android-27-arm64
+      - image: rawrtc/cross-build:android-28-x86_64
 
   # Cross: Windows x86
   windows-x86:
@@ -162,9 +174,11 @@ workflows:
       - archlinux-clang
       - linux-armv6
       - linux-armv7
-      - android-21-arm
-      - android-21-arm64
-      - android-27-arm
-      - android-27-arm64
+      - android-16-arm
+      - android-16-x86
+      - android-28-arm
+      - android-28-arm64
+      - android-28-x86
+      - android-28-x86_64
       - windows-x86
       #- windows-x64

include/rawrtcc/debug.h

@@ -1,6 +1,20 @@
 // Module level overwrites global level if present
-#ifdef RAWRTC_DEBUG_MODULE_LEVEL
-#    define DEBUG_LEVEL RAWRTC_DEBUG_MODULE_LEVEL
+#if RAWRTC_DEBUG_MODULE_LEVEL == 0
+#    define DEBUG_LEVEL 0
+#elif RAWRTC_DEBUG_MODULE_LEVEL == 1
+#    define DEBUG_LEVEL 1
+#elif RAWRTC_DEBUG_MODULE_LEVEL == 2
+#    define DEBUG_LEVEL 2
+#elif RAWRTC_DEBUG_MODULE_LEVEL == 3
+#    define DEBUG_LEVEL 3
+#elif RAWRTC_DEBUG_MODULE_LEVEL == 4
+#    define DEBUG_LEVEL 4
+#elif RAWRTC_DEBUG_MODULE_LEVEL == 5
+#    define DEBUG_LEVEL 5
+#elif RAWRTC_DEBUG_MODULE_LEVEL == 6
+#    define DEBUG_LEVEL 6
+#elif RAWRTC_DEBUG_MODULE_LEVEL == 7
+#    define DEBUG_LEVEL 7
 #else
 #    ifndef RAWRTC_DEBUG_LEVEL
 #        pragma message "RAWRTC_DEBUG_LEVEL is not defined!"
@@ -11,4 +25,4 @@
 #include <re_dbg.h>
 
 // Undef for next module
-#undef RAWRTC_DEBUG_MODULE_LEVEL
+#undef RAWRTC_DEBUG_MODULE_LEVEL