From 6bd3afe9b2e6f893b472a85e893c9d4412d22f46 Mon Sep 17 00:00:00 2001
From: veclavtalica <veclavtalica@tutamail.com>
Date: Thu, 20 Feb 2025 13:01:02 +0300
Subject: [PATCH] move and combine option macro headers from public interface

---
 include/twn_audio.h                        |  3 ++-
 include/twn_concatenate.h                  |  8 --------
 include/twn_draw.h                         |  3 ++-
 include/twn_varargcount.h                  |  9 ---------
 src/rendering/twn_draw_c.h                 |  2 +-
 src/rendering/twn_sprites.c                |  2 +-
 include/twn_option.h => src/twn_option_c.h | 12 +++++++++---
 7 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 include/twn_concatenate.h
 delete mode 100644 include/twn_varargcount.h
 rename include/twn_option.h => src/twn_option_c.h (90%)

diff --git a/include/twn_audio.h b/include/twn_audio.h
index 7424011..f0ae253 100644
--- a/include/twn_audio.h
+++ b/include/twn_audio.h
@@ -2,7 +2,6 @@
 #define TWN_AUDIO_H
 
 #include "twn_engine_api.h"
-#include "twn_option.h"
 
 #include <stdbool.h>
 
@@ -23,6 +22,8 @@ TWN_API void audio_parameter(const char *channel, const char *parameter, float v
 
 #ifndef TWN_NOT_C
 
+#include "src/twn_option_c.h"
+
 typedef struct PlayAudioArgs {
     char *path;
 
diff --git a/include/twn_concatenate.h b/include/twn_concatenate.h
deleted file mode 100644
index 9bb5018..0000000
--- a/include/twn_concatenate.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef TWN_CONCATENATE_H
-#define TWN_CONCATENATE_H
-
-#define m_concatenate(p_a, p_b)   m_concatenate_(p_a, p_b)
-#define m_concatenate_(p_a, p_b)  m_concatenate__(p_a, p_b)
-#define m_concatenate__(p_a, p_b) p_a##p_b
-
-#endif
diff --git a/include/twn_draw.h b/include/twn_draw.h
index 06aec43..b963ba1 100644
--- a/include/twn_draw.h
+++ b/include/twn_draw.h
@@ -2,7 +2,6 @@
 #define TWN_DRAW_H
 
 #include "twn_types.h"
-#include "twn_option.h"
 #include "twn_engine_api.h"
 
 #include <stdbool.h>
@@ -118,6 +117,8 @@ TWN_API void draw_model(const char *model,
 
 #ifndef TWN_NOT_C
 
+#include "src/twn_option_c.h"
+
 typedef struct DrawSpriteArgs {
     char const *texture;
     Rect rect;
diff --git a/include/twn_varargcount.h b/include/twn_varargcount.h
deleted file mode 100644
index fa63fed..0000000
--- a/include/twn_varargcount.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef TWN_VARARGCOUNT_H
-#define TWN_VARARGCOUNT_H
-
-#define m_narg(...) m_narg_(__VA_ARGS__, m_rseq_n_())
-#define m_narg_(...) m_arg_n_(__VA_ARGS__) 
-#define m_arg_n_(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, N, ...) N 
-#define m_rseq_n_() 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
-
-#endif
diff --git a/src/rendering/twn_draw_c.h b/src/rendering/twn_draw_c.h
index 107d638..1c43074 100644
--- a/src/rendering/twn_draw_c.h
+++ b/src/rendering/twn_draw_c.h
@@ -6,7 +6,7 @@
 #include "twn_textures_c.h"
 #include "twn_types_c.h"
 #include "twn_text_c.h"
-#include "twn_option.h"
+#include "twn_option_c.h"
 #include "twn_deferred_commands.h"
 
 #include <SDL2/SDL.h>
diff --git a/src/rendering/twn_sprites.c b/src/rendering/twn_sprites.c
index a0a00b8..a690f0e 100644
--- a/src/rendering/twn_sprites.c
+++ b/src/rendering/twn_sprites.c
@@ -4,7 +4,7 @@
 #include "twn_util.h"
 #include "twn_util_c.h"
 #include "twn_textures_c.h"
-#include "twn_option.h"
+#include "twn_option_c.h"
 
 #include <stb_ds.h>
 
diff --git a/include/twn_option.h b/src/twn_option_c.h
similarity index 90%
rename from include/twn_option.h
rename to src/twn_option_c.h
index dbdd5d4..56d02c2 100644
--- a/include/twn_option.h
+++ b/src/twn_option_c.h
@@ -1,11 +1,17 @@
 #ifndef TWN_OPTION_H
 #define TWN_OPTION_H
 
-#include "twn_concatenate.h"
-#include "twn_varargcount.h"
-
 #include <stdbool.h>
 
+#define m_narg(...) m_narg_(__VA_ARGS__, m_rseq_n_())
+#define m_narg_(...) m_arg_n_(__VA_ARGS__)
+#define m_arg_n_(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, N, ...) N
+#define m_rseq_n_() 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
+
+#define m_concatenate(p_a, p_b)   m_concatenate_(p_a, p_b)
+#define m_concatenate_(p_a, p_b)  m_concatenate__(p_a, p_b)
+#define m_concatenate__(p_a, p_b) p_a##p_b
+
 /* usage example:
  *
  * struct result {