"progress"

.ci/psp/build-psp.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-mkdir -p build-psp
-cd build-psp
-cmake .. -DDUSK_TARGET_SYSTEM=psp
-make -j$(nproc)

CMakeLists.txt

@@ -32,27 +32,18 @@ set(DUSK_LIBRARY_TARGET_NAME "DuskCore" CACHE INTERNAL ${DUSK_CACHE_TARGET})
 set(DUSK_BINARY_TARGET_NAME "Dusk" CACHE INTERNAL ${DUSK_CACHE_TARGET})
 set(DUSK_ASSETS_ZIP "${DUSK_BUILD_DIR}/dusk.dsk" CACHE INTERNAL ${DUSK_CACHE_TARGET})
 
-# Create directories
+# Set default target system
-file(MAKE_DIRECTORY ${DUSK_GENERATED_HEADERS_DIR})
-
-# Find packages
-find_package(Python3 COMPONENTS Interpreter REQUIRED)
-
-# Set target system
 if(NOT DEFINED DUSK_TARGET_SYSTEM)
   set(DUSK_TARGET_SYSTEM "linux")
-  # set(DUSK_TARGET_SYSTEM "psp")
 endif()
 
-# Toolchains
+# Create directories
-if(DUSK_TARGET_SYSTEM STREQUAL "psp")
+file(MAKE_DIRECTORY ${DUSK_GENERATED_HEADERS_DIR})
-  find_package(pspsdk REQUIRED)
+file(MAKE_DIRECTORY ${DUSK_TEMP_DIR})
-endif()
+file(MAKE_DIRECTORY ${DUSK_BUILT_ASSETS_DIR})
 
-if(DUSK_TARGET_SYSTEM STREQUAL "gamecube" OR DUSK_TARGET_SYSTEM STREQUAL "wii")
+# Required build packages
-  # Override to make library and binary be the same.
+find_package(Python3 COMPONENTS Interpreter REQUIRED)
-  set(DUSK_LIBRARY_TARGET_NAME "${DUSK_LIBRARY_TARGET_NAME}.elf" CACHE INTERNAL ${DUSK_CACHE_TARGET})
-endif()
 
 # Init Project.
 project(${DUSK_LIBRARY_TARGET_NAME}
@@ -76,98 +67,21 @@ if(ENABLE_TESTS)
   )
 else()
   set(DUSK_LIBRARY_TARGET_NAME "${DUSK_BINARY_TARGET_NAME}" CACHE INTERNAL ${DUSK_CACHE_TARGET})
-  add_executable(${DUSK_BINARY_TARGET_NAME} ${DUSK_SOURCES_DIR}/null.c)
+  add_executable(${DUSK_BINARY_TARGET_NAME} ${DUSK_SOURCES_DIR}/dusk/null.c)
 endif()
 
+# Toolchains
+include(cmake/targets/${DUSK_TARGET_SYSTEM}.cmake)
+
 # Add tools
 add_subdirectory(tools)
 
-# Assets
+# Include generated headers from tools.
-# add_subdirectory(assets)
+target_include_directories(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
+  ${DUSK_GENERATED_HEADERS_DIR}
+)
 
-# Add libraries
+# Add main code
-if(DUSK_TARGET_SYSTEM STREQUAL "linux")
-  find_package(SDL2 REQUIRED)
-  find_package(OpenGL REQUIRED)
-  target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC 
-    SDL2
-    pthread
-    OpenGL::GL
-    GL
-    m
-  )
-
-elseif(DUSK_TARGET_SYSTEM STREQUAL "psp")
-  find_package(SDL2 REQUIRED)
-  find_package(OpenGL REQUIRED)
-  target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
-    ${SDL2_LIBRARIES}
-    SDL2
-    pthread
-    OpenGL::GL
-    zip
-    bz2
-    z
-    mbedtls
-    mbedcrypto
-    lzma
-    m
-  )
-  target_include_directories(${DUSK_LIBRARY_TARGET_NAME} PRIVATE
-    ${SDL2_INCLUDE_DIRS}
-  )
-
-elseif(DUSK_TARGET_SYSTEM STREQUAL "gamecube" OR DUSK_TARGET_SYSTEM STREQUAL "wii")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions")
-  # configure_file(opengl.pc.in opengl.pc @ONLY)
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(zip IMPORTED_TARGET libzip)
-  target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
-    DOLPHIN
-  )
-
-  # Disable all warnings
-  target_compile_options(${DUSK_LIBRARY_TARGET_NAME} PRIVATE -w)
-
-  # Custom flags for cglm
-  set(CGLM_SHARED OFF CACHE BOOL "Build cglm shared" FORCE)
-  set(CGLM_STATIC ON  CACHE BOOL "Build cglm static" FORCE)
-  find_package(cglm REQUIRED)
-
-  # Compile lua
-  include(FetchContent)
-  FetchContent_Declare(
-    liblua
-    URL https://www.lua.org/ftp/lua-5.5.0.tar.gz
-  )
-  FetchContent_MakeAvailable(liblua)
-  set(LUA_SRC_DIR "${liblua_SOURCE_DIR}/src")
-  set(LUA_C_FILES 
-    lapi.c lauxlib.c lbaselib.c lcode.c lcorolib.c lctype.c ldblib.c ldebug.c
-    ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c
-    loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c
-    lstrlib.c ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c
-  )
-  list(TRANSFORM LUA_C_FILES PREPEND "${LUA_SRC_DIR}/")
-  add_library(liblua STATIC ${LUA_C_FILES})
-  target_include_directories(liblua PUBLIC "${LUA_SRC_DIR}")
-  target_compile_definitions(liblua PRIVATE LUA_USE_C89)
-  add_library(lua::lua ALIAS liblua)
-  set(Lua_FOUND TRUE CACHE BOOL "Lua found" FORCE)
-
-  target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PRIVATE
-    cglm
-    liblua
-    m
-    fat
-    PkgConfig::zip
-  )
-endif()
-
-# Force turn tests off for now
-set(ENABLE_TESTS OFF CACHE BOOL "Enable tests" FORCE)
-
-# Add code
 add_subdirectory(${DUSK_SOURCES_DIR})
 
 # Handle tests
@@ -189,29 +103,3 @@ add_custom_command(
 )
 add_custom_target(DUSK_ASSETS_BUILT DEPENDS "${DUSK_ASSETS_ZIP}")
 add_dependencies(${DUSK_LIBRARY_TARGET_NAME} DUSK_ASSETS_BUILT)
-
-# Include generated headers
-target_include_directories(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
-  ${DUSK_GENERATED_HEADERS_DIR}
-)
-
-# Postbuild
-if(DUSK_TARGET_SYSTEM STREQUAL "psp")
-  create_pbp_file(
-    TARGET "${DUSK_BINARY_TARGET_NAME}"
-    ICON_PATH NULL
-    BACKGROUND_PATH NULL
-    PREVIEW_PATH NULL
-    TITLE "${DUSK_BINARY_TARGET_NAME}"
-    PSAR_PATH ${DUSK_ASSETS_ZIP}
-    VERSION 01.00
-  )
-elseif(DUSK_TARGET_SYSTEM STREQUAL "gamecube" OR DUSK_TARGET_SYSTEM STREQUAL "wii")
-  set(DUSK_BINARY_TARGET_NAME_DOL "${DUSK_BUILD_DIR}/Dusk.dol")
-  add_custom_command(TARGET ${DUSK_BINARY_TARGET_NAME} POST_BUILD
-    COMMAND elf2dol
-            "$<TARGET_FILE:${DUSK_BINARY_TARGET_NAME}>"
-            "${DUSK_BINARY_TARGET_NAME_DOL}"
-    COMMENT "Generating ${DUSK_BINARY_TARGET_NAME_DOL} from ${DUSK_BINARY_TARGET_NAME}"
-  )
-endif()

archive/src/CMakeLists.txt

@@ -0,0 +1,74 @@
+# Copyright (c) 2025 Dominic Masters
+#
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+if(NOT cglm_FOUND)
+  find_package(cglm REQUIRED)
+  target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC cglm)
+endif()
+
+if(NOT libzip_FOUND)
+  find_package(libzip REQUIRED)
+  target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC zip)
+endif()
+
+if(NOT Lua_FOUND)
+  find_package(Lua REQUIRED)
+  if(Lua_FOUND AND NOT TARGET Lua::Lua)
+    add_library(Lua::Lua INTERFACE IMPORTED)
+    set_target_properties(
+      Lua::Lua
+      PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}"
+        INTERFACE_LINK_LIBRARIES "${LUA_LIBRARIES}"
+    )
+  endif()
+  target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC Lua::Lua)
+endif()
+
+# Libs
+
+# Includes
+target_include_directories(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    ${CMAKE_CURRENT_LIST_DIR}
+)
+
+# Sources
+
+# Main Binary Source
+target_sources(${DUSK_BINARY_TARGET_NAME}
+  PUBLIC
+    main.c
+)
+
+# Defs
+dusk_env_to_h(duskdefs.env duskdefs.h)
+target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
+  PUBLIC
+    DUSK_TARGET_SYSTEM="${DUSK_TARGET_SYSTEM}"
+)
+
+# Subdirs
+add_subdirectory(assert)
+add_subdirectory(asset)
+add_subdirectory(debug)
+add_subdirectory(display)
+add_subdirectory(engine)
+add_subdirectory(error)
+add_subdirectory(event)
+add_subdirectory(input)
+add_subdirectory(item)
+add_subdirectory(locale)
+add_subdirectory(map)
+add_subdirectory(scene)
+add_subdirectory(script)
+add_subdirectory(story)
+add_subdirectory(time)
+add_subdirectory(ui)
+add_subdirectory(util)
+
+if(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "psp")
+  add_subdirectory(thread)
+endif()