remove un-needed files

.ci/dolphin/build-gamecube.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-docker build -t myapp:latest -f .ci/dolphin/Dockerfile .
-docker run -it -v ./:/workdir myapp:latest /bin/bash -c ' \
-  export PATH="$DEVKITPPC/bin:$PATH" && \
-  cd /workdir && \
-  rm -rf build-gamecube && \
-  mkdir -p build-gamecube && \
-  # cmake -S. -Bbuild-gamecube -DDUSK_TARGET_SYSTEM=gamecube -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/GameCube.cmake" && \
-  cmake -S. -Bbuild-gamecube -DDUSK_TARGET_SYSTEM=wii -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/Wii.cmake" && \
-  cd build-gamecube && \
-  make -j$(nproc) VERBOSE=1 && \
-  cp ./Dusk.dol ./boot.dol
-'

.ci/dolphin/build-wii.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-docker build -t myapp:latest -f .ci/dolphin/Dockerfile .
-docker run -v ./:/workdir myapp:latest /bin/bash -c ' \
-  export PATH="$DEVKITPPC/bin:$PATH" && \
-  cd /workdir && \
-  rm -rf build-wii && \
-  mkdir -p build-wii && \
-  cmake -S. -Bbuild-wii -DDUSK_TARGET_SYSTEM=wii -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/Wii.cmake" && \
-  cd build-wii && \
-  make -j$(nproc) VERBOSE=1 && \
-  mv ./Dusk.dol ./boot.dol
-'
-# docker run -it -v ./:/workdir myapp:latest /bin/bash

.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,17 +32,19 @@ 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
-file(MAKE_DIRECTORY ${DUSK_GENERATED_HEADERS_DIR})
-
-# Find packages
-find_package(Python3 COMPONENTS Interpreter REQUIRED)
-
-# Set target system, default to linux if not set.
+# Set default target system
 if(NOT DEFINED DUSK_TARGET_SYSTEM)
   set(DUSK_TARGET_SYSTEM "linux")
 endif()
 
+# Create directories
+file(MAKE_DIRECTORY ${DUSK_GENERATED_HEADERS_DIR})
+file(MAKE_DIRECTORY ${DUSK_TEMP_DIR})
+file(MAKE_DIRECTORY ${DUSK_BUILT_ASSETS_DIR})
+
+# Required build packages
+find_package(Python3 COMPONENTS Interpreter REQUIRED)
+
 # Init Project.
 project(${DUSK_LIBRARY_TARGET_NAME}
   VERSION 1.0.0
@@ -69,12 +71,17 @@ else()
 endif()
 
 # Toolchains
-include(cmake/configure/${DUSK_TARGET_SYSTEM}.cmake)
+include(cmake/targets/${DUSK_TARGET_SYSTEM}.cmake)
 
 # Add tools
 add_subdirectory(tools)
 
-# Add code
+# Include generated headers from tools.
+target_include_directories(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
+  ${DUSK_GENERATED_HEADERS_DIR}
+)
+
+# Add main code
 add_subdirectory(${DUSK_SOURCES_DIR})
 
 # Include generated headers
@@ -101,24 +108,3 @@ add_custom_command(
 )
 add_custom_target(DUSK_ASSETS_BUILT DEPENDS "${DUSK_ASSETS_ZIP}")
 add_dependencies(${DUSK_LIBRARY_TARGET_NAME} DUSK_ASSETS_BUILT)
-
-# 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()

cmake/configure/gamecube.cmake

@@ -1 +0,0 @@
-include(cmake/configure/gamecube.cmake)

cmake/configure/linux.cmake

@@ -1,26 +0,0 @@
-find_package(SDL2 REQUIRED)
-find_package(OpenGL REQUIRED)
-
-target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC 
-  SDL2
-  pthread
-  OpenGL::GL
-  GL
-  m
-)
-
-target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-  PUBLIC
-    DISPLAY_SDL2=1
-    DISPLAY_WINDOW_WIDTH_DEFAULT=1080
-    DISPLAY_WINDOW_HEIGHT_DEFAULT=810
-    DISPLAY_SCREEN_HEIGHT_DEFAULT=270
-    DISPLAY_SHADER=1
-    INPUT_SDL2=1
-    INPUT_KEYBOARD=1
-    INPUT_POINTER=1
-    INPUT_GAMEPAD=1
-    THREAD_PTHREAD=1
-    TIME_SDL2=1
-    TIME_FIXED=0
-)

cmake/configure/psp.cmake

@@ -1,36 +0,0 @@
-find_package(pspsdk REQUIRED)
-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}
-)
-
-target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-  PUBLIC
-    DISPLAY_SDL2=1
-    DISPLAY_WINDOW_WIDTH_DEFAULT=480
-    DISPLAY_WINDOW_HEIGHT_DEFAULT=272
-    DISPLAY_WIDTH=480
-    DISPLAY_HEIGHT=272
-    DISPLAY_SIZE_DYNAMIC=0
-    DISPLAY_COLOR_TABLE=1
-    INPUT_SDL2=1
-    INPUT_GAMEPAD=1
-    THREAD_PTHREAD=1
-    TIME_FIXED=1
-)

cmake/configure/wii.cmake

@@ -1 +0,0 @@
-include(cmake/configure/dolphin.cmake)

cmake/modules/Findcglm.cmake

@@ -4,10 +4,10 @@
 # https://opensource.org/licenses/MIT
 
 include(FetchContent)
-
 FetchContent_Declare(
   cglm
-  GIT_REPOSITORY https://git.wish.moe/YourWishes/cglm.git
+  # GIT_REPOSITORY https://git.wish.moe/YourWishes/cglm.git
+  GIT_REPOSITORY https://github.com/recp/cglm.git
   GIT_TAG        v0.9.6
 )
 

cmake/targets/dolphin.cmake

@@ -1,9 +1,4 @@
-message(FATAL_ERROR "Configure Dolphin")
-
-if(DUSK_TARGET_SYSTEM STREQUAL "gamecube" OR DUSK_TARGET_SYSTEM STREQUAL "wii")
-  # Override to make library and binary be the same.
 set(DUSK_LIBRARY_TARGET_NAME "${DUSK_LIBRARY_TARGET_NAME}.elf" CACHE INTERNAL ${DUSK_CACHE_TARGET})
-endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions")
 # configure_file(opengl.pc.in opengl.pc @ONLY)
@@ -50,14 +45,12 @@ target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PRIVATE
   PkgConfig::zip
 )
 
-target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME}
-  PUBLIC
-    DISPLAY_WINDOW_WIDTH_DEFAULT=640
-    DISPLAY_WINDOW_HEIGHT_DEFAULT=480
-    DISPLAY_WIDTH=640
-    DISPLAY_HEIGHT=480
-    DISPLAY_SIZE_DYNAMIC=0
-    INPUT_GAMEPAD=1
-    THREAD_PTHREAD=1
-    TIME_FIXED=1
+# Postbuild
+
+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}"
 )

cmake/targets/linux.cmake

@@ -0,0 +1,13 @@
+# Find link platform-specific libraries
+find_package(SDL2 REQUIRED)
+find_package(OpenGL REQUIRED)
+
+target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC 
+  SDL2
+  pthread
+  OpenGL::GL
+  GL
+  m
+)
+
+# TEST

cmake/targets/psp.cmake

@@ -0,0 +1,30 @@
+# find_package(pspsdk REQUIRED)
+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}
+)
+
+# Postbuild, create .pbp file for 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
+)

cmake/targets/wii.cmake

@@ -0,0 +1 @@
+include(./dolphin.cmake)

docker/dolphin/Dockerfile

@@ -1,5 +1,6 @@
 FROM devkitpro/devkitppc
-
+WORKDIR /workdir
 RUN apt update && \
     apt install -y python3 python3-pip python3-polib python3-pil python3-dotenv python3-pyqt5 python3-opengl && \
     dkp-pacman -S --needed --noconfirm gamecube-sdl2 ppc-liblzma ppc-libzip
+VOLUME ["/workdir"]

docker/psp/Dockerfile

@@ -0,0 +1,7 @@
+FROM pspdev/pspdev:latest
+WORKDIR /workdir
+RUN apk add --no-cache \
+  python3 \
+  py3-pip
+VOLUME ["/workdir"]
+CMD [ "/bin/bash", "-c", "./scripts/build-psp.sh" ]

scripts/build-gamecube-docker.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+docker build -t dusk-dolphin -f docker/dolphin/Dockerfile .
+docker run --rm -v $(pwd):/workdir dusk-dolphin /bin/bash -c "./scripts/build-gamecube.sh"

scripts/build-gamecube.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+if [ -z "$DEVKITPRO" ]; then
+  echo "DEVKITPRO environment variable is not set. Please set it to the path of your DEVKITPRO installation."
+  exit 1
+fi
+
+mkdir -p build-gamecube
+cmake -S. -Bbuild-gamecube -DDUSK_TARGET_SYSTEM=gamecube -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/GameCube.cmake"
+cd build-gamecube
+make -j$(nproc) VERBOSE=1

scripts/build-psp-docker.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+docker build -t dusk-psp -f docker/psp/Dockerfile .
+docker run --rm -v $(pwd):/workdir dusk-psp

scripts/build-psp.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+if [ -z "$PSPDEV" ]; then
+  echo "PSPDEV environment variable is not set. Please set it to the path of your PSP development environment."
+  exit 1
+fi
+
+mkdir -p build-psp
+cd build-psp
+cmake .. -DDUSK_TARGET_SYSTEM=psp -DCMAKE_TOOLCHAIN_FILE=$PSPDEV/psp/share/pspdev.cmake
+make -j$(nproc)

scripts/build-wii-docker.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+docker build -t dusk-dolphin -f docker/dolphin/Dockerfile .
+docker run --rm -v $(pwd):/workdir dusk-dolphin /bin/bash -c "./scripts/build-wii.sh"

scripts/build-wii.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+if [ -z "$DEVKITPRO" ]; then
+  echo "DEVKITPRO environment variable is not set. Please set it to the path of your DEVKITPRO installation."
+  exit 1
+fi
+
+mkdir -p build-wii
+cmake -S. -Bbuild-wii -DDUSK_TARGET_SYSTEM=wii -DCMAKE_TOOLCHAIN_FILE="$DEVKITPRO/cmake/Wii.cmake"
+cd build-wii
+make -j$(nproc) VERBOSE=1

src/CMakeLists.txt

@@ -3,6 +3,7 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
+# Required Libraries
 if(NOT cglm_FOUND)
   find_package(cglm REQUIRED)
   target_link_libraries(${DUSK_LIBRARY_TARGET_NAME} PUBLIC cglm)
@@ -27,16 +28,12 @@ if(NOT Lua_FOUND)
   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
@@ -69,6 +66,6 @@ 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()
+# if(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "psp")
+#   add_subdirectory(thread)
+# endif()

src/platform/CMakeLists.txt

@@ -0,0 +1,9 @@
+# Copyright (c) 2026 Dominic Masters
+# 
+# This software is released under the MIT License.
+# https://opensource.org/licenses/MIT
+
+if(DUSK_TARGET_SYSTEM STREQUAL "linux")
+  add_subdirectory(linux)
+  add_subdirectory(SDL2)
+endif()