Flesh out cmakelists & streamline some functions

4 files changed, 13 insertions, 11 deletions

diff --git a/src/logging.c b/src/logging.c
index 2ca5368..e8c2199 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <engine/types.h>
 #include <engine/logging.h>
 
 char *itoa(i32 x) {
diff --git a/src/rendering.c b/src/rendering.c
index 755eda0..580be9e 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 DEBUG
+#ifdef DAW_BUILD_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 DEBUG
+#ifdef DAW_BUILD_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 DEBUG
+#ifdef DAW_BUILD_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 DEBUG
+#ifdef DAW_BUILD_DEBUG
 	if (s == NULL) __asm__("int3;");
 #endif
 	drawcalls[drawcall_len++] = (RenderDrawCall){
diff --git a/src/state.c b/src/state.c
index 6b1f9c8..ee8b2fd 100644
--- a/src/state.c
+++ b/src/state.c
@@ -1,4 +1,5 @@
 #include <engine/state.h>
+#include <engine/logging.h>
 
 #include <include_states.h>
 
@@ -23,7 +24,7 @@ void State_init(StateType type,   memory *mem) {
 #undef State
     case STATE_null:
     case STATE_quit:
-      _DEBUG("Got %s state.\n", StateTypeStr[type]);
+      DEBUG("Got %s state.\n", StateTypeStr[type]);
       break;
     default:
       exit(EXIT_FAILURE);
@@ -42,7 +43,7 @@ void State_free(StateType type,   memory *mem) {
 #undef State
     case STATE_null:
     case STATE_quit:
-      _DEBUG("Got %s state.\n", StateTypeStr[type]);
+      DEBUG("Got %s state.\n", StateTypeStr[type]);
       break;
     default:
       exit(EXIT_FAILURE);
@@ -62,7 +63,7 @@ StateType (*State_updateFunc(StateType type))(void*) {
 #undef State
     case STATE_null:
     case STATE_quit:
-      return NULL; //_DEBUG("Got %s state.\n", StateTypeStr[type]);
+      return NULL; //DEBUG("Got %s state.\n", StateTypeStr[type]);
       break;
     default:
       exit(EXIT_FAILURE);
@@ -82,7 +83,7 @@ StateType State_update(StateType type, memory *mem) {
 #undef State
     case STATE_null:
     case STATE_quit:
-      _DEBUG("Got %s state.\n", StateTypeStr[type]);
+      DEBUG("Got %s state.\n", StateTypeStr[type]);
       break;
     default:
       exit(EXIT_FAILURE);
diff --git a/src/ui_rendering.c b/src/ui_rendering.c
index 7024e0b..a831a66 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 DEBUG
+#ifdef DAW_BUILD_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 DEBUG
+#ifdef DAW_BUILD_DEBUG
 	SDL_SetRenderDrawColor(w->renderer,
 			0xFF,
 			0xFF,
@@ -196,7 +196,7 @@ void render_text(Window *w, UITree_text *t) {
 		NULL,
 		&r);
 
-#ifdef DEBUG
+#ifdef DAW_BUILD_DEBUG
 	SDL_SetRenderDrawColor(w->renderer,
 			0xFF,
 			0xFF,