Merge pull request #395 from recp/ndebug

Ndebug
recp · Mar 2, 2024 · 838c507 · 838c507
2 parents c9e2b81 + 772238f
commit 838c507
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,18 +32,23 @@ if(CGLM_USE_C99)
 endif()
 
 if(MSVC)
-  add_definitions(-DNDEBUG -D_WINDOWS -D_USRDLL)
-  add_compile_options(/W3 /Ox /Gy /Oi /TC)
-
-  # Ref: https://skia.googlesource.com/third_party/sdl/+/refs/heads/master/CMakeLists.txt#225
-  # Make sure /RTC1 is disabled, otherwise it will use functions from the CRT
-  foreach(flag_var
-      CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-      CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
-    string(REGEX REPLACE "/RTC(su|[1su])" "" ${flag_var} "${${flag_var}}")
-  endforeach(flag_var)
+  add_definitions(-D_WINDOWS -D_USRDLL)
+
+  if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
+    add_definitions(-DNDEBUG)
+    add_compile_options(/W3 /Ox /Gy /Oi /TC)
+    foreach(flag_var
+        CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+        CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
+      string(REGEX REPLACE "/RTC(su|[1su])" "" ${flag_var} "${${flag_var}}")
+    endforeach(flag_var)
+  endif()
 else()
-  add_compile_options(-Wall -O3)
+  add_compile_options(-Wall)
+
+  if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
+    add_compile_options(-O3)
+  endif()
 endif()
 
 get_directory_property(hasParent PARENT_DIRECTORY)

diff --git a/include/cglm/io.h b/include/cglm/io.h
@@ -38,7 +38,7 @@
 
 #ifndef cglm_io_h
 #define cglm_io_h
-#if defined(DEBUG) || defined(_DEBUG) \
+#if !defined(NDEBUG) \
    || defined(CGLM_DEFINE_PRINTS) || defined(CGLM_LIB_SRC) \
    || defined(CGLM_NO_PRINTS_NOOP)
 

diff --git a/include/cglm/mat4.h b/include/cglm/mat4.h
@@ -69,7 +69,7 @@
 #  include "simd/wasm/mat4.h"
 #endif
 
-#ifdef DEBUG
+#ifndef NDEBUG
 # include <assert.h>
 #endif
 
@@ -376,7 +376,7 @@ void
 glm_mat4_mulN(mat4 * __restrict matrices[], uint32_t len, mat4 dest) {
   uint32_t i;
 
-#ifdef DEBUG
+#ifndef NDEBUG
   assert(len > 1 && "there must be least 2 matrices to go!");
 #endif