From afa6a1a0364b4c878193de18e78d17113e31b5fe Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Tue, 24 Dec 2024 23:41:27 -0600
Subject: [PATCH] Fix tool on different platforms.

---
 tools/assetstool/CMakeLists.txt  |  7 +++++--
 tools/assetstool/assetstool.py   |  1 -
 tools/texturetool/CMakeLists.txt | 19 ++++++++++++++-----
 tools/texturetool/texturetool.py |  2 +-
 4 files changed, 20 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 tools/assetstool/assetstool.py
 mode change 100755 => 100644 tools/texturetool/texturetool.py

diff --git a/tools/assetstool/CMakeLists.txt b/tools/assetstool/CMakeLists.txt
index f26a801c..f0654784 100644
--- a/tools/assetstool/CMakeLists.txt
+++ b/tools/assetstool/CMakeLists.txt
@@ -12,6 +12,9 @@ add_custom_target(dawnassets
     --input=${DAWN_ASSETS_BUILD_DIR}
     --output=${DAWN_BUILD_DIR}/dawn.tar
   COMMENT "Bundling assets..."
-    USES_TERMINAL
-    DEPENDS ${DAWN_ASSETS}
+  USES_TERMINAL
+  DEPENDS
+    ${DAWN_ASSETS}
+    ${DAWN_TOOLS_DIR}/assetstool/assetstool.py
+    ${Python3_EXECUTABLE}
 )
\ No newline at end of file
diff --git a/tools/assetstool/assetstool.py b/tools/assetstool/assetstool.py
old mode 100755
new mode 100644
index 06f62e81..17f9c33f
--- a/tools/assetstool/assetstool.py
+++ b/tools/assetstool/assetstool.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2023 Dominic Masters
 # 
 # This software is released under the MIT License.
diff --git a/tools/texturetool/CMakeLists.txt b/tools/texturetool/CMakeLists.txt
index d870cdc3..b9c3599c 100644
--- a/tools/texturetool/CMakeLists.txt
+++ b/tools/texturetool/CMakeLists.txt
@@ -1,6 +1,6 @@
-find_package(Python3 REQUIRED COMPONENTS Interpreter)
-
 function(tool_texture target file)
+  find_package(Python3 REQUIRED COMPONENTS Interpreter)
+
   # Defaults
   set(FILTER_MIN "")
   set(FILTER_MAG "")
@@ -25,9 +25,11 @@ function(tool_texture target file)
   if(NOT DEFINED file)
     message(FATAL_ERROR "Missing FILE input")
   endif()
-  
+
   add_custom_target(${target}_texture
-    COMMAND ${DAWN_TOOLS_DIR}/texturetool/texturetool.py
+    COMMAND
+      ${Python3_EXECUTABLE}
+      ${DAWN_TOOLS_DIR}/texturetool/texturetool.py
       --input="${DAWN_ASSETS_SOURCE_DIR}/${file}"
       --output="${DAWN_ASSETS_BUILD_DIR}/${target}.texture"
       --wrap-x="${WRAP_X}"
@@ -39,7 +41,14 @@ function(tool_texture target file)
       --crop-start-y="${CROP_START_Y}"
       --crop-end-x="${CROP_END_X}"
       --crop-end-y="${CROP_END_Y}"
-    COMMENT "Generating texture ${target} from ${FILE}"
+    COMMENT
+      "Generating texture ${target} from ${FILE}"
+    DEPENDS
+      ${DAWN_TOOLS_DIR}/texturetool/texturetool.py
+      ${DAWN_ASSETS_SOURCE_DIR}/${file}
+      ${Python3_EXECUTABLE}
+    USES_TERMINAL
+
   )
   add_dependencies(dawnassets ${target}_texture)
 endfunction()
\ No newline at end of file
diff --git a/tools/texturetool/texturetool.py b/tools/texturetool/texturetool.py
old mode 100755
new mode 100644
index f7d53539..df3250a4
--- a/tools/texturetool/texturetool.py
+++ b/tools/texturetool/texturetool.py
@@ -1,9 +1,9 @@
-#!/usr/bin/env python
 # Copyright (c) 2023 Dominic Masters
 # 
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
+
 from PIL import Image
 import argparse
 import os