Update the _DEBUG macro test to something more standard

5 files changed, 12 insertions, 16 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e3c2fa..b9f4d70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,6 @@ cmake_dependent_option(DAW_BUILD_DEBUG
   "Compile daw engine with debugging features" ON
   "CMAKE_BUILD_TYPE STREQUAL Debug" OFF)
 
-# unused
 cmake_dependent_option(DAW_BUILD_HOTRELOAD
   "Compile daw engine with hot reloading enabled" ON
   "NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME;CMAKE_BUILD_TYPE STREQUAL Debug;NOT WIN32;BUILD_SHARED_LIBS" OFF)
@@ -35,12 +34,6 @@ cmake_dependent_option(DAW_BUILD_UBSAN
   "DAW_BUILD_DEBUG;UBSAN" OFF)
 
 # unused
-cmake_dependent_option(DAW_BUILD_STANDALONE
-  # Would require us to enable dynamically registered states.
-  "Compile daw as a standalone library. This is not implemented yet." OFF
-  "TRUE" OFF)
-
-# unused
 cmake_dependent_option(DAW_BUILD_TOOLS
   "Build tools to manipulate a daw project" ON
   "CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME" OFF)
@@ -124,7 +117,7 @@ target_compile_options(${PROJECT_NAME} PUBLIC
 )
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC
-  $<$<BOOL:${DAW_BUILD_DEBUG}>:DAW_BUILD_DEBUG>
+  $<$<BOOL:${DAW_BUILD_DEBUG}>:_DEBUG>
   $<$<BOOL:${DAW_BUILD_HOTRELOAD}>:DAW_BUILD_HOTRELOAD>
 )
 
diff --git a/include/engine/logging.h b/include/engine/logging.h
index 0ac5025..8d5ef31 100644
--- a/include/engine/logging.h
+++ b/include/engine/logging.h
@@ -34,7 +34,7 @@ void LOG(const char *fmt, ...);
 void INFO_(const char *fmt, ...);
 void INFO(const char *fmt, ...);
 
-#ifdef DAW_BUILD_DEBUG
+#ifdef _DEBUG
 #define DEBUG(fmt, ...) __DEBUG(__FILE__,__LINE__, __func__, fmt, __VA_ARGS__)
 void __DEBUG(const char* file, const i32 line, const char* func, const char *fmt, ...);
 #else
diff --git a/src/rendering.c b/src/rendering.c
index 580be9e..e62e746 100644
--- a/src/rendering.c
+++ b/src/rendering.c
@@ -22,7 +22,7 @@ i32 drawcall_len = 0;
 /* Clear the screen,
  * To be used inbetween draw calls */
 void render_begin(Window *w) {
-#ifdef DAW_BUILD_DEBUG
+#ifdef _DEBUG
 	SDL_SetRenderDrawColor(w->renderer, 0x10, 0x0a, 0x33, 0x00);
 #else
 	SDL_SetRenderDrawColor(w->renderer, 0x00, 0x00, 0x00, 0x00);
@@ -42,7 +42,7 @@ void render_present(Window *w) {
 				break;
 			case RenderDrawCallType_Sprite:
 				{
-#ifdef DAW_BUILD_DEBUG
+#ifdef _DEBUG
 					if (dc.data.sprite.sprite == NULL) {
 						__asm__("int3;");
 						WARN("Sprite %lx in drawcall %d/%d had NULL reference", dc.data.sprite.sprite, i, drawcall_len);
@@ -110,7 +110,7 @@ void engine_draw_uitree(UITree *t) {
 
 void engine_draw_sprite(Sprite *s, v2_i32 *pos, f32 scale) {
 	if (drawcall_len + 1 >= drawcall_limit) return;
-#ifdef DAW_BUILD_DEBUG
+#ifdef _DEBUG
 	if (s == NULL) __asm__("int3;");
 #endif
 	drawcalls[drawcall_len++] = (RenderDrawCall){
@@ -127,7 +127,7 @@ void engine_draw_sprite(Sprite *s, v2_i32 *pos, f32 scale) {
 
 void engine_draw_sprite_ex(Sprite *s, v2_i32 *pos, f32 scale, Engine_color colormod) {
 	if (drawcall_len + 1 >= drawcall_limit) return;
-#ifdef DAW_BUILD_DEBUG
+#ifdef _DEBUG
 	if (s == NULL) __asm__("int3;");
 #endif
 	drawcalls[drawcall_len++] = (RenderDrawCall){
diff --git a/src/ui_rendering.c b/src/ui_rendering.c
index a831a66..196d6ef 100644
--- a/src/ui_rendering.c
+++ b/src/ui_rendering.c
@@ -64,7 +64,7 @@ void render_container(Window *w, UITree_container *t) {
 
 	SDL_RenderDrawRect(w->renderer, &r);
 
-#ifdef DAW_BUILD_DEBUG
+#ifdef _DEBUG
 	r.x += t->padding;
 	r.y += t->padding;
 	r.w -= t->padding *	2;
@@ -162,7 +162,7 @@ void render_title(Window *w, UITree_title *t) {
 		NULL,
 		&r);
 
-#ifdef DAW_BUILD_DEBUG
+#ifdef _DEBUG
 	SDL_SetRenderDrawColor(w->renderer,
 			0xFF,
 			0xFF,
@@ -196,7 +196,7 @@ void render_text(Window *w, UITree_text *t) {
 		NULL,
 		&r);
 
-#ifdef DAW_BUILD_DEBUG
+#ifdef _DEBUG
 	SDL_SetRenderDrawColor(w->renderer,
 			0xFF,
 			0xFF,
diff --git a/tools/cmake/DawAddState.cmake b/tools/cmake/DawAddState.cmake
index e0664e0..23cb3fb 100644
--- a/tools/cmake/DawAddState.cmake
+++ b/tools/cmake/DawAddState.cmake
@@ -38,6 +38,9 @@ macro(daw_add_state STATENAME)
   if(BUILD_SHARED_LIBS)
     if(DAW_BUILD_DEBUG AND DAW_BUILD_HOTRELOAD)
       add_library(${STATENAME} MODULE ${STATE_SOURCES})
+      target_compile_definitions(${STATENAME} PUBLIC
+        $<$<BOOL:${DAW_BUILD_DEBUG}>:_DEBUG>
+      )
     else()
       add_library(${STATENAME} SHARED ${STATE_SOURCES})
     endif()