Going to redo assets.

CMakeLists.txt

@@ -29,13 +29,13 @@ set(DUSK_TARGET_NAME "Dusk" CACHE INTERNAL ${DUSK_CACHE_TARGET})
 set(DUSK_BUILD_BINARY ${DUSK_BUILD_DIR}/Dusk CACHE INTERNAL ${DUSK_CACHE_TARGET})
 set(DUSK_ASSETS "" CACHE INTERNAL ${DUSK_CACHE_TARGET})
 
-# Toolchain
-
 # Create directories
 file(MAKE_DIRECTORY ${DUSK_GENERATED_HEADERS_DIR})
-file(MAKE_DIRECTORY ${DUSK_ASSETS_BUILD_DIR})
 
-# Compilers
+# Find packages
+find_package(Python3 COMPONENTS Interpreter REQUIRED)
+
+# Toolchains
 if(DUSK_TARGET_SYSTEM STREQUAL "psp")
   find_package(pspsdk REQUIRED)
 endif()
@@ -52,6 +52,9 @@ add_executable(${DUSK_TARGET_NAME})
 # Add tools
 add_subdirectory(tools)
 
+# Assets
+add_subdirectory(assets)
+
 # Add libraries
 if(DUSK_TARGET_SYSTEM STREQUAL "linux")
   find_package(SDL2 REQUIRED)
@@ -64,14 +67,11 @@ if(DUSK_TARGET_SYSTEM STREQUAL "linux")
 
 elseif(DUSK_TARGET_SYSTEM STREQUAL "psp")
   find_package(SDL2 REQUIRED)
-  target_link_libraries(${DUSK_TARGET_NAME}
-    PRIVATE
-      # pspsdk
-      ${SDL2_LIBRARIES}
+  target_link_libraries(${DUSK_TARGET_NAME} PRIVATE
+    ${SDL2_LIBRARIES}
   )
-  target_include_directories(${DUSK_TARGET_NAME}
-    PRIVATE
-      ${SDL2_INCLUDE_DIRS}
+  target_include_directories(${DUSK_TARGET_NAME} PRIVATE
+    ${SDL2_INCLUDE_DIRS}
   )
 endif()
 
@@ -83,6 +83,18 @@ target_include_directories(${DUSK_TARGET_NAME} PUBLIC
   ${DUSK_GENERATED_HEADERS_DIR}
 )
 
+# Build assets
+string(JOIN "," DUSK_ASSETS_ARGUMENTS ${DUSK_ASSETS})
+add_custom_target(DUSK_ASSETS_BUILT ALL
+  COMMAND
+    ${Python3_EXECUTABLE} ${DUSK_TOOLS_DIR}/assetstool/assets.py
+      --output ${DUSK_GENERATED_HEADERS_DIR}/assets
+      --input ${DUSK_ASSETS_ARGUMENTS}
+  COMMENT
+    "Creating assets build directory ${DUSK_ASSETS}"
+)
+add_dependencies(${DUSK_TARGET_NAME} DUSK_ASSETS_BUILT)
+
 # Postbuild, create PBP file for PSP.
 if(DUSK_TARGET_SYSTEM STREQUAL "psp")
   create_pbp_file(