elks-enhanced

publicRead
Owner: themasterBranch: masterCommits: 6893Updated: 2026-04-19 00:15
Git CLI clone URL
git clone https://www.xt-emporium.com/git/elks-enhanced.git
Fullscreen desktop URL

Commit diff

Commit 586702c6223d8e4098e43c03b4700672b02ce54
commit 586702c6223d8e4098e43c03b4700672b02ce548
Author: Greg Haerr <greg@censoft.com>
Date:   Mon Mar 16 13:36:21 2026 -0700

    [build] Build PC-98 Nano-X properly in build.sh CI and buildimages.sh
---
 build.sh       |  3 ++-
 buildext.sh    | 15 +++++++++++++++
 buildimages.sh |  5 +++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 4f4bc51e..0500066f 100755
--- a/build.sh
+++ b/build.sh
@@ -107,10 +107,11 @@ if [ "$1" = "auto" ]; then
     make -j1 || clean_exit 8
 fi
 
-# Build PC-98 kernel, some user land files and image
+# Build PC-98 kernel, PC-98 Nano-X, some user land files and image
 if [ "$1" = "auto" ]; then
     echo "Building PC-98 image..."
     cp pc98-1232.config .config
+    ./buildext.sh microwindows_pc98
     make kclean || clean_exit 9
     rm bootblocks/*.o
     rm elkscmd/sys_utils/clock.o
diff --git a/buildext.sh b/buildext.sh
index 956a9950..0c3a71f5 100755
--- a/buildext.sh
+++ b/buildext.sh
@@ -11,6 +11,7 @@
 # Currently supported projects are:
 #       Name            Compiler        Desc
 #       microwindows    ia16-elf-gcc    Nano-X Graphical Windowing Environment
+#       microwindows_pc98 ia16-elf-gcc  Nano-X Graphical Windowing Environment for PC-98
 #       dcc             ia6-elf-gcc     DCC self-compiling C compiler for ELKS
 #       dflat           ia16-elf-gcc    D-Flat TUI memopad/library
 #       elkirc          ia16-elf-gcc    IRC for ELKS
@@ -146,6 +147,20 @@ microwindows()
     echo "Nano-X build complete"
 }
 
+microwindows_pc98()
+{
+    echo "Building Nano-X for PC-98..."
+    cd $TOPDIR/extapps
+    if [ ! -d microwindows ] ; then
+        git clone https://github.com/ghaerr/microwindows.git
+    fi
+    cd microwindows/src
+    git pull
+    make -f Makefile.elks clean
+    CONFIG_ARCH_PC98=y make -f Makefile.elks
+    echo "Nano-X for PC-98 build complete"
+}
+
 dcc()
 {
     echo "Building DeSmet C Compiler (DCC)..."
diff --git a/buildimages.sh b/buildimages.sh
index 96e47bdc..aed9e5b1 100755
--- a/buildimages.sh
+++ b/buildimages.sh
@@ -22,6 +22,8 @@ build_pc98()
     cleanup
     cp pc98-1232.config .config
     make
+    ./buildext.sh microwindows_pc98
+    make
     mv image/fd1232.img image/fd1232-pc98.img
 }
 
@@ -30,6 +32,8 @@ build_pc98_fast()
     cleanup
     cp pc98-1232-nc.config .config
     make
+    ./buildext.sh microwindows_pc98
+    make
     mv image/fd1232.img image/fd1232-pc98.img
 }
 
@@ -128,6 +132,7 @@ make clean
 build_pc98
 build_pc98_1200
 build_pc98_1440
+./buildext.sh microwindows
 build_rom_8018x
 build_rom_necv25
 build_rom_8088