From 9897dbe031a90ef66b9c9a40fc2cc1152630af3d Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Sun, 25 Jan 2026 23:00:11 -0600
Subject: [PATCH] env_to_h cleaned

---
 src/CMakeLists.txt                     |  2 +-
 tools/CMakeLists.txt                   | 12 +-----------
 tools/env_to_h/CMakeLists.txt          | 15 +++++++++++++++
 tools/{envtoh => env_to_h}/__main__.py |  0
 4 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 tools/env_to_h/CMakeLists.txt
 rename tools/{envtoh => env_to_h}/__main__.py (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ddf93fa..84ef3e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,7 +42,7 @@ target_sources(${DUSK_BINARY_TARGET_NAME}
 )
 
 # Defs
-add_defs(duskdefs.env duskdefs.h)
+dusk_env_to_h(duskdefs.env duskdefs.h)
 target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
   PUBLIC
     DUSK_TARGET_SYSTEM="${DUSK_TARGET_SYSTEM}"
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 828a4ed..72d1f95 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -4,6 +4,7 @@
 # https://opensource.org/licenses/MIT
 
 add_subdirectory(run_python)
+add_subdirectory(env_to_h)
 
 # Function that adds an asset to be compiled
 function(add_asset ASSET_TYPE ASSET_PATH)
@@ -13,15 +14,4 @@ function(add_asset ASSET_TYPE ASSET_PATH)
     "${ASSET_TYPE}#${FULL_ASSET_PATH}#${ASSETS_ARGS}"
   )
   set(DUSK_ASSETS ${DUSK_ASSETS} CACHE INTERNAL ${DUSK_CACHE_TARGET})
-endfunction()
-
-function(add_defs INPUT_PATH OUTPUT_NAME_RELATIVE)
-  set(DUSK_DEFS_TARGET_NAME "DUSK_DEFS_${OUTPUT_NAME_RELATIVE}")
-  dusk_run_python(
-    ${DUSK_DEFS_TARGET_NAME}
-    tools.envtoh
-      --env ${INPUT_PATH}
-      --output ${DUSK_BUILT_ASSETS_DIR}/${OUTPUT_NAME_RELATIVE}
-  )
-  add_dependencies(${DUSK_LIBRARY_TARGET_NAME} ${DUSK_DEFS_TARGET_NAME})
 endfunction()
\ No newline at end of file
diff --git a/tools/env_to_h/CMakeLists.txt b/tools/env_to_h/CMakeLists.txt
new file mode 100644
index 0000000..17a4678
--- /dev/null
+++ b/tools/env_to_h/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright (c) 2026 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+function(dusk_env_to_h INPUT_PATH OUTPUT_NAME_RELATIVE)
+  set(DUSK_DEFS_TARGET_NAME "DUSK_DEFS_${OUTPUT_NAME_RELATIVE}")
+  dusk_run_python(
+    ${DUSK_DEFS_TARGET_NAME}
+    tools.env_to_h
+      --env ${INPUT_PATH}
+      --output ${DUSK_BUILT_ASSETS_DIR}/${OUTPUT_NAME_RELATIVE}
+  )
+  add_dependencies(${DUSK_LIBRARY_TARGET_NAME} ${DUSK_DEFS_TARGET_NAME})
+endfunction()
\ No newline at end of file
diff --git a/tools/envtoh/__main__.py b/tools/env_to_h/__main__.py
similarity index 100%
rename from tools/envtoh/__main__.py
rename to tools/env_to_h/__main__.py