From 55bcd35bedc67252b2fd648976f3f95ae589371d Mon Sep 17 00:00:00 2001
From: SiZiOUS <sizious@gmail.com>
Date: Thu, 31 Jul 2025 23:40:42 +0200
Subject: [PATCH] `dreamcast_shelf build config`: use KallistiOS wrappers See:
 https://dreamcast.wiki/Using_Ruby_for_Sega_Dreamcast_development

---
 build_config/dreamcast_shelf.rb | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/build_config/dreamcast_shelf.rb b/build_config/dreamcast_shelf.rb
index d6bd401bc..da41b9d29 100644
--- a/build_config/dreamcast_shelf.rb
+++ b/build_config/dreamcast_shelf.rb
@@ -21,44 +21,33 @@ MRuby::CrossBuild.new("dreamcast") do |conf|
 
   # Getting critical environment variables
   KOS_BASE = ENV["KOS_BASE"]
-  KOS_CC_BASE = ENV["KOS_CC_BASE"]
 
-  if (KOS_BASE.nil? || KOS_BASE.empty? || KOS_CC_BASE.nil? || KOS_CC_BASE.empty?)
-    raise "Error: KallistiOS is required; KOS_BASE/KOS_CC_BASE needs to be declared; Stop."
+  # Check environment variables
+  if (KOS_BASE.nil? || KOS_BASE.empty?)
+    raise "Error: KallistiOS is required; KOS_BASE need to be declared; Stop."
   end
+  
+  # Root directory for KallistiOS wrappers  
+  KOS_WRAPPERS = "#{KOS_BASE}/utils/build_wrappers"
 
-  # C compiler
-  # All flags and settings below were extracted from KallistiOS environment files
+  # C compiler  
   conf.cc do |cc|
-    cc.command = "#{KOS_CC_BASE}/bin/sh-elf-gcc"
-    cc.include_paths << ["#{KOS_BASE}/include", "#{KOS_BASE}/kernel/arch/dreamcast/include", "#{KOS_BASE}/addons/include", "#{KOS_BASE}/../kos-ports/include"]
-    cc.flags << ["-O2", "-fomit-frame-pointer", "-fno-builtin", "-ml", "-m4-single-only", "-ffunction-sections", "-fdata-sections", "-matomic-model=soft-imask", "-ftls-model=local-exec", "-Wall", "-g"]
-    cc.compile_options = %Q[%{flags} -o "%{outfile}" -c "%{infile}"]
-    cc.defines << %w(_arch_dreamcast)
-    cc.defines << %w(_arch_sub_pristine)
+    cc.command = "#{KOS_WRAPPERS}/kos-cc"
   end
 
   # C++ compiler
   conf.cxx do |cxx|
-    cxx.command = conf.cc.command.dup
-    cxx.include_paths = conf.cc.include_paths.dup
-    cxx.flags = conf.cc.flags.dup
-    cxx.flags << %w(-fno-operator-names)
-    cxx.defines = conf.cc.defines.dup
-    cxx.compile_options = conf.cc.compile_options.dup
+    cxx.command = "#{KOS_WRAPPERS}/kos-c++"
   end
 
   # Linker
   conf.linker do |linker|
-    linker.command = "#{KOS_CC_BASE}/bin/sh-elf-gcc"
-    linker.flags << ["-Wl,-Ttext=0x8c010000", "-Wl,--gc-sections", "-T#{KOS_BASE}/utils/ldscripts/shlelf.xc", "-nodefaultlibs", "-Wl,--start-group -lkallisti -lc -lgcc -Wl,--end-group"]
-    linker.library_paths << ["#{KOS_BASE}/lib/dreamcast", "#{KOS_BASE}/addons/lib/dreamcast", "#{KOS_BASE}/../kos-ports/lib"]
+    linker.command = "#{KOS_WRAPPERS}/kos-ld"
   end
 
   # Archiver
   conf.archiver do |archiver|
-    archiver.command = "#{KOS_CC_BASE}/bin/sh-elf-ar"
-    archiver.archive_options = 'rcs "%{outfile}" %{objs}'
+    archiver.command = "#{KOS_WRAPPERS}/kos-ar"
   end
 
   # No executables needed for KallistiOS